guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 7d04e79c70c484486c99d519d79d7df7b6c86c08
Author: Danny Milosavljevic <[email protected]>
AuthorDate: Fri Feb 27 22:00:18 2026 +0100
gnu: xdg-desktop-portal: Delete version 1.18.4.
* gnu/packages/freedesktop.scm (xdg-desktop-portal): Delete variable.
(xdg-desktop-portal-next): Rename to ...
(xdg-desktop-portal): ...this.
(xdg-desktop-portal-next): New deprecation alias.
(xdg-desktop-portal-gtk)[propagated-inputs]: Replace xdg-desktop-portal-next
by xdg-desktop-portal.
* gnu/packages/telegram.scm (telegram-desktop)[propagated-inputs]: Replace
xdg-desktop-portal-next by xdg-desktop-portal.
*
gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch:
Delete file.
* gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: Delete
file.
* gnu/local.mk (dist_patch_DATA): Remove references to those.
Change-Id: I4317d2228002c1c6c65a9fab5aa502e905e4ec3e
---
gnu/local.mk | 2 -
gnu/packages/freedesktop.scm | 63 +++++++---------------
...-portal-disable-configuration-search-exit.patch | 27 ----------
.../xdg-desktop-portal-disable-portal-tests.patch | 56 -------------------
gnu/packages/telegram.scm | 2 +-
5 files changed, 21 insertions(+), 129 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 279052ea38..38d2b2ecad 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2585,8 +2585,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-disable-portal-tests.patch\
-
%D%/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.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 \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index aba08876a5..7dde4a1e33 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3204,7 +3204,7 @@ compatible with the well-known scripts of the same name.")
(define-public xdg-desktop-portal
(package
(name "xdg-desktop-portal")
- (version "1.18.4")
+ (version "1.20.3")
(source
(origin
(method url-fetch)
@@ -3213,15 +3213,19 @@ compatible with the well-known scripts of the same
name.")
version "/xdg-desktop-portal-" version ".tar.xz"))
(sha256
(base32
- "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q"))
+ "1p4yvbhqr8yf231gm69vdz3h7na8m6x1mhiw3bmhg4gm6x4idysb"))
(patches (search-patches
- ;; Disable portal tests since they try to use fuse.
- "xdg-desktop-portal-disable-portal-tests.patch"
-
"xdg-desktop-portal-disable-configuration-search-exit.patch"))))
+
"xdg-desktop-portal-1.20.3-disable-configuration-search-exit.patch"))
+ (modules '((guix build utils)))
+ ;; Disable failing tests.
+ (snippet #~(substitute* "tests/meson.build"
+ ((".*test_dynamiclauncher.*") "")
+ ((".*test_notification.*") "")
+ ((".*test_usb.*") "")))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
- (list "-Dsystemd=disabled")
+ (list "-Dsystemd=disabled" "-Ddocumentation=disabled")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'po-chmod
@@ -3253,9 +3257,13 @@ compatible with the well-known scripts of the same
name.")
gdk-pixbuf
geoclue
glib
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
json-glib
libportal
- pipewire))
+ pipewire
+ umockdev))
(native-search-paths
(list (search-path-specification
(variable "XDG_DESKTOP_PORTAL_DIR")
@@ -3274,41 +3282,10 @@ The portal interfaces include APIs for file access,
opening URIs, printing
and others.")
(license license:lgpl2.1+)))
-(define-public xdg-desktop-portal-next
- (let ((base xdg-desktop-portal))
- (package
- (inherit base)
- (version "1.20.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
-
"https://github.com/flatpak/xdg-desktop-portal/releases/download/";
- version "/xdg-desktop-portal-" version ".tar.xz"))
- (sha256
- (base32
- "1p4yvbhqr8yf231gm69vdz3h7na8m6x1mhiw3bmhg4gm6x4idysb"))
- (patches (search-patches
-
"xdg-desktop-portal-1.20.3-disable-configuration-search-exit.patch"))
- (modules '((guix build utils)))
- ;; Disable failing tests.
- (snippet #~(substitute* "tests/meson.build"
- ((".*test_dynamiclauncher.*") "")
- ((".*test_notification.*") "")
- ((".*test_usb.*") "")))))
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:configure-flags flags #~'())
- ;; Requires python-furo, which isn't packaged for guix, and depends
- ;; on node.js.
- #~(append '("-Ddocumentation=disabled")
- #$flags))))
- (inputs (modify-inputs (package-inputs base)
- (append gstreamer
- gst-plugins-base
- gst-plugins-good
- umockdev))))))
-
+;; Deprecation added on 2026-03-01.
+(define-deprecated-package xdg-desktop-portal-next
+ xdg-desktop-portal)
+
(define-public xdg-desktop-portal-gtk
(package
(name "xdg-desktop-portal-gtk")
@@ -3354,7 +3331,7 @@ and others.")
("gnome-desktop" ,gnome-desktop)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(propagated-inputs
- (list xdg-desktop-portal-next))
+ (list xdg-desktop-portal))
(home-page "https://github.com/flatpak/xdg-desktop-portal-gtk";)
(synopsis "GTK implementation of xdg-desktop-portal")
(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 eba07f8c35..0000000000
---
a/gnu/packages/patches/xdg-desktop-portal-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/portal-impl.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/portal-impl.c b/src/portal-impl.c
-index 8c1fd53..8708409 100644
---- a/src/portal-impl.c
-+++ b/src/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
diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch
b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch
deleted file mode 100644
index 5e13493613..0000000000
--- a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001
-From: dan <[email protected]>
-Date: Tue, 2 Jul 2024 19:37:38 +0800
-Subject: [PATCH] tests: remove portal tests.
-
----
- tests/meson.build | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index a2dafee..bcd87be 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -181,18 +181,6 @@ portal_tests = [
-
- test_env = env_tests
- test_env.set('XDG_CURRENT_DESKTOP', 'test')
--foreach p : portal_tests
-- test(
-- 'test-portals-@0@'.format(p),
-- test_portals,
-- args: ['--verbose', '--keep-going', '--tap', '-p',
'/portal/@0@'.format(p)],
-- depends: [test_backends, test_portals],
-- env: test_env,
-- is_parallel: false,
-- protocol: test_protocol,
-- suite: 'portals',
-- )
--endforeach
-
- # Split the portal tests into one test per portal, this makes debugging a lot
- # easier.
-@@ -204,18 +192,6 @@ portal_limited = [
-
- limited_env = env_tests
- limited_env.set('XDG_CURRENT_DESKTOP', 'limited')
--foreach p : portal_limited
-- test(
-- 'limited-portals-@0@'.format(p),
-- limited_portals,
-- args: ['--verbose', '--keep-going', '--tap', '-p',
'/limited/@0@'.format(p)],
-- depends: [test_backends, limited_portals],
-- env: limited_env,
-- is_parallel: false,
-- protocol: test_protocol,
-- suite: 'portals',
-- )
--endforeach
-
- if enable_installed_tests
- install_data(
-
-base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd
---
-2.41.0
-
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 6c65c9c4f3..ef81715a08 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -609,7 +609,7 @@ support for high performance Telegram Bot creation.")
`(,gtk+ "bin")
pkg-config
python-wrapper
- xdg-desktop-portal-next))
+ xdg-desktop-portal))
(inputs
(list abseil-cpp-cxxstd17
alsa-lib
