[neon/qt/qtbase/Neon/release] debian/patches: remove patch in git

Jonathan Esk-Riddell null at kde.org
Mon May 16 13:29:45 BST 2022


Git commit 638326de8dc6d6e02fc6da52462fe9091fdca2ee by Jonathan Esk-Riddell.
Committed on 16/05/2022 at 12:28.
Pushed by jriddell into branch 'Neon/release'.

remove patch in git

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

https://invent.kde.org/neon/qt/qtbase/commit/638326de8dc6d6e02fc6da52462fe9091fdca2ee

diff --git a/debian/patches/series b/debian/patches/series
index 71ec769..7eb0d3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@ 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
deleted file mode 100644
index 76abafe..0000000
--- a/debian/patches/xdg_filechooser_portal_send_window_id_in_hex.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-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