rpms/libportal
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild (qt6)

Browse Source 
Resolves: RHEL-95936
This commit is contained in:
Jan Grulich 2025-06-10 09:51:43 +02:00
parent 617168e1fe
commit 70065e9bf4
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libportal-fix-build-with-qt-6_9.patch Normal file
View File

@ -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 <qpa/qplatformintegration.h>
#include <private/qguiapplication_p.h>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+#include <private/qdesktopunixservices_p.h>
+#else
#include <private/qgenericunixservices_p.h>
#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<QDesktopUnixServices*>(QGuiApplicationPrivate::platformIntegration()->services()))
+#else
if (const auto services = dynamic_cast<QGenericUnixServices*>(QGuiApplicationPrivate::platformIntegration()->services()))
+#endif
{
g_autofree char *handle = g_strdup(services->portalWindowIdentifier(w).toUtf8().constData());

9
libportal.spec
View File

@ -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 <jgrulich@redhat.com> - 0.9.0-2
- Rebuild (qt6)
Resolves: RHEL-95936
* Mon Jan 06 2025 Jan Grulich <jgrulich@redhat.com> - 0.9.0-1
- Update to 0.9.0
Resolves: RHEL-72805