guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit ee42222dd8c9d97febaf3e5cea9294b269f522ba
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Fri Aug 28 15:54:30 2026 +0900
gnu: libportal: Update to 0.10.0 and split into gtk+ and qt variants.
* gnu/packages/freedesktop.scm (libportal): Update to 0.10.0.
[source]: Delete patches.
[#:allowed-references]: New.
[#:configure-flags]: Delete.
[native-inputs]: Remove docbook-xsl, docbook-xml and libxml2. Add
gi-docgen.
[inputs]: Remove gtk+ and qtbase.
(libportal-gtk3): New variable.
(libportal-qt): New variable.
* gnu/packages/patches/libportal-qt-6.9.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
* gnu/packages/gnome.scm (eog) [inputs]: Remove gtk. Replace libportal with
libportal-gtk3.
[home-page]: Update URL.
* gnu/packages/pantheon.scm (pantheon-photos) [inputs]: Replace libportal
with
libportal-gtk3.
* gnu/packages/gnome.scm (gnome-boxes): Likewise.
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/freedesktop.scm | 47 +++++++++++++----------------
gnu/packages/gnome.scm | 7 ++---
gnu/packages/pantheon.scm | 2 +-
gnu/packages/patches/libportal-qt-6.9.patch | 43 --------------------------
5 files changed, 25 insertions(+), 75 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index cdc40560311..f5f96143af2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1755,7 +1755,6 @@ dist_patch_DATA =
\
%D%/packages/patches/libjami-networkservice-header.patch \
%D%/packages/patches/libmaus2-fix-gcc-13-require-include-cstdint.patch
\
%D%/packages/patches/libpatch-respect-ldflags.patch \
- %D%/packages/patches/libportal-qt-6.9.patch \
%D%/packages/patches/libretranslate-use-flasgger.patch \
%D%/packages/patches/libretro-dolphin-emu-unbundle-tinygltf.patch \
%D%/packages/patches/libretro-dolphin-emu-unbundle-watcher.patch \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 70f78832ce4..d5d2dbe3d97 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3228,7 +3228,7 @@ compatible with the well-known scripts of the same name.")
(define-public libportal
(package
(name "libportal")
- (version "0.9.1")
+ (version "0.10.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3237,39 +3237,34 @@ compatible with the well-known scripts of the same
name.")
(file-name (git-file-name name version))
(sha256
(base32
- "1rbqkmvvfig98ig8gsf93waiizrminj7gywxbza15hzx3an3hwh9"))
- (patches (search-patches "libportal-qt-6.9.patch"))))
+ "10psp6k477mz6gcvk78d9nw2w7q8whffd8ck9161dgs2gjff6kdx"))))
(build-system meson-build-system)
- (arguments
- (list
- #:configure-flags
- #~(list "-Ddocs=false") ; requires unpackaged gi-docgen
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'check 'set-qt-environment-variables
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Required for tests
- (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+ ;; Avoid dragging Qt in the closure, which is an optional input anyway.
+ (arguments (list #:disallowed-references (list gtk+ qtbase)))
(native-inputs
- (list pkg-config
- docbook-xsl
- docbook-xml
- `(,glib "bin")
- gobject-introspection
- libxml2
- vala))
- (inputs
- (list gtk
- gtk+
- qtbase))
- (propagated-inputs
- (list glib))
+ (list gi-docgen pkg-config `(,glib "bin") gobject-introspection vala))
+ (inputs (list gtk))
+ (propagated-inputs (list glib))
(home-page "https://github.com/flatpak/libportal";)
(synopsis "Flatpak portal library")
(description
"libportal provides GIO-style async APIs for most Flatpak portals.")
(license license:lgpl2.1+)))
+(define-public libportal-gtk3
+ (package/inherit libportal
+ (name "libportal-gtk3")
+ (arguments (list #:disallowed-references (list gtk qtbase)))
+ (inputs (modify-inputs inputs
+ (replace "gtk" gtk+)))))
+
+(define-public libportal-qt
+ (package/inherit libportal
+ (name "libportal-qt")
+ (arguments (list #:disallowed-references (list gtk+ gtk)))
+ (inputs (modify-inputs inputs
+ (replace "gtk" qtbase)))))
+
(define-public xdg-desktop-portal
(package
(name "xdg-desktop-portal")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 23c0f720106..3c04c230c03 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6823,15 +6823,14 @@ supports playlists, song ratings, and any codecs
installed through gstreamer.")
bash-minimal
exempi
gnome-desktop
- gtk
lcms
libexif
libjpeg-turbo
libpeas
- libportal
+ libportal-gtk3
librsvg
shared-mime-info))
- (home-page "https://wiki.gnome.org/Apps/EyeOfGnome";)
+ (home-page "https://gitlab.gnome.org/GNOME/eog";)
(synopsis "GNOME image viewer")
(description "Eye of GNOME is the GNOME image viewer. It
supports image conversion, rotation, and slideshows.")
@@ -12695,7 +12694,7 @@ desktop environment.")
libgudev
libhandy
libosinfo
- libportal
+ libportal-gtk3
libsecret
libsoup
libusb
diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 03e543ea73d..c30840195bc 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -294,7 +294,7 @@ for elementary OS and its desktop environment: Pantheon.")
libgphoto2
libgudev
libhandy
- libportal
+ libportal-gtk3
libraw
libwebp
sqlite))
diff --git a/gnu/packages/patches/libportal-qt-6.9.patch
b/gnu/packages/patches/libportal-qt-6.9.patch
deleted file mode 100644
index 2e746736c2a..00000000000
--- a/gnu/packages/patches/libportal-qt-6.9.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Upstream patch, see https://github.com/flatpak/libportal/pull/200
-
-From 68bac10ad0c60379884618d78ca7f93d9bb55df8 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <[email protected]>
-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());
-
