diff --git a/gnu/local.mk b/gnu/local.mk index a46ca3c2e21..88004071829 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2467,7 +2467,6 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch \ %D%/packages/patches/x265-arm-flags.patch \ - %D%/packages/patches/xdg-desktop-portal-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 3c764f2b577..9c6cb58195a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -73,6 +73,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) @@ -3154,10 +3155,7 @@ compatible with the well-known scripts of the same name.") version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "1pn0q7nn9xzd2wva9zpxn1dd2kqxwjm2a68yv9gaaa4alh9cvkb6")) - (patches - (search-patches - "xdg-desktop-portal-disable-configuration-search-exit.patch")))) + "1pn0q7nn9xzd2wva9zpxn1dd2kqxwjm2a68yv9gaaa4alh9cvkb6")))) (build-system meson-build-system) (arguments (list @@ -3203,11 +3201,7 @@ compatible with the well-known scripts of the same name.") json-glib libportal pipewire)) - (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-disable-configuration-search-exit.patch b/gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch deleted file mode 100644 index 80d5d777a90..00000000000 --- a/gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-status: https://github.com/flatpak/xdg-desktop-portal/pull/1716 - -diff --git a/src/xdp-portal-impl.c b/src/xdp-portal-impl.c -index 48a221d..389773a 100644 ---- a/src/xdp-portal-impl.c -+++ b/src/xdp-portal-impl.c -@@ -501,9 +501,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 */