[neon/qt/qtbase/Neon/release] debian/patches: add patch to send window id in hex to xdg-desktop-portal

Maximilian Federle null at kde.org
Mon Nov 8 18:01:24 GMT 2021


Git commit 3043f743331d474b12440bfe2eb467e44dfbb3ea by Maximilian Federle.
Committed on 04/11/2021 at 09:35.
Pushed by jriddell into branch 'Neon/release'.

add patch to send window id in hex to xdg-desktop-portal

This fixes the portal's file chooser appearing unfocused and in the
background.

Fixes https://bugs.kde.org/show_bug.cgi?id=444873

M  +1    -0    debian/patches/series
A  +18   -0    debian/patches/xdg_filechooser_portal_send_window_id_in_hex.diff

https://invent.kde.org/neon/qt/qtbase/commit/3043f743331d474b12440bfe2eb467e44dfbb3ea

diff --git a/debian/patches/series b/debian/patches/series
index 7eb0d3f..71ec769 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ path_max.diff
 qstorageinfo_linux.diff
 cross_build_mysql.diff
 qtbase-avoid-hardcoding-kernel-version.patch
+xdg_filechooser_portal_send_window_id_in_hex.diff
diff --git a/debian/patches/xdg_filechooser_portal_send_window_id_in_hex.diff b/debian/patches/xdg_filechooser_portal_send_window_id_in_hex.diff
new file mode 100644
index 0000000..76abafe
--- /dev/null
+++ b/debian/patches/xdg_filechooser_portal_send_window_id_in_hex.diff
@@ -0,0 +1,18 @@
+Description: FileChooser portal: send window id in hex
+ We send window id in decimal, however, it is expected to be send in hex.
+ This causes a mismatch and makes portal dialog to show in background.
+Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=acaabc9108dfe75530960cf8e3ec4f3602cd82e0
+Last-Update: 2021-11-04
+Index: qtbase-opensource-src/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+===================================================================
+--- qtbase-opensource-src.orig/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
++++ qtbase-opensource-src/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+@@ -185,7 +185,7 @@ void QXdgDesktopPortalFileDialog::openPo
+                                                           QLatin1String("/org/freedesktop/portal/desktop"),
+                                                           QLatin1String("org.freedesktop.portal.FileChooser"),
+                                                           d->saveFile ? QLatin1String("SaveFile") : QLatin1String("OpenFile"));
+-    QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId);
++    QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId, 16);
+ 
+     QVariantMap options;
+     if (!d->acceptLabel.isEmpty())


More information about the Neon-commits mailing list