diff --git a/deploy/linux/flatpak/libportal-qt69.patch b/deploy/linux/flatpak/libportal-qt69.patch deleted file mode 100644 index ed2b1ff8c..000000000 --- a/deploy/linux/flatpak/libportal-qt69.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 796053d2eebe4532aad6bd3fd80cdf3b197806ec Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Thu, 27 Mar 2025 09:38:10 +0100 -Subject: [PATCH] qt6: fix build against Qt 6.9+ - -QGenericUnixServices was renamed to QDesktopUnixServices in Qt 6.9. - -Upstream change: https://codereview.qt-project.org/c/qt/qtbase/+/609639 ---- - libportal/portal-qt6.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libportal/portal-qt6.cpp b/libportal/portal-qt6.cpp -index d38a4e30..34f0d72a 100644 ---- a/libportal/portal-qt6.cpp -+++ b/libportal/portal-qt6.cpp -@@ -31,8 +31,12 @@ - #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) - #include - #include -+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) -+#include -+#else - #include - #endif -+#endif - - static gboolean - _xdp_parent_export_qt (XdpParent *parent, -@@ -45,7 +49,11 @@ _xdp_parent_export_qt (XdpParent *parent, - } - - #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) -+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) -+ if (const auto services = dynamic_cast(QGuiApplicationPrivate::platformIntegration()->services())) -+#else - if (const auto services = dynamic_cast(QGuiApplicationPrivate::platformIntegration()->services())) -+#endif - { - g_autofree char *handle = g_strdup(services->portalWindowIdentifier(w).toUtf8().constData()); - diff --git a/deploy/linux/flatpak/org.deskflow.deskflow.yml b/deploy/linux/flatpak/org.deskflow.deskflow.yml index 3cd7f50ac..7ca501c73 100644 --- a/deploy/linux/flatpak/org.deskflow.deskflow.yml +++ b/deploy/linux/flatpak/org.deskflow.deskflow.yml @@ -65,10 +65,8 @@ modules: sources: - type: git url: https://github.com/flatpak/libportal.git - tag: 0.9.1 - commit: 8f5dc8d192f6e31dafe69e35219e3b707bde71ce - - type: patch - path: libportal-qt69.patch + tag: 0.10.0 + commit: c23024018c8eb076549a1517fcb2d7f80d3e2ed5 - name: gtest buildsystem: cmake-ninja sources: