From 41ec0573b81733e15b70312d81cf7fdf77dd63fe Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Dec 2021 12:40:28 -0500 Subject: gnu: Remove meson-0.59 workarounds. Mostly automated with the following command: $ grep --include='*.scm' '#:meson ,meson-0.59' -rl \ | xargs sed -z 's/#:meson[^\n]*\s*//' -i * gnu/packages/freedesktop.scm (malcontent) (accountsservice): Delete #:meson argument. * gnu/packages/games.scm (gnome-2048): Likewise. * gnu/packages/geo.scm (gnome-maps): Likewise. * gnu/packages/gnome.scm (gnome-photos, gnome-music) (gnome-initial-setup, gnome-user-share, gnome-characters) (gnome-disk-utility, gnome-font-viewer, evince, glade3) (gnome-mines, gnome-sudoku, gnome-settings-daemon, devhelp) (totem, eog, gvfs, simple-scan, epiphany, gnome-session, gedit) (network-manager-applet, gnome-control-center, gnome-shell, nautilus) (gnome-default-applications, gnome-weather, gnome-tweaks, cheese, gthumb) (gitg, polari, gnome-boxes, gtranslator): Likewise. * gnu/packages/gtk.scm: (gtkmm-3): Likewise. * gnu/packages/pdf.scm (zathura): Likewise. * gnu/packages/photo.scm (entangle): Likewise. * gnu/packages/video.scm (pitivi): Likewise. * gnu/packages/virtualization.scm (libvirt-glib): Likewise. --- gnu/packages/freedesktop.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a7d400d3bf..844191a438 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -353,8 +353,7 @@ (define-public malcontent (base32 "0vnf0pk516fwwh41v96c29l2i7h1pnwhivlkbf53kkx1q35g7lb3")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.59 - #:glib-or-gtk? #t + `(#:glib-or-gtk? #t #:phases (modify-phases %standard-phases ;; AppInfo not available inside build environment. @@ -1378,8 +1377,7 @@ (define-public accountsservice (base32 "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.59 ;see https://github.com/mesonbuild/meson/issues/6470 - #:tests? #f ; XXX: tests require DocBook 4.1.2 + `(#:tests? #f ; XXX: tests require DocBook 4.1.2 #:configure-flags '("--localstatedir=/var" "-Dsystemdsystemunitdir=/tmp/empty" -- cgit v1.2.3 From 7ecc2e3d2badbd1f8f28f4b0ff283b8a2253acd0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Dec 2021 02:03:11 -0500 Subject: gnu: shadow: Update to 4.9. * gnu/packages/admin.scm (shadow): Update to 4.9. [source]: Remove hurd patch, merged upstream. [phases]{fix-linking-to-pam}: New phase. * gnu/packages/patches/shadow-hurd-pctrl.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 23 +++++++++++++---------- gnu/packages/freedesktop.scm | 8 ++++---- gnu/packages/patches/shadow-hurd-pctrl.patch | 16 ---------------- 4 files changed, 17 insertions(+), 31 deletions(-) delete mode 100644 gnu/packages/patches/shadow-hurd-pctrl.patch (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/local.mk b/gnu/local.mk index fe21cf8062..aa679ee6c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1791,7 +1791,6 @@ dist_patch_DATA = \ %D%/packages/patches/serf-python3.patch \ %D%/packages/patches/shakespeare-spl-fix-grammar.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ - %D%/packages/patches/shadow-hurd-pctrl.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 617c6098ee..65c0225826 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -805,16 +805,15 @@ (define-public inetutils (define-public shadow (package (name "shadow") - (version "4.8.1") + (version "4.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/shadow-maint/shadow/releases/" - "download/" version "/shadow-" version ".tar.xz")) - (patches (search-patches "shadow-hurd-pctrl.patch")) + "download/v" version "/shadow-" version ".tar.xz")) (sha256 (base32 - "0qmfq50sdhz6xilgxvinblll8j2iqfl7hwk45bq744y4plq4dbd3")))) + "0i4iijbshnwnsrskxzrh18xgmzff0hdpsnnkmyc2gdn1x4n1zv7y")))) (build-system gnu-build-system) (arguments `(;; Assume System V `setpgrp (void)', which is the default on GNU @@ -825,9 +824,16 @@ (define-public shadow '("--with-libpam")) "shadow_cv_logdir=/var/log" "ac_cv_func_setpgrp_void=yes") - #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-linking-to-pam + (lambda _ + ;; There's a build system problem in 4.9 that causes link + ;; failures with the pam libraries (see: + ;; https://github.com/shadow-maint/shadow/issues/407). + (substitute* "libsubid/Makefile.in" + (("\\$\\(LIBTCB\\)" all) + (string-append all " $(LIBPAM)"))))) ,@(if (%current-target-system) '((add-before 'configure 'set-runtime-shell (lambda* (#:key inputs #:allow-other-keys) @@ -848,8 +854,7 @@ (define-public shadow "libc")))) (substitute* "lib/nscd.c" (("/usr/sbin/nscd") - (string-append libc "/sbin/nscd"))) - #t))) + (string-append libc "/sbin/nscd")))))) (add-after 'install 'remove-groups (lambda* (#:key outputs #:allow-other-keys) ;; Remove `groups', which is already provided by Coreutils. @@ -857,9 +862,7 @@ (define-public shadow (bin (string-append out "/bin")) (man (string-append out "/share/man"))) (delete-file (string-append bin "/groups")) - (for-each delete-file (find-files man "^groups\\.")) - #t)))))) - + (for-each delete-file (find-files man "^groups\\.")))))))) (inputs `(,@(if (hurd-target?) '() diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 844191a438..8cd4cd833c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -621,10 +621,10 @@ (define-public elogind ;; existing in the build environment. (invoke "sed" "/src\\/test\\/test-user-util.c/,+2s/^/#/g" "-i" "src/test/meson.build") - ;; FIXME: This one times out for unknown reasons. - (invoke "sed" - "/src\\/libelogind\\/sd-event\\/test-event.c/,+2s/^/#/g" - "-i" "src/test/meson.build") + ;; ;; FIXME: This one times out for unknown reasons. + ;; (invoke "sed" + ;; "/src\\/libelogind\\/sd-event\\/test-event.c/,+2s/^/#/g" + ;; "-i" "src/test/meson.build") ;; This test tries to copy some bytes from /usr/lib/os-release, ;; which does not exist in the build container. Choose something ;; more likely to be available. diff --git a/gnu/packages/patches/shadow-hurd-pctrl.patch b/gnu/packages/patches/shadow-hurd-pctrl.patch deleted file mode 100644 index 2e376e19a9..0000000000 --- a/gnu/packages/patches/shadow-hurd-pctrl.patch +++ /dev/null @@ -1,16 +0,0 @@ -Avoid including sys/prctl.h on the Hurd. - -Upstream status: Not submitted. - ---- shadow-4.8.1/libmisc/idmapping.c.orig 2020-03-07 16:32:05.000000000 -0500 -+++ shadow-4.8.1/libmisc/idmapping.c 2020-03-07 16:32:27.000000000 -0500 -@@ -36,8 +36,8 @@ - #include - #include "prototypes.h" - #include "idmapping.h" --#include - #if HAVE_SYS_CAPABILITY_H -+#include - #include - #endif - -- cgit v1.2.3 From acaec1b5b72697b352f85ee0ed8dde623d055114 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Dec 2021 02:16:23 -0500 Subject: gnu: elogind: Reinstate the test-event.c test. * gnu/packages/freedesktop.scm (elogind)[phases]{adjust-tests}: Do not de-register the test-event.c test file from meson.build. --- gnu/packages/freedesktop.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8cd4cd833c..2443e64c5d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -621,10 +621,6 @@ (define-public elogind ;; existing in the build environment. (invoke "sed" "/src\\/test\\/test-user-util.c/,+2s/^/#/g" "-i" "src/test/meson.build") - ;; ;; FIXME: This one times out for unknown reasons. - ;; (invoke "sed" - ;; "/src\\/libelogind\\/sd-event\\/test-event.c/,+2s/^/#/g" - ;; "-i" "src/test/meson.build") ;; This test tries to copy some bytes from /usr/lib/os-release, ;; which does not exist in the build container. Choose something ;; more likely to be available. -- cgit v1.2.3 From e8c924296ffafd2fa918c9cb5635d3f26b60db11 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Dec 2021 22:53:04 -0500 Subject: gnu: wayland: Add python to native inputs. Since commit 5d20d7e1369fc7d93de19c0bd219937d697ceae6, meson no longer propagates Python. * gnu/packages/freedesktop.scm (wayland)[native-inputs]: Add python. --- gnu/packages/freedesktop.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 2443e64c5d..8cbed5dca8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -996,6 +996,7 @@ (define-public wayland ("dot" ,graphviz) ("doxygen" ,doxygen) ("pkg-config" ,pkg-config) + ("python" ,python) ("xmlto" ,xmlto) ("xsltproc" ,libxslt) ,@(if (%current-target-system) -- cgit v1.2.3 From b179c14bf6113e8c2dd15748a781d6f32c93e026 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Dec 2021 22:59:12 -0500 Subject: gnu: wayland-protocols: Add python to native inputs. Since commit 5d20d7e1369fc7d93de19c0bd219937d697ceae6, meson no longer propagates Python. * gnu/packages/freedesktop.scm (wayland-protocols)[native-inputs]: Add python. --- gnu/packages/freedesktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8cbed5dca8..7de53ef3a2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1033,7 +1033,7 @@ (define-public wayland-protocols (inputs (list wayland)) (native-inputs - (list pkg-config)) + (list pkg-config python)) (synopsis "Wayland protocols") (description "Wayland-Protocols contains Wayland protocols that add functionality not available in the Wayland core protocol. Such protocols either -- cgit v1.2.3