From 6cbee49d6668eb7fd738080666f66febfce8c7e8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 16 Mar 2018 07:47:34 -0400 Subject: gnu: All snippets report errors using exceptions, else return #t. * gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm, gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/bioinformatics.scm, gnu/packages/cdrom.scm, gnu/packages/chez.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/cross-base.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm, gnu/packages/databases.scm, gnu/packages/dns.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/enlightenment.scm, gnu/packages/fpga.scm, gnu/packages/freedesktop.scm, gnu/packages/ftp.scm, gnu/packages/games.scm, gnu/packages/gcc.scm, gnu/packages/geo.scm, gnu/packages/ghostscript.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphics.scm, gnu/packages/gtk.scm, gnu/packages/guile.scm, gnu/packages/irc.scm, gnu/packages/java.scm, gnu/packages/kerberos.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lxde.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/maths.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/music.scm, gnu/packages/netpbm.scm, gnu/packages/networking.scm, gnu/packages/node.scm, gnu/packages/nvi.scm, gnu/packages/ocaml.scm, gnu/packages/pdf.scm, gnu/packages/perl.scm, gnu/packages/php.scm, gnu/packages/plotutils.scm, gnu/packages/pretty-print.scm, gnu/packages/profiling.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/robotics.scm, gnu/packages/sawfish.scm, gnu/packages/scanner.scm, gnu/packages/scheme.scm, gnu/packages/scribus.scm, gnu/packages/sdl.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/slang.scm, gnu/packages/smalltalk.scm, gnu/packages/ssh.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/tbb.scm, gnu/packages/terminals.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/tls.scm, gnu/packages/unrtf.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm: In all snippets, report errors using exceptions, or else return #t. --- gnu/packages/freedesktop.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 3c83e668b0..36ff49a573 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -233,7 +233,8 @@ the freedesktop.org XDG Base Directory specification.") (substitute* "Makefile.am" ;; Avoid validation against DTD because the DTDs for ;; both doctype 4.2 and 4.5 are needed. - (("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid")))))) + (("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid")) + #t)))) (build-system gnu-build-system) (arguments `(#:tests? #f ;FIXME: "make check" in the "po" directory fails. -- cgit v1.2.3 From e923cee1b9b01ba9f616aec41678a908927111b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 18 Mar 2018 17:07:16 +0100 Subject: gnu: wayland: Disable failing tests. * gnu/packages/freedesktop.scm (wayland)[arguments]: Disable tests that fail in the build environment. --- gnu/packages/freedesktop.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d2b456153e..60a820cce1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès -;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau @@ -432,8 +432,11 @@ Python.") (base32 "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d")))) (build-system gnu-build-system) + ;; XXX These tests fail in the build environment. (arguments - `(#:parallel-tests? #f)) + `(#:make-flags '("XFAIL_TESTS=display-test \ +queue-test socket-test protocol-logger-test compositor-introspection-test \ +sanity-test connection-test"))) (native-inputs `(("doxygen" ,doxygen) ("graphviz" ,graphviz) -- cgit v1.2.3 From e35924865eefb1dcec0172773643e89179ee2807 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 19 Mar 2018 09:42:34 +0100 Subject: Revert "gnu: wayland: Disable failing tests." This reverts commit e923cee1b9b01ba9f616aec41678a908927111b6. --- gnu/packages/freedesktop.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 1e2ad3b864..7d4f747a6c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès -;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau @@ -432,11 +432,8 @@ Python.") (base32 "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d")))) (build-system gnu-build-system) - ;; XXX These tests fail in the build environment. (arguments - `(#:make-flags '("XFAIL_TESTS=display-test \ -queue-test socket-test protocol-logger-test compositor-introspection-test \ -sanity-test connection-test"))) + `(#:parallel-tests? #f)) (native-inputs `(("doxygen" ,doxygen) ("graphviz" ,graphviz) -- cgit v1.2.3 From 3f54fd1ea58fc8c21393fac466c0b168016b70db Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Mar 2018 01:57:20 -0400 Subject: gnu: elogind: Return #t from all phases. * gnu/packages/freedesktop.scm (elogin)[arguments]: Return #t from all phases. Use invoke and remove vestigial plumbing in the 'autogen' phase. --- gnu/packages/freedesktop.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9c70d906f7..c981271e84 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -275,11 +275,12 @@ the freedesktop.org XDG Base Directory specification.") ;; Fix compilation with glibc >= 2.26, which removed xlocale.h. ;; This can be removed for elogind 234. (substitute* "src/basic/parse-util.c" - (("xlocale\\.h") "locale.h")))) + (("xlocale\\.h") "locale.h")) + #t)) (add-before 'configure 'autogen (lambda _ - (and (zero? (system* "intltoolize" "--force" "--automake")) - (zero? (system* "autoreconf" "-vif"))))) + (invoke "intltoolize" "--force" "--automake") + (invoke "autoreconf" "-vif"))) (add-before 'build 'fix-service-file (lambda* (#:key outputs #:allow-other-keys) ;; Fix the file name of the 'elogind' binary in the D-Bus @@ -287,7 +288,8 @@ the freedesktop.org XDG Base Directory specification.") (substitute* "src/login/org.freedesktop.login1.service" (("^Exec=.*") (string-append "Exec=" (assoc-ref %outputs "out") - "/libexec/elogind/elogind\n"))))) + "/libexec/elogind/elogind\n"))) + #t)) (add-after 'install 'add-libcap-to-search-path (lambda* (#:key inputs outputs #:allow-other-keys) ;; Add a missing '-L' for libcap in libelogind.la. See -- cgit v1.2.3 From d4040f6e23f1777fdf5e402622edea94fa98d2be Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 25 Mar 2018 02:15:49 -0400 Subject: gnu: elogind: Fix build with glibc-2.27. * gnu/packages/patches/elogind-glibc-2.27.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/freedesktop.scm (elogind)[source]: Add patch. [arguments]: Replace the bootstrap phase with what was previously the autogen phase. --- gnu/packages/freedesktop.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index c981271e84..a0134c37fe 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau -;;; Copyright © 2017 Mark H Weaver +;;; Copyright © 2017, 2018 Mark H Weaver ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley @@ -38,6 +38,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) @@ -236,6 +237,7 @@ the freedesktop.org XDG Base Directory specification.") (sha256 (base32 "1qcxian48z2dj5gfmp7brrngdydqf2jm00f4rjr5sy1myh8fy931")) + (patches (search-patches "elogind-glibc-2.27.patch")) (modules '((guix build utils))) (snippet '(begin @@ -277,7 +279,7 @@ the freedesktop.org XDG Base Directory specification.") (substitute* "src/basic/parse-util.c" (("xlocale\\.h") "locale.h")) #t)) - (add-before 'configure 'autogen + (replace 'bootstrap (lambda _ (invoke "intltoolize" "--force" "--automake") (invoke "autoreconf" "-vif"))) -- cgit v1.2.3 From b707140bc50419a294a9fffd5d1ae18b0da81f3c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 29 Mar 2018 21:46:00 -0400 Subject: gnu: libqmi: Update to 1.20.0. * gnu/packages/freedesktop.scm (libqmi): Update to 1.20.0. [inputs]: Add libgudev. --- gnu/packages/freedesktop.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0f2a3d66e3..2dad010587 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -797,7 +797,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") (define-public libqmi (package (name "libqmi") - (version "1.14.2") + (version "1.20.0") (source (origin (method url-fetch) (uri (string-append @@ -805,8 +805,10 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") name "-" version ".tar.xz")) (sha256 (base32 - "0h009bzss4bal47nk21lyp4s3mmlcivhhaaj7r9229qvx85bi0v2")))) + "1d3fca477sdwbv4bsq1cl98qc8sixrzp0gqjcmjj8mlwfk9qqhi1")))) (build-system gnu-build-system) + (inputs + `(("libgudev" ,libgudev))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums ("pkg-config" ,pkg-config) -- cgit v1.2.3 From f035e5d0bcf84aa4051ae894d30ec97fb27c1145 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 24 May 2018 12:03:39 +0200 Subject: gnu: weston: Update to 4.0.0. * gnu/packages/freedesktop.scm (weston): Update to 4.0.0. [arguments]: Disable tests. --- gnu/packages/freedesktop.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 05b12789af..63c3a93957 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Mark H Weaver ;;; Copyright © 2017, 2018 Marius Bakke -;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -490,7 +490,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public weston (package (name "weston") - (version "3.0.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append @@ -498,7 +498,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "weston-" version ".tar.xz")) (sha256 (base32 - "19936zlkb75xcaidd8fag4ah8000wrh2ziqy7nxkq36pimgdbqfd")))) + "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -524,6 +524,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (string-append "--with-xserver-path=" (assoc-ref %build-inputs "xorg-server-xwayland") "/bin/Xwayland")) + #:tests? #f ; FIXME: Tests randomly fail. #:phases (modify-phases %standard-phases (add-before 'configure 'use-elogind -- cgit v1.2.3 From 26bcd2a2b2a2d44e71750159486bfd3b0d8230ad Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 24 May 2018 15:11:36 +0200 Subject: gnu: weston: Disable parallel tests. * gnu/packages/freedesktop.scm (weston): Disable parallel tests. --- 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 63c3a93957..57af63cfc2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -524,7 +524,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (string-append "--with-xserver-path=" (assoc-ref %build-inputs "xorg-server-xwayland") "/bin/Xwayland")) - #:tests? #f ; FIXME: Tests randomly fail. + #:parallel-tests? #f ; Parallel tests cause failures. #:phases (modify-phases %standard-phases (add-before 'configure 'use-elogind -- cgit v1.2.3 From 4d0f463d6b6c46659d282e8dc33d7e7e4222a53a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 29 May 2018 12:46:39 -0400 Subject: gnu: xdg-utils: Update to 1.1.3 [fixes CVE-2017-18266]. * gnu/packages/freedesktop.scm (xdg-utils): Update to 1.1.3. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 57af63cfc2..2fb62ea36f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -81,7 +81,7 @@ (define-public xdg-utils (package (name "xdg-utils") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) @@ -90,7 +90,7 @@ version ".tar.gz")) (sha256 (base32 - "1k4b4m3aiyqn9k12a0ihcdahzlspl3zhskmm1d7228dvqvi546cm")))) + "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) (build-system gnu-build-system) (native-inputs `(("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From 660c9b47885675aec374fe889504a8d686b091fa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 29 May 2018 22:11:04 +0200 Subject: gnu: modem-manager: Fix build. * gnu/packages/freedesktop.scm (modem-manager)[arguments]: Add configure flag to avoid aborting on certain warnings. --- gnu/packages/freedesktop.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9a01c78a1d..71b35894d9 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès -;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau @@ -841,7 +841,11 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") (build-system gnu-build-system) (arguments '(#:configure-flags - `(,(string-append "--with-udev-base-dir=" %output "/lib/udev")))) + `(,(string-append "--with-udev-base-dir=" %output "/lib/udev") + ;; FIXME: Without this flag the build fails with "error: assignment + ;; from incompatible pointer type" whenever the return value of + ;; "g_object_ref" is assigned to "ctx->self". + "--disable-more-warnings"))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 10ee03c1df568a9685c892efb1a1f00e2483cdf3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 06:44:35 +0200 Subject: gnu: python-pyxdg: Return #t from phases. * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/freedesktop.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a6b79f41b0..7df44dfb0f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -419,10 +419,11 @@ manager for the current system.") ;; AssertionError: 'x-apple-ios-png' != 'png' (substitute* "test/test-mime.py" (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#")) - (zero? (system* "nosetests" "-v"))))))) + (invoke "nosetests" "-v")))))) (native-inputs - `(("shared-mime-info" ,shared-mime-info) ;for tests - ("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests + ;; For tests. + `(("shared-mime-info" ,shared-mime-info) + ("hicolor-icon-theme" ,hicolor-icon-theme) ("python-nose" ,python-nose))) (home-page "https://www.freedesktop.org/wiki/Software/pyxdg") (synopsis "Implementations of freedesktop.org standards in Python") -- cgit v1.2.3