diff options
| author | Maxim Cournoyer <maxim@guixotic.coop> | 2025-07-28 13:54:40 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2025-07-28 13:57:55 +0900 |
| commit | 7adcbd55a7fa5f566a782cd26db45dad5ddfaeb6 (patch) | |
| tree | 851dfa137b148a3e3471af95b10ee87704be1432 | |
| parent | a08093d8a6d09a9641962dac9358752ca71c61f2 (diff) | |
gnu: xdg-desktop-portal: Use XDG_DATA_DIRS as search path.
* gnu/packages/freedesktop.scm (xdg-desktop-portal): Delet patches.
[native-search-paths]: Remove XDG_DESKTOP_PORTAL_DIR. Add $XDG_DATA_DIRS.
* gnu/packages/patches/
xdg-desktop-portal-disable-configuration-search-exit.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Change-Id: I26bde17cde75d1ccf5839d57145d5780b40cda9f
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/freedesktop.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch | 18 |
3 files changed, 4 insertions, 29 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 867e8d6a5c..4d5793b206 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2463,7 +2463,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 c897f9e75d..71183949e3 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me> ;;; Copyright © 2021, 2022, 2023 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021, 2022, 2024 John Kehayias <john.kehayias@protonmail.com> -;;; Copyright © 2021-2025 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021-2025 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> ;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> @@ -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) @@ -3328,10 +3329,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 @@ -3377,11 +3375,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 80d5d777a9..0000000000 --- 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 */ |