guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 516d096a55967c30e76aabcd6fc5fdc4c5254dd4
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon Jul 28 13:54:40 2025 +0900
gnu: xdg-desktop-portal: Use XDG_DATA_DIRS as search path.
* gnu/packages/freedesktop.scm (xdg-desktop-portal): Delete patches.
[native-search-paths]: Remove XDG_DESKTOP_PORTAL_DIR. Add $XDG_DATA_DIRS.
* gnu/packages/patches/
xdg-desktop-portal-1.20.3-disable-configuration-search-exit.patch: Delete
file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Change-Id: I26bde17cde75d1ccf5839d57145d5780b40cda9f
---
gnu/local.mk | 1 -
gnu/packages/freedesktop.scm | 11 +++------
...-1.20.3-disable-configuration-search-exit.patch | 27 ----------------------
3 files changed, 3 insertions(+), 36 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index e6381f43f3..b0fcd26a9a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2590,7 +2590,6 @@ dist_patch_DATA =
\
%D%/packages/patches/x2goclient-fix-makefile.patch \
%D%/packages/patches/x265-arm-flags.patch \
%D%/packages/patches/x265-4-arm-flags.patch \
-
%D%/packages/patches/xdg-desktop-portal-1.20.3-disable-configuration-search-exit.patch\
%D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
%D%/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch
\
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 07106a43b5..e4a77e75e3 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -76,6 +76,7 @@
#:use-module (guix build-system python)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system qt)
+ #:use-module (guix search-paths)
#:use-module (gnu packages)
#:use-module (gnu packages acl)
#:use-module (gnu packages admin)
@@ -3214,9 +3215,7 @@ compatible with the well-known scripts of the same name.")
version "/xdg-desktop-portal-" version ".tar.xz"))
(sha256
(base32
- "1p4yvbhqr8yf231gm69vdz3h7na8m6x1mhiw3bmhg4gm6x4idysb"))
- (patches (search-patches
-
"xdg-desktop-portal-1.20.3-disable-configuration-search-exit.patch"))))
+ "1p4yvbhqr8yf231gm69vdz3h7na8m6x1mhiw3bmhg4gm6x4idysb"))))
(build-system meson-build-system)
(arguments
(list
@@ -3263,11 +3262,7 @@ compatible with the well-known scripts of the same
name.")
libportal
pipewire
umockdev))
- (native-search-paths
- (list (search-path-specification
- (variable "XDG_DESKTOP_PORTAL_DIR")
- (separator #f)
- (files '("share/xdg-desktop-portal/portals")))))
+ (native-search-paths (list $XDG_DATA_DIRS))
(home-page "https://github.com/flatpak/xdg-desktop-portal";)
(synopsis "Desktop integration portal for sandboxed apps")
(description
diff --git
a/gnu/packages/patches/xdg-desktop-portal-1.20.3-disable-configuration-search-exit.patch
b/gnu/packages/patches/xdg-desktop-portal-1.20.3-disable-configuration-search-exit.patch
deleted file mode 100644
index 654b40db9e..0000000000
---
a/gnu/packages/patches/xdg-desktop-portal-1.20.3-disable-configuration-search-exit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 37003d1f99246c88cbe7cf2f83616642e0fdf3fb Mon Sep 17 00:00:00 2001
-From: Rodion Goritskov <[email protected]>
-Date: Fri, 27 Sep 2024 00:44:07 +0400
-Subject: [PATCH] portal-impl: Check if there are any configuration files in
XDG_DESKTOP_PORTAL_DIR before exiting configuration search
-
----
- src/xdp-portal-impl.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/xdp-portal-impl.c b/src/xdp-portal-impl.c
-index 8c1fd53..8708409 100644
---- a/src/xdp-portal-impl.c
-+++ b/src/xdp-portal-impl.c
-@@ -438,9 +438,8 @@ load_portal_configuration (gboolean opt_verbose)
-
- if (portal_dir != NULL)
- {
-- load_config_directory (portal_dir, desktops, opt_verbose);
-- /* All other config directories are ignored when this is set */
-- return;
-+ if (load_config_directory (portal_dir, desktops, opt_verbose))
-+ return;
- }
-
- /* $XDG_CONFIG_HOME/xdg-desktop-portal/(DESKTOP-)portals.conf */
---
-2.46.0
