diff --git a/libportal-fix-build-with-qt-6_9.patch b/libportal-fix-build-with-qt-6_9.patch new file mode 100644 index 0000000..5dc48f3 --- /dev/null +++ b/libportal-fix-build-with-qt-6_9.patch @@ -0,0 +1,29 @@ +diff --git a/libportal/portal-qt6.cpp b/libportal/portal-qt6.cpp +index d38a4e3..34f0d72 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/libportal.spec b/libportal.spec index 2e23200..9081dff 100644 --- a/libportal.spec +++ b/libportal.spec @@ -2,7 +2,7 @@ Name: libportal Version: 0.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flatpak portal library # doc/urlmap.js is LGPL-2.1-or-later # everything else is LGPL-3.0-only @@ -10,6 +10,9 @@ License: LGPL-3.0-only AND LGPL-2.1-or-later Url: https://github.com/flatpak/libportal Source: https://github.com/flatpak/libportal/releases/download/%{version}/%{name}-%{version}.tar.xz +# https://github.com/flatpak/libportal/pull/200 +Patch0: libportal-fix-build-with-qt-6_9.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gi-docgen @@ -217,6 +220,10 @@ This package provides development documentations for libportal. %{_datadir}/doc/libportal-1 %changelog +* Tue Jun 10 2025 Jan Grulich - 0.9.0-2 +- Rebuild (qt6) + Resolves: RHEL-95936 + * Mon Jan 06 2025 Jan Grulich - 0.9.0-1 - Update to 0.9.0 Resolves: RHEL-72805