Message ID | 9ba315c8b275edc15894cb75936dacb552f49ab9.1720012870.git.i@dan.games |
---|---|
State | New |
Headers | show |
Series | [bug#71897,v3,1/2] gnu: xdg-desktop-portal: Update to 1.18.4. | expand |
Am Mittwoch, dem 03.07.2024 um 21:22 +0800 schrieb dan: > * gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: > New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to > 1.18.4. > [patches]: Disable portal tests. > [native-inputs]: Remove autoconf, automake, libtool and which. Add > python, > python-dbusmock, python-pytest and python-pytest-xdist. > [inputs]: Add bubblewrap. > [phases]<#:configureflags>: Update flags to meson options. Nit-pick: you misspelled #:configure-flags. > Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4 > --- > gnu/local.mk | 1 + > gnu/packages/freedesktop.scm | 25 +++++---- > ...-desktop-portal-disable-portal-tests.patch | 56 > +++++++++++++++++++ > 3 files changed, 72 insertions(+), 10 deletions(-) > create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable- > portal-tests.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index cf6b1d61b3..973c4a5dad 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -2240,6 +2240,7 @@ 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-portal- > tests.patch\ > %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ > %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ > %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ > diff --git a/gnu/packages/freedesktop.scm > b/gnu/packages/freedesktop.scm > index 6941450436..2015ee46f8 100644 > --- a/gnu/packages/freedesktop.scm > +++ b/gnu/packages/freedesktop.scm > @@ -38,6 +38,7 @@ > ;;; Copyright © 2022 Samuel Culpepper <sculpepper@newstore.com> > ;;; Copyright © 2024 aurtzy <aurtzy@gmail.com> > ;;; Copyright © 2024 Dariqq <dariqq@posteo.net> > +;;; Copyright © 2024 dan <i@dan.games> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -133,6 +134,7 @@ (define-module (gnu packages freedesktop) > #:use-module (gnu packages tls) > #:use-module (gnu packages valgrind) > #:use-module (gnu packages video) > + #:use-module (gnu packages virtualization) > #:use-module (gnu packages w3m) > #:use-module (gnu packages web) > #:use-module (gnu packages xdisorg) > @@ -2989,7 +2991,7 @@ (define-public libportal > (define-public xdg-desktop-portal > (package > (name "xdg-desktop-portal") > - (version "1.16.0") > + (version "1.18.4") > (source > (origin > (method url-fetch) > @@ -2998,18 +3000,21 @@ (define-public xdg-desktop-portal > version "/xdg-desktop-portal-" version ".tar.xz")) > (sha256 > (base32 > - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) > - (build-system gnu-build-system) > + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) > + ;; disable portal tests since they try to use fuse > + (patches (search-patches "xdg-desktop-portal-disable-portal- > tests.patch")))) > + (build-system meson-build-system) > (native-inputs > `(("pkg-config" ,pkg-config) > - ("autoconf" ,autoconf) > - ("automake" ,automake) > - ("libtool" ,libtool) > ("glib:bin" ,glib "bin") > - ("which" ,which) > - ("gettext" ,gettext-minimal))) > + ("gettext" ,gettext-minimal) > + ("python" ,python) > + ("python-dbusmock" ,python-dbusmock) > + ("python-pytest" ,python-pytest) > + ("python-pytest-xdist" ,python-pytest-xdist))) > (inputs > - `(("gdk-pixbuf" ,gdk-pixbuf) > + `(("bubblewrap" ,bubblewrap) > + ("gdk-pixbuf" ,gdk-pixbuf) > ("glib" ,glib) > ("flatpak" ,flatpak) > ("fontconfig" ,fontconfig) Since this is still using old-style inputs, it would be nice to follow up with a styling commit. Cheers
diff --git a/gnu/local.mk b/gnu/local.mk index cf6b1d61b3..973c4a5dad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2240,6 +2240,7 @@ 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-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xen-docs-use-predictable-ordering.patch \ %D%/packages/patches/xen-remove-config.gz-timestamp.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6941450436..2015ee46f8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2022 Samuel Culpepper <sculpepper@newstore.com> ;;; Copyright © 2024 aurtzy <aurtzy@gmail.com> ;;; Copyright © 2024 Dariqq <dariqq@posteo.net> +;;; Copyright © 2024 dan <i@dan.games> ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,6 +134,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -2989,7 +2991,7 @@ (define-public libportal (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.16.0") + (version "1.18.4") (source (origin (method url-fetch) @@ -2998,18 +3000,21 @@ (define-public xdg-desktop-portal version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav")))) - (build-system gnu-build-system) + "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q")) + ;; disable portal tests since they try to use fuse + (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + ("python" ,python) + ("python-dbusmock" ,python-dbusmock) + ("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("bubblewrap" ,bubblewrap) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("flatpak" ,flatpak) ("fontconfig" ,fontconfig) @@ -3021,7 +3026,7 @@ (define-public xdg-desktop-portal ("fuse" ,fuse))) (arguments `(#:configure-flags - (list "--with-systemd=no") + (list "-Dsystemd=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'po-chmod diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch new file mode 100644 index 0000000000..5e13493613 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch @@ -0,0 +1,56 @@ +From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001 +From: dan <i@dan.games> +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 +