Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-13 03:09:51 +03:00
Code Issues Wiki Activity

community/libportal: rebuild against Qt 6.9

Browse source
This commit is contained in:
Bart Ribbers 2025-04-03 14:49:35 +02:00
parent 9ec55f325d
commit eda9f4316c
2 changed files with 46 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

41
community/libportal/0001-libportal-fix-build-against-qt-6.9.patch Normal file
View file

@ -0,0 +1,41 @@
From 796053d2eebe4532aad6bd3fd80cdf3b197806ec Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
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 <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());

7
community/libportal/APKBUILD
View file

@ -4,7 +4,7 @@
# Maintainer: Pablo Correa Gomez <pabloyoyoista@postmarketos.org>
pkgname=libportal
pkgver=0.9.1
pkgrel=0
pkgrel=1
pkgdesc="GIO-style async APIs for most Flatpak portals"
url="https://github.com/flatpak/libportal"
arch="all"
@ -32,7 +32,9 @@ subpackages="
$pkgname-qt5:_qt5
$pkgname-qt6:_qt6
"
source="$pkgname-$pkgver.tar.gz::https://github.com/flatpak/libportal/archive/$pkgver.tar.gz"
source="$pkgname-$pkgver.tar.gz::https://github.com/flatpak/libportal/archive/$pkgver.tar.gz
0001-libportal-fix-build-against-qt-6.9.patch
"
build() {
abuild-meson \
@ -87,4 +89,5 @@ _qt6() {
sha512sums="
969de691a6ca461d315930c7a8e7adb6d80cf64635d1ea514a7153721226ca05f3e9644ac9b66febea510f4f6a5c525ff31f17ceba0e603664425bcba3d27c36 libportal-0.9.1.tar.gz
08dba256ec4bb0ae5f379cc2ce5126798fa82d6512716e3a7ed12f9b74acdd2fd45ff8184ec457ea8bda4777ddd720efdf34c58ba99d8fd9a7340fe1d759cac4 0001-libportal-fix-build-against-qt-6.9.patch
"