From 6d7786ff13c91f9881a0bbf424b71e2560dca168 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jan 2018 18:15:17 +0100 Subject: gnu: nspr: Build reproducibly. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Gábor Boskovits . * gnu/packages/gnuzilla.scm (nspr)[arguments]: Add #:make-flags to prevent indeterministic timestamps from being recorded. --- gnu/packages/gnuzilla.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a0819b809a..388c5db642 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -268,6 +268,10 @@ (define-public nspr (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) + ;; Use fixed timestamps for reproducibility. + #:make-flags '("SH_DATE='1970-01-01 00:00:01'" + ;; This is epoch 1 in microseconds. + "SH_NOW=100000") #:phases (modify-phases %standard-phases (add-before 'configure 'chdir (lambda _ (chdir "nspr") #t))))) -- cgit v1.2.3 From 31a7ef7091ebbdf69525481c5208579ad1eb35bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Feb 2018 16:55:45 +0100 Subject: gnu: libdrm: Update to 2.4.90. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.90. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8c9ef7adfa..0ca8c910fc 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -319,7 +319,7 @@ (define-public pixman (define-public libdrm (package (name "libdrm") - (version "2.4.89") + (version "2.4.90") (source (origin (method url-fetch) @@ -329,7 +329,7 @@ (define-public libdrm ".tar.bz2")) (sha256 (base32 - "0bm06vqqjbb06mlz2f2h4man0xp0dz928pyycs8q1d5vma19g7v2")) + "12xnbmqaysppkcb6zs9ih3l8m1cbk38ch0wrmn9c38ms3n7yqdyv")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2c01c42e9be13b7274241724ba92a899b372bbd3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Feb 2018 16:57:15 +0100 Subject: gnu: libva: Update to 2.1.0. * gnu/packages/video.scm (libva): Update to 2.1.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 61fe62ffd4..371d90a59c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -536,7 +536,7 @@ (define-public libmatroska (define-public libva (package (name "libva") - (version "2.0.0") + (version "2.1.0") (source (origin (method url-fetch) @@ -548,7 +548,7 @@ (define-public libva (string-append "https://www.freedesktop.org/software/vaapi/releases/" "libva/libva-" version "/libva-" version ".tar.bz2"))) (sha256 - (base32 "0cz5i62jnibmnx0i80i9yipq39v16qr6fw461f6hvrh9lbwh21mv")))) + (base32 "03sb1b3fxw8myf9kz6rxw5f3v1p0vfmk34779qx0q8fk24x9bypk")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c55a4956fd31547511a4cd2372bc9852610aceaa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Feb 2018 16:59:12 +0100 Subject: gnu: mesa: Update to 17.3.4. * gnu/packages/gl.scm (mesa): Update to 17.3.4. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 1dff039f57..78d5209fbe 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -221,7 +221,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "17.3.1") + (version "17.3.4") (source (origin (method url-fetch) @@ -233,7 +233,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1h94m2nkxa1y4n415d5idk2x2lkgbvjcikv6r2r6yn4ak7h0grls")) + "1l4h4phbam08llf1rmh25zwff1h1fb8q1ja6vnhg2pdw6gi9bybi")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch" "mesa-skip-disk-cache-test.patch")))) -- cgit v1.2.3 From 38692248ba1c6281ea4e9da59bcca0294bb7763a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Feb 2018 17:06:11 +0100 Subject: gnu: xkeyboard-config: Update to 2.23.1. * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.23.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 25eefe6f21..b66d6e7f5c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3821,7 +3821,7 @@ (define-public xkbutils (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.22") + (version "2.23.1") (source (origin (method url-fetch) @@ -3831,7 +3831,7 @@ (define-public xkeyboard-config ".tar.bz2")) (sha256 (base32 - "1garmbyfjp0han04l2l90zzwlfbdgdxl6r1qnic36i5wkycckbny")))) + "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 6c7dee98a13a0bc325d93b91f63cb10979f927d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Feb 2018 17:20:49 +0100 Subject: gnu: nss: Update to 3.35. * gnu/packages/gnuzilla.scm (nss): Update to 3.35. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 388c5db642..1c0385770f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -286,7 +286,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.34.1") + (version "3.35") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -297,7 +297,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3")) + "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) -- cgit v1.2.3 From e2832cdc3599e3bbc0362f9749835ffbae1b1944 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 19 Feb 2018 20:36:31 -0500 Subject: gnu: tzdata: Update to 2018c. * gnu/packages/base.scm (tzdata): Update to 2018c. --- gnu/packages/base.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 92acbd3640..80fb0c17c2 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1081,7 +1081,7 @@ (define-public glibc/hurd-headers (define-public tzdata (package (name "tzdata") - (version "2017c") + (version "2018c") (source (origin (method url-fetch) (uri (string-append @@ -1089,7 +1089,7 @@ (define-public tzdata version ".tar.gz")) (sha256 (base32 - "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n")))) + "1xik57rdi7kqa0wb5jbz7vyjyxpr88lw1g4kscj0ylpgnzjc6998")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1137,7 +1137,7 @@ (define-public tzdata version ".tar.gz")) (sha256 (base32 - "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41")))))) + "0rg6s1vlgwd8sjhla55hx2h5m2xbx0shm347pkbg4vsaz707zyii")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) -- cgit v1.2.3 From 5fff9d9db45a3842f6082362b58bed0fbea0e6cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jan 2018 19:51:16 +0100 Subject: gnu: perl-uri: Update to 1.73. * gnu/packages/web.scm (perl-uri): Update to 1.73. [native-inputs]: Add perl-test-needs. --- gnu/packages/web.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 10757cb546..64403088a4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3497,15 +3497,18 @@ (define-public perl-test-www-mechanize-psgi (define-public perl-uri (package (name "perl-uri") - (version "1.71") + (version "1.73") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "URI-" version ".tar.gz")) (sha256 (base32 - "05a1ck1bhvqkkk690xhsxf7276dnagk96qkh2jy4prrrgw6wm3lw")))) + "04z4xwiryrbxxi48bwbkgq9q9pwfgqry3wp0ramcrwv3dx5ap9yc")))) (build-system perl-build-system) + (native-inputs + ;; For tests. + `(("perl-test-needs" ,perl-test-needs))) (license l:perl-license) (synopsis "Perl Uniform Resource Identifiers (absolute and relative)") (description -- cgit v1.2.3 From 280b62b0746648783ae8bbe48ee3479b1b93cca5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 19 Feb 2018 20:00:11 +0100 Subject: gnu: pciutils: Update to 3.5.6. * gnu/packages/pciutils.scm (pciutils): Update to 3.5.6. --- gnu/packages/pciutils.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index e428aaedb0..1f3208bcaa 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2017 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,7 @@ (define-module (gnu packages pciutils) (define-public pciutils (package (name "pciutils") - (version "3.5.5") + (version "3.5.6") (source (origin (method url-fetch) (uri (string-append @@ -38,7 +39,7 @@ (define-public pciutils version ".tar.xz")) (sha256 (base32 - "1x9rb5y82rzg8b67lh42yy9ag9xr7kzibz566lffd41g37xghqhx")))) + "08dvsk1b5m1r7qqzsm849h4glq67mngf8zw7bg0102ff1jwywipk")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 3c747a080f015c9e62d76fc9b206b8393759e27a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Feb 2018 03:27:54 +0100 Subject: gnu: nss-certs: Update phase style. * gnu/packages/certs.scm (nss-certs)[arguments]: Use MODIFY-PHASES syntax, substitute INVOKE for SYSTEM*, and end phas with #t. --- gnu/packages/certs.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 30e53e3458..2b5ea3850a 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -102,8 +102,10 @@ (define-public nss-certs (srfi srfi-26) (ice-9 regex)) #:phases - (alist-cons-after - 'unpack 'install + (modify-phases + (map (cut assq <> %standard-phases) + '(set-paths install-locale unpack)) + (add-after 'unpack 'install (lambda _ (let ((certsdir (string-append %output "/etc/ssl/certs/")) (trusted-rx (make-regexp "^# openssl-trust=[a-zA-Z]" @@ -131,10 +133,9 @@ (define (maybe-install-cert file) ;; "Usage error; try -help." ;; This looks like a bug in openssl-1.0.2, but we can also ;; switch into the target directory. - (system* "c_rehash" ".")))) + (invoke "c_rehash" ".")) + #t)))))) - (map (cut assq <> %standard-phases) - '(set-paths install-locale unpack))))) (synopsis "CA certificates from Mozilla") (description "This package provides certificates for Certification Authorities (CA) -- cgit v1.2.3 From 62868f124cf9443a43f4ea5867da692e32e77c58 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 19 Feb 2018 23:47:46 -0500 Subject: gnu: tzdata: Preserve directory layout from before tzdata 2018a. tzdata 2018a instroduced some changes to the build and installation procedures that commit e2832cdc3 failed to address. They are described in the NEWS file. This is a followup to commit e2832cdc3599e3bbc0362f9749835ffbae1b1944. * gnu/packages/base.scm (tzdata)[arguments]: Set TZDEFAULT. Remove the time-zone utility programs in a build phase. --- gnu/packages/base.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 80fb0c17c2..f0964d7927 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1097,10 +1097,8 @@ (define-public tzdata (tmp (getenv "TMPDIR"))) (list (string-append "TOPDIR=" out) (string-append "TZDIR=" out "/share/zoneinfo") - - ;; Discard zic, dump, and tzselect, already - ;; provided by glibc. - (string-append "ETCDIR=" tmp "/etc") + (string-append "TZDEFAULT=" out + "/share/zoneinfo/localtime") ;; Likewise for the C library routines. (string-append "LIBDIR=" tmp "/lib") @@ -1121,6 +1119,9 @@ (define-public tzdata (lambda* (#:key outputs #:allow-other-keys) ;; Move data in the right place. (let ((out (assoc-ref outputs "out"))) + ;; Discard zic, dump, and tzselect, already + ;; provided by glibc. + (delete-file-recursively (string-append out "/usr")) (symlink (string-append out "/share/zoneinfo") (string-append out "/share/zoneinfo/posix")) (delete-file-recursively -- cgit v1.2.3 From 7dbd98a1d510178b8e2fcf2cd353d9a98c0ef80f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 20 Feb 2018 09:13:29 +0100 Subject: gnu: mesa: Update to 17.3.5. * gnu/packages/gl.scm (mesa): Update to 17.3.5. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 78d5209fbe..0a55814e00 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -221,7 +221,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "17.3.4") + (version "17.3.5") (source (origin (method url-fetch) @@ -233,7 +233,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1l4h4phbam08llf1rmh25zwff1h1fb8q1ja6vnhg2pdw6gi9bybi")) + "0slksyk2b3j74w6h6sv4kgnblbkmayqwb08lbhhf0wdaiby2i4pb")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch" "mesa-skip-disk-cache-test.patch")))) -- cgit v1.2.3 From 2395181a679792d98ae12985351e89996b2265b2 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 20 Feb 2018 09:17:34 +0100 Subject: gnu: Update copyright line. * gnu/packages/gl.scm: Update copyright line for commit 7dbd98a. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 0a55814e00..6bb5fab86b 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Arun Isaac -;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2017, 2018 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From ac85920a74bc7e8fb88820ff3858d143bc30a449 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Feb 2018 14:31:57 +0100 Subject: gnu: bluez: Update to 5.48. * gnu/packages/linux.scm (bluez): Update to 5.48. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5427a1feea..79507195f1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2969,7 +2969,7 @@ (define-public sbc (define-public bluez (package (name "bluez") - (version "5.47") + (version "5.48") (source (origin (method url-fetch) (uri (string-append @@ -2977,7 +2977,7 @@ (define-public bluez version ".tar.xz")) (sha256 (base32 - "1j22hfjz0fp4pgclgz9mfcwjbr4wqgah3gd2qhfg4r6msmybyxfg")))) + "140fjyxa2q4y35d9n52vki649jzb094pf71hxkkvlrpgf8q75a5r")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From f55ef78b5cede8b04463db781ea2d04eaaba3e7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Feb 2018 14:33:22 +0100 Subject: gnu: gtk+@2: Update to 2.24.32. * gnu/packages/patches/gtk2-fix-failing-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/gtk.scm (gtk+-2): Update to 2.24.32. [source]: Remove 'gtk2-fix-failing-test.patch'. --- gnu/local.mk | 1 - gnu/packages/gtk.scm | 7 ++--- gnu/packages/patches/gtk2-fix-failing-test.patch | 39 ------------------------ 3 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 gnu/packages/patches/gtk2-fix-failing-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2bb9e6d15c..b2f34a42d5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -730,7 +730,6 @@ dist_patch_DATA = \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ - %D%/packages/patches/gtk2-fix-failing-test.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e344a74308..10281c139e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -591,7 +591,7 @@ (define-public at-spi2-atk (define-public gtk+-2 (package (name "gtk+") - (version "2.24.31") + (version "2.24.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -599,11 +599,10 @@ (define-public gtk+-2 name "-" version ".tar.xz")) (sha256 (base32 - "0n26jm09n03nqbd00d2ij63xrby3vik56sk5yj6w1vy768kr5hb8")) + "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n")) (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" - "gtk2-theme-paths.patch" - "gtk2-fix-failing-test.patch")))) + "gtk2-theme-paths.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs diff --git a/gnu/packages/patches/gtk2-fix-failing-test.patch b/gnu/packages/patches/gtk2-fix-failing-test.patch deleted file mode 100644 index 721dc012c7..0000000000 --- a/gnu/packages/patches/gtk2-fix-failing-test.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 12d8b4e8f2f9c9a7707d1d3fccba382732212e3c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= -Date: Tue, 5 Dec 2017 20:06:36 +0100 -Subject: [PATCH] Fix test failing on new GLib versions. - -This test fails on newer GLib version, because GLib exports a new public marshaller. -The additional symbol making the test fail is: -g_cclosure_marshal_BOOLEAN__BOXED_BOXED - -The fix makes the test ignore non-gtk related abi. -This ensures if future marshallers are added to glib those will not pose a problem. - -The fix also ensures that the test still checks the gtk abi for identity, and -that the library provides a superset of the required abi. - -Upstream reponse to this problem was: - -GLib added a new marshaller in its public API -And the `abicheck.sh`in GTK+ 2.24 hasn't been updated because GTK+ 2.24 is in deep -maintenance mode and very few people test it against newer versions of GLib - ---- - gtk/abicheck.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh -index 0d033fb..53b7bfe 100755 ---- a/gtk/abicheck.sh -+++ b/gtk/abicheck.sh -@@ -1,5 +1,5 @@ - #! /bin/sh - - cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi --nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi -+nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | egrep '^gtk_' | sort > actual-abi - diff -u expected-abi actual-abi && rm -f expected-abi actual-abi --- -2.15.0 - -- cgit v1.2.3 From 4a82722a658220ec1e10f9f2d5d77407d38db90e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Feb 2018 14:47:24 +0100 Subject: gnu: gtk+: Update to 3.22.28. * gnu/packages/gtk.scm (gtk+): Update to 3.22.28. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 10281c139e..81a77fbf54 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -656,7 +656,7 @@ (define-public gtk+ (name "gtk+") ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; mate.scm will also need to be updated. - (version "3.22.26") + (version "3.22.28") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -664,7 +664,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "0rxrsh6bcp13hihxxs8f0m9xwniby4lmfi7y5mp9fhg5439z1vk1")) + "07syy63d2q12b7mkbhqpirq270365fsql5l9qsrdgzlc04mn36fj")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) -- cgit v1.2.3 From 7c9a1d5e8056a566780a2c2a026127d40096fa56 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Feb 2018 17:55:53 +0100 Subject: Revert "Revert "gnu: python2-flake8: Fix python-enum34 propagation."" This reverts commit b7049b2e23a514a1d9c131af484e808ee0ee4226. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5bbe472da6..b03382ca17 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5465,7 +5465,7 @@ (define-public python2-flake8 (package (inherit base) (propagated-inputs `(("python2-configparser" ,python2-configparser) - ("python2-enum" ,python2-enum) + ("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) ;; python-hacking requires flake8 <2.6.0. -- cgit v1.2.3 From 49057c8fc17e0f7135a98a57f2bdd338b96cb536 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Feb 2018 17:56:06 +0100 Subject: Revert "gnu: python2-tqdm: Work around missing flake8 propagation." This reverts commit 53f826cd0f429864d46fc3bf6305c14356d0b2ad. --- gnu/packages/python.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b03382ca17..3e410b0a51 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11979,18 +11979,10 @@ (define-public python-tqdm "Make loops show a progress bar on the console by just wrapping any iterable with @code{|tqdm(iterable)|}. Offers many options to define design and layout.") - (license (list license:mpl2.0 license:expat)) - (properties `((python2-variant . ,(delay python2-tqdm)))))) + (license (list license:mpl2.0 license:expat)))) (define-public python2-tqdm - (let ((tqdm (package-with-python2 - (strip-python2-variant python-tqdm)))) - (package - (inherit tqdm) - (native-inputs - ;; FIXME: This should be propagated from python2-flake8 instead. - `(("python2-enum34" ,python2-enum34) - ,@(package-native-inputs tqdm)))))) + (package-with-python2 python-tqdm)) (define-public python-pkginfo (package -- cgit v1.2.3 From 09183df2093614c624ac59563c7c159d82db7792 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Feb 2018 03:27:11 +0100 Subject: gnu: libical: Update to 3.0.2. * gnu/packages/calendar.scm (libical)[native-inputs]: Add PKG-CONFIG. [inputs]: Add GLIB and LIBXML2. Move ICU4C to ... [propagated-inputs]: ... here. [arguments]: Add #:configure-flags to only build shared libs. Don't access %build-inputs directly in PATCH-PATHS-PHASE. [license]: Add MPL2.0. --- gnu/packages/calendar.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 44bf05a9bb..474c1758cf 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -35,16 +35,19 @@ (define-module (gnu packages calendar) #:use-module (gnu packages databases) #:use-module (gnu packages dav) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages glib) #:use-module (gnu packages icu4c) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages time) + #:use-module (gnu packages xml) #:use-module (srfi srfi-26)) (define-public libical (package (name "libical") - (version "2.0.0") + (version "3.0.2") (source (origin (method url-fetch) (uri (string-append @@ -52,15 +55,18 @@ (define-public libical version "/libical-" version ".tar.gz")) (sha256 (base32 - "1njn2kr0rrjqv5g3hdhpdzrhankyj4fl1bgn76z3g4n1b7vi2k35")))) + "03k45dg79bf8lgymn94z2in1c3926v93h76xsap1svln63b3zg0c")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken + #:configure-flags '("-DSHARED_ONLY=true") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths - (lambda _ - (let ((tzdata (assoc-ref %build-inputs "tzdata"))) + (lambda* (#:key inputs #:allow-other-keys) + ;; FIXME: This should be patched to use TZDIR so we can drop + ;; the tzdata dependency. + (let ((tzdata (assoc-ref inputs "tzdata"))) (substitute* "src/libical/icaltz-util.c" (("\\\"/usr/share/zoneinfo\\\",") (string-append "\"" tzdata "/share/zoneinfo\"")) @@ -69,16 +75,22 @@ (define-public libical (("\\\"/usr/share/lib/zoneinfo\\\"") ""))) #t))))) (native-inputs - `(("perl" ,perl))) + `(("perl" ,perl) + ("pkg-config" ,pkg-config))) (inputs - `(("icu4c" ,icu4c) + `(("glib" ,glib) + ("libxml2" ,libxml2) ("tzdata" ,tzdata))) + (propagated-inputs + ;; In Requires.private of libical.pc. + `(("icu4c" ,icu4c))) (home-page "https://libical.github.io/libical/") (synopsis "iCalendar protocols and data formats implementation") (description "Libical is an implementation of the iCalendar protocols and protocol data units.") - (license license:lgpl2.1))) + ;; Can be used with either license. See COPYING. + (license (list license:lgpl2.1 license:mpl2.0)))) (define-public khal (package -- cgit v1.2.3 From 71a96ecb291da233783810797e00b5064dfd4020 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Feb 2018 18:08:16 +0100 Subject: gnu: nspr: Update to 4.18. * gnu/packages/gnuzilla.scm (nspr): Update to 4.18. --- gnu/packages/gnuzilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 6b6695cf0b..66b5383868 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 ng0 -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -250,7 +250,7 @@ (define-public mozjs-38 (define-public nspr (package (name "nspr") - (version "4.17") + (version "4.18") (source (origin (method url-fetch) (uri (string-append @@ -258,7 +258,7 @@ (define-public nspr version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "158hdn285dsb5rys8wl1wi32dd1axwhqq0r8fwny4aj157m0l2jr")))) + "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From eadcdc742207dccf29230fafe03634cad3af4707 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 20 Feb 2018 14:05:30 -0500 Subject: gnu: tzdata: Restore the test variant tzdata-for-tests. Commit 62868f124cf (gnu: tzdata: Preserve directory layout from before tzdata 2018a) changed the derivation of this package, which doesn't need to change yet. * gnu/packages/base.scm (tzdata-for-tests)[arguments]: Copy the build arguments from before commit 62868f124cf9443a43f4ea5867da692e32e77c58. --- gnu/packages/base.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 87a12e8b8c..b6c6dabae1 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1164,6 +1164,45 @@ (define-public tzdata-for-tests (sha256 (base32 "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n")))) + (arguments + '(#:tests? #f + #:make-flags (let ((out (assoc-ref %outputs "out")) + (tmp (getenv "TMPDIR"))) + (list (string-append "TOPDIR=" out) + (string-append "TZDIR=" out "/share/zoneinfo") + + ;; Discard zic, dump, and tzselect, already + ;; provided by glibc. + (string-append "ETCDIR=" tmp "/etc") + + ;; Likewise for the C library routines. + (string-append "LIBDIR=" tmp "/lib") + (string-append "MANDIR=" tmp "/man") + + "AWK=awk" + "CC=gcc")) + #:modules ((guix build utils) + (guix build gnu-build-system) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source inputs #:allow-other-keys) + (and (zero? (system* "tar" "xvf" source)) + (zero? (system* "tar" "xvf" (assoc-ref inputs "tzcode")))))) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + ;; Move data in the right place. + (let ((out (assoc-ref outputs "out"))) + (symlink (string-append out "/share/zoneinfo") + (string-append out "/share/zoneinfo/posix")) + (delete-file-recursively + (string-append out "/share/zoneinfo-posix")) + (copy-recursively (string-append out "/share/zoneinfo-leaps") + (string-append out "/share/zoneinfo/right")) + (delete-file-recursively + (string-append out "/share/zoneinfo-leaps"))))) + (delete 'configure)))) (inputs `(("tzcode" ,(origin (method url-fetch) (uri (string-append @@ -1173,7 +1212,6 @@ (define-public tzdata-for-tests (base32 "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41"))))))))) - (define-public libiconv (package (name "libiconv") -- cgit v1.2.3 From fe4910f2abbed045dc30e47a5d15ef225e5385b7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Feb 2018 14:04:20 +0100 Subject: gnu: libgsf: Update to 1.14.42. * gnu/packages/gnome.scm (libgsf): Update to 1.14.42. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bb8a2cb34d..7e8a17b9ef 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1157,7 +1157,7 @@ (define-public libcroco (define-public libgsf (package (name "libgsf") - (version "1.14.41") + (version "1.14.42") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1165,7 +1165,7 @@ (define-public libgsf name "-" version ".tar.xz")) (sha256 (base32 - "1lq87wnrsjbjafpk3c8xwd56gqx319fhck9xkg2da88hd9c9h2qm")))) + "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 98afa184138ec3ea5ddcf0d50328103d1232b958 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Feb 2018 14:09:37 +0100 Subject: gnu: json-glib: Update to 1.4.2. * gnu/packages/gnome.scm (json-glib): Update to 1.4.2. [build-system]: Change to MESON-BUILD-SYSTEM. [native-inputs]: Add GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7e8a17b9ef..fcbb7f31a8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2265,7 +2265,7 @@ (define-public dconf (define-public json-glib (package (name "json-glib") - (version "1.2.8") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2273,10 +2273,11 @@ (define-public json-glib name "-" version ".tar.xz")) (sha256 (base32 - "02pl0wl3mf47c038bgv2r4pa6pr6y3shjhxn1l7s3rrrgl1sjmgx")))) - (build-system gnu-build-system) + "1j3dd2xj1l9fi12m1gpmfgf5p4c1w0i970m6k62k3is98yj0jxrd")))) + (build-system meson-build-system) (native-inputs - `(("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (propagated-inputs -- cgit v1.2.3 From fb6550058e167c25bbcbe0ebcf51590f83506f23 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Feb 2018 15:41:24 +0100 Subject: gnu: libsndfile: Incorporate grafted changes. * gnu/packages/pulseaudio.scm (libsndfile)[replacement]: Remove field. [source](patches): Add "libsndfile-CVE-2017-12562.patch". (libsndfile/fixed): Remove variable. --- gnu/packages/pulseaudio.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 249afd3f68..9cfbe54b46 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -47,7 +47,6 @@ (define-module (gnu packages pulseaudio) (define-public libsndfile (package (name "libsndfile") - (replacement libsndfile/fixed) (version "1.0.28") (source (origin (method url-fetch) @@ -55,7 +54,8 @@ (define-public libsndfile version ".tar.gz")) (patches (search-patches "libsndfile-armhf-type-checks.patch" "libsndfile-CVE-2017-8361-8363-8365.patch" - "libsndfile-CVE-2017-8362.patch")) + "libsndfile-CVE-2017-8362.patch" + "libsndfile-CVE-2017-12562.patch")) (sha256 (base32 "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz")))) @@ -81,15 +81,6 @@ (define-public libsndfile for reading and writing new sound file formats.") (license l:gpl2+))) -(define libsndfile/fixed - (package - (inherit libsndfile) - (source (origin - (inherit (package-source libsndfile)) - (patches (append - (origin-patches (package-source libsndfile)) - (search-patches "libsndfile-CVE-2017-12562.patch"))))))) - (define-public libsamplerate (package (name "libsamplerate") ; aka. Secret Rabbit Code (SRC) -- cgit v1.2.3 From 5697897537b410f6e16aef80028928c05b437398 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 25 Feb 2018 04:28:21 +0100 Subject: gnu: json-glib: Fix 32-bit test failures. * gnu/packages/patches/json-glib-fix-tests-32bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnome.scm (json-glib)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 1 + .../patches/json-glib-fix-tests-32bit.patch | 174 +++++++++++++++++++++ 3 files changed, 176 insertions(+) create mode 100644 gnu/packages/patches/json-glib-fix-tests-32bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 49aea157a1..8151f7c9b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -788,6 +788,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jemalloc-arm-address-bits.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ + %D%/packages/patches/json-glib-fix-tests-32bit.patch \ %D%/packages/patches/jq-CVE-2015-8863.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c45c821a91..c4fb3398f4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2271,6 +2271,7 @@ (define-public json-glib (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "json-glib-fix-tests-32bit.patch")) (sha256 (base32 "1j3dd2xj1l9fi12m1gpmfgf5p4c1w0i970m6k62k3is98yj0jxrd")))) diff --git a/gnu/packages/patches/json-glib-fix-tests-32bit.patch b/gnu/packages/patches/json-glib-fix-tests-32bit.patch new file mode 100644 index 0000000000..77ea134915 --- /dev/null +++ b/gnu/packages/patches/json-glib-fix-tests-32bit.patch @@ -0,0 +1,174 @@ +Fix floating point issues on 32-bit platforms: + +https://gitlab.gnome.org/GNOME/json-glib/issues/27 + +This is an amalgamation of the following upstream commits: +https://gitlab.gnome.org/GNOME/json-glib/commit/70e2648e02232c1a439a7418388f18fee9afb3fe +https://gitlab.gnome.org/GNOME/json-glib/commit/675e27505776a1d77fa1ffd1974284890caec1f4 + +diff --git a/json-glib/tests/json-test-utils.h b/json-glib/tests/json-test-utils.h +new file mode 100644 +index 0000000..83a02c6 +--- /dev/null ++++ b/json-glib/tests/json-test-utils.h +@@ -0,0 +1,21 @@ ++#include ++#include ++#include ++#include ++#include ++ ++#define json_fuzzy_equals(n1,n2,epsilon) \ ++ (((n1) > (n2) ? ((n1) - (n2)) : ((n2) - (n1))) < (epsilon)) ++ ++#define json_assert_fuzzy_equals(n1,n2,epsilon) \ ++ G_STMT_START { \ ++ double __n1 = (n1), __n2 = (n2), __epsilon = (epsilon); \ ++ if (json_fuzzy_equals (__n1, __n2, __epsilon)) ; else { \ ++ g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ ++ #n1 " == " #n2 " (+/- " #epsilon ")", \ ++ __n1, "==", __n2, 'f'); \ ++ } \ ++ } G_STMT_END ++ ++#define json_assert_almost_equals(n1,n2) \ ++ json_assert_fuzzy_equals (n1, n2, DBL_EPSILON) +diff --git a/json-glib/tests/array.c b/json-glib/tests/array.c +index 98afeab..426cd72 100644 +--- a/json-glib/tests/array.c ++++ b/json-glib/tests/array.c +@@ -1,9 +1,4 @@ +-#include +-#include +-#include +- +-#include +-#include ++#include "json-test-utils.h" + + static void + test_empty_array (void) +@@ -37,7 +32,7 @@ test_add_element (void) + + json_array_add_double_element (array, 3.14); + g_assert_cmpint (json_array_get_length (array), ==, 3); +- g_assert_cmpfloat (json_array_get_double_element (array, 2), ==, 3.14); ++ json_assert_fuzzy_equals (json_array_get_double_element (array, 2), 3.14, 0.001); + + json_array_add_boolean_element (array, TRUE); + g_assert_cmpint (json_array_get_length (array), ==, 4); +diff --git a/json-glib/tests/node.c b/json-glib/tests/node.c +index 23bda63..80beb78 100644 +--- a/json-glib/tests/node.c ++++ b/json-glib/tests/node.c +@@ -1,6 +1,4 @@ +-#include +-#include +-#include ++#include "json-test-utils.h" + + static void + test_init_int (void) +@@ -19,7 +17,7 @@ test_init_double (void) + JsonNode *node = json_node_new (JSON_NODE_VALUE); + + json_node_set_double (node, 3.14159); +- g_assert_cmpfloat (json_node_get_double (node), ==, 3.14159); ++ json_assert_fuzzy_equals (json_node_get_double (node), 3.14159, 0.00001); + + json_node_free (node); + } +@@ -119,13 +117,13 @@ test_get_int (void) + + json_node_set_int (node, 0); + g_assert_cmpint (json_node_get_int (node), ==, 0); +- g_assert_cmpfloat (json_node_get_double (node), ==, 0.0); ++ json_assert_almost_equals (json_node_get_double (node), 0.0); + g_assert (!json_node_get_boolean (node)); + g_assert (!json_node_is_null (node)); + + json_node_set_int (node, 42); + g_assert_cmpint (json_node_get_int (node), ==, 42); +- g_assert_cmpfloat (json_node_get_double (node), ==, 42.0); ++ json_assert_almost_equals (json_node_get_double (node), 42.0); + g_assert (json_node_get_boolean (node)); + g_assert (!json_node_is_null (node)); + +@@ -138,7 +136,7 @@ test_get_double (void) + JsonNode *node = json_node_new (JSON_NODE_VALUE); + + json_node_set_double (node, 3.14); +- g_assert_cmpfloat (json_node_get_double (node), ==, 3.14); ++ json_assert_fuzzy_equals (json_node_get_double (node), 3.14, 0.001); + g_assert_cmpint (json_node_get_int (node), ==, 3); + g_assert (json_node_get_boolean (node)); + +@@ -232,9 +230,9 @@ test_gvalue_autopromotion (void) + g_print ("Expecting a gdouble, got a %s\n", g_type_name (G_VALUE_TYPE (&check))); + + g_assert_cmpint (G_VALUE_TYPE (&check), ==, G_TYPE_DOUBLE); +- g_assert_cmpfloat ((float) g_value_get_double (&check), ==, 3.14159f); ++ json_assert_fuzzy_equals (g_value_get_double (&check), 3.14159, 0.00001); + g_assert_cmpint (G_VALUE_TYPE (&value), !=, G_VALUE_TYPE (&check)); +- g_assert_cmpfloat ((gdouble) g_value_get_float (&value), ==, g_value_get_double (&check)); ++ json_assert_almost_equals (g_value_get_float (&value), g_value_get_double (&check)); + + g_value_unset (&value); + g_value_unset (&check); +diff --git a/json-glib/tests/parser.c b/json-glib/tests/parser.c +index f71584a..8c52a1d 100644 +--- a/json-glib/tests/parser.c ++++ b/json-glib/tests/parser.c +@@ -1,11 +1,5 @@ +-#include "config.h" +- ++#include "json-test-utils.h" + #include +-#include +- +-#include +- +-#include + + static const gchar *test_empty_string = ""; + static const gchar *test_empty_array_string = "[ ]"; +@@ -38,13 +32,13 @@ verify_string_value (JsonNode *node) + static void + verify_double_value (JsonNode *node) + { +- g_assert_cmpfloat (10.2e3, ==, json_node_get_double (node)); ++ json_assert_fuzzy_equals (10.2e3, json_node_get_double (node), 0.1); + } + + static void + verify_negative_double_value (JsonNode *node) + { +- g_assert_cmpfloat (-3.14, ==, json_node_get_double (node)); ++ json_assert_fuzzy_equals (-3.14, json_node_get_double (node), 0.01); + } + + static const struct { +diff --git a/json-glib/tests/reader.c b/json-glib/tests/reader.c +index 43a6aac..9bab312 100644 +--- a/json-glib/tests/reader.c ++++ b/json-glib/tests/reader.c +@@ -1,9 +1,4 @@ +-#include +-#include +- +-#include +- +-#include ++#include "json-test-utils.h" + + static const gchar *test_base_array_data = + "[ 0, true, null, \"foo\", 3.14, [ false ], { \"bar\" : 42 } ]"; +@@ -78,7 +73,7 @@ test_base_object (void) + g_assert (json_reader_get_error (reader) == NULL); + + json_reader_read_member (reader, "double"); +- g_assert_cmpfloat (json_reader_get_double_value (reader), ==, 42.47); ++ json_assert_fuzzy_equals (json_reader_get_double_value (reader), 42.47, 0.01); + json_reader_end_element (reader); + + g_object_unref (reader); -- cgit v1.2.3 From d0de4c40e24ee52e4382ee2ac82088932ab49099 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 19:57:53 +0100 Subject: gnu: ninja: Patch hard-coded /bin/echo reference. Solves a test failure on systems where open file limits are high enough for this test to run. See . * gnu/packages/ninja.scm (ninja)[arguments]: Add substitution. --- gnu/packages/ninja.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index adb236484f..779b6ab673 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -47,6 +47,7 @@ (define-public ninja (replace 'configure (lambda _ (substitute* "src/subprocess-posix.cc" + (("/bin/echo") (which "echo")) (("/bin/sh") (which "sh"))) #t)) (replace 'build -- cgit v1.2.3 From 6d796220c417a34100c282a7fa1f9afb6ac00339 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 20:58:14 +0100 Subject: gnu: ninja: Patch /bin/echo in the correct file. This is a follow-up to commit d0de4c40e24ee52e4382ee2ac82088932ab49099. * gnu/packages/ninja.scm (ninja)[arguments]: Adjust substitution. --- gnu/packages/ninja.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index 779b6ab673..5a168a6ada 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -47,8 +47,9 @@ (define-public ninja (replace 'configure (lambda _ (substitute* "src/subprocess-posix.cc" - (("/bin/echo") (which "echo")) (("/bin/sh") (which "sh"))) + (substitute* "src/subprocess_test.cc" + (("/bin/echo") (which "echo"))) #t)) (replace 'build (lambda _ -- cgit v1.2.3 From ac033c7ba1e14da42a67f493802be5a59dc66a57 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 6 Mar 2018 15:23:38 +0100 Subject: gnu: evolution-data-server: Update to 3.26.6. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.26.6. [arguments]: Set RUNPATH in #:configure-flags to match new libdir structure. Add phase 'dont-override-rpath' to make the build system respect it. --- gnu/packages/gnome.scm | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c876dbb6a9..2ce78ba73d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4875,7 +4875,7 @@ (define-public gnome-online-accounts (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.24.3") + (version "3.26.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4883,27 +4883,44 @@ (define-public evolution-data-server name "-" version ".tar.xz")) (sha256 (base32 - "1jj1q81bl3r0c8rnsfqi83igqlprzdcjim1fvygbyfy7b8gigqqk")))) + "1v0hwlrlm23bz5dmamdavm771f4gs64fyq82argrc0nwgn2a2fp4")))) (build-system cmake-build-system) (arguments '(;; XXX FIXME: 11/85 tests are failing. #:tests? #f #:configure-flags - (list "-DENABLE_UOA=OFF" ;disable Ubuntu Online Accounts support - "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support - "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication - "-DENABLE_VALA_BINDINGS=ON" - ;; FIXME: Building against ICU 60 requires C++11 or higher. Remove - ;; this when our default compiler is >= GCC6. - "-DCMAKE_CXX_FLAGS=-std=gnu++11" - "-DENABLE_INTROSPECTION=ON") ;required for Vala bindings + (let* ((lib (string-append (assoc-ref %outputs "out") + "/lib")) + (runpaths (map (lambda (s) (string-append + lib "/evolution-data-server/" s)) + '("addressbook-backends" "calendar-backends" + "camel-providers" "credential-modules" + "registry-modules")))) + (list "-DENABLE_UOA=OFF" ;disable Ubuntu Online Accounts support + "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support + "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication + "-DENABLE_VALA_BINDINGS=ON" + ;; FIXME: Building against ICU 60 requires C++11 or higher. Remove + ;; this when our default compiler is >= GCC6. + "-DCMAKE_CXX_FLAGS=-std=gnu++11" + (string-append "-DCMAKE_INSTALL_RPATH=" lib ";" + (string-append lib "/evolution-data-server;") + (string-join runpaths ";")) + "-DENABLE_INTROSPECTION=ON")) ;required for Vala bindings #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda _ (substitute* "tests/test-server-utils/e-test-server-utils.c" (("/bin/rm") (which "rm"))) - #t))))) + #t)) + (add-before 'configure 'dont-override-rpath + (lambda _ + (substitute* "CMakeLists.txt" + ;; CMakeLists.txt hard-codes runpath to just the libdir. + ;; Remove it so the configure flag is respected. + (("SET\\(CMAKE_INSTALL_RPATH .*") "")) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 4c8413cd617e56891939ac50c48a620c606ef145 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 6 Mar 2018 15:34:49 +0100 Subject: gnu: gnome-calendar: Update to 3.26.3. * gnu/packages/gnome.scm (gnome-calendar): Update to 3.26.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2ce78ba73d..de66705b05 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6167,7 +6167,7 @@ (define-public gnome-clocks (define-public gnome-calendar (package (name "gnome-calendar") - (version "3.26.2") + (version "3.26.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6175,7 +6175,7 @@ (define-public gnome-calendar name "-" version ".tar.xz")) (sha256 (base32 - "03n51mvlc0vabr1rx9577z927icl3mrxrrv8zckfjav6p4vwg8hr")))) + "1clnfvvsaqw9vpxrs6qrxzmgpaw9x2nkjik2x2vwvm07pdvhddxn")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 5de561a79634e0814ea22f1cfece9a09efa120be Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 6 Mar 2018 17:25:02 +0100 Subject: gnu: gnome-todo: Fix compatibility with libical >= 3.0. * gnu/packages/patches/gnome-todo-libical-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnome.scm (gnome-todo)[source](patches): Use it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 1 + gnu/packages/patches/gnome-todo-libical-compat.patch | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 gnu/packages/patches/gnome-todo-libical-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index ea9c5da0cc..6c64068528 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -724,6 +724,7 @@ dist_patch_DATA = \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ + %D%/packages/patches/gnome-todo-libical-compat.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index de66705b05..516a590dc4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6207,6 +6207,7 @@ (define-public gnome-todo (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "gnome-todo-libical-compat.patch")) (sha256 (base32 "106xx1w18pxjmj5k0k2qjzi6b3c3kaz7b5kyrpknykibnr401ff9")))) diff --git a/gnu/packages/patches/gnome-todo-libical-compat.patch b/gnu/packages/patches/gnome-todo-libical-compat.patch new file mode 100644 index 0000000000..34f2e254b2 --- /dev/null +++ b/gnu/packages/patches/gnome-todo-libical-compat.patch @@ -0,0 +1,17 @@ +Fix compatibility with libical 3.0. + +Patch copied from Arch Linux: +https://git.archlinux.org/svntogit/packages.git/tree/trunk/gnome-todo-3.26.2-libical-3.0.patch?h=packages/gnome-todo + +diff -up gnome-todo-3.26.2/src/gtd-task.c.libical-3.0 gnome-todo-3.26.2/src/gtd-task.c +--- gnome-todo-3.26.2/src/gtd-task.c.libical-3.0 2017-11-08 14:53:53.484294926 +0100 ++++ gnome-todo-3.26.2/src/gtd-task.c 2017-11-08 14:53:57.208294874 +0100 +@@ -778,7 +778,7 @@ gtd_task_set_complete (GtdTask *task, + dt->minute = g_date_time_get_minute (now); + dt->second = g_date_time_get_seconds (now); + dt->is_date = 0; +- dt->is_utc = 1; ++ dt->zone = icaltimezone_get_utc_timezone (); + + /* convert timezone + * -- cgit v1.2.3 From 7ac43c44e80541a53ed1751de904b0d8a5dc3a4a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Feb 2018 20:43:21 +0100 Subject: gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. Rename the function and move the declaration from gif_lib.h to gif_lib_private.h to solve conflicts when some .c-file #includes both stdlib.h and gif_lib.h. See also https://sourceforge.net/p/giflib/bugs/110/ * gnu/packages/patches/giflib-make-reallocarray-private.patch: New file * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/image.scm(giflib)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/image.scm | 4 +- .../patches/giflib-make-reallocarray-private.patch | 120 +++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/giflib-make-reallocarray-private.patch diff --git a/gnu/local.mk b/gnu/local.mk index d90d8a318d..c26d0e47d8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -697,6 +697,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/ghostscript-runpath.patch \ + %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/gimp-CVE-2017-17784.patch \ %D%/packages/patches/gimp-CVE-2017-17785.patch \ %D%/packages/patches/gimp-CVE-2017-17786.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e3e3a3ccc7..a397189037 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -572,7 +572,9 @@ (define-public giflib version ".tar.bz2")) (sha256 (base32 - "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")))) + "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")) + (patches (search-patches + "giflib-make-reallocarray-private.patch")))) (build-system gnu-build-system) (outputs '("bin" ; utility programs "out")) ; library diff --git a/gnu/packages/patches/giflib-make-reallocarray-private.patch b/gnu/packages/patches/giflib-make-reallocarray-private.patch new file mode 100644 index 0000000000..69228c5be8 --- /dev/null +++ b/gnu/packages/patches/giflib-make-reallocarray-private.patch @@ -0,0 +1,120 @@ +Move the declaration from gif_lib.h to gif_lib_private.h to solve +conflicts when some .c-file #includes both stdlib.h and gif_lib.h. +See also https://sourceforge.net/p/giflib/bugs/110/ + +diff -ur giflib-5.1.4.orig/lib/dgif_lib.c giflib-5.1.4/lib/dgif_lib.c +--- giflib-5.1.4.orig/lib/dgif_lib.c 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/dgif_lib.c 2018-02-28 22:38:11.659126414 +0100 +@@ -396,7 +396,7 @@ + + if (GifFile->SavedImages) { + SavedImage* new_saved_images = +- (SavedImage *)reallocarray(GifFile->SavedImages, ++ (SavedImage *)giflib_private_reallocarray(GifFile->SavedImages, + (GifFile->ImageCount + 1), sizeof(SavedImage)); + if (new_saved_images == NULL) { + GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM; +@@ -1108,7 +1108,7 @@ + if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) { + return GIF_ERROR; + } +- sp->RasterBits = (unsigned char *)reallocarray(NULL, ImageSize, ++ sp->RasterBits = (unsigned char *)giflib_private_reallocarray(NULL, ImageSize, + sizeof(GifPixelType)); + + if (sp->RasterBits == NULL) { +diff -ur giflib-5.1.4.orig/lib/gifalloc.c giflib-5.1.4/lib/gifalloc.c +--- giflib-5.1.4.orig/lib/gifalloc.c 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gifalloc.c 2018-02-28 22:38:11.657126423 +0100 +@@ -8,7 +8,7 @@ + #include + #include + +-#include "gif_lib.h" ++#include "gif_lib_private.h" + + #define MAX(x, y) (((x) > (y)) ? (x) : (y)) + +@@ -188,7 +188,7 @@ + + /* perhaps we can shrink the map? */ + if (RoundUpTo < ColorUnion->ColorCount) { +- GifColorType *new_map = (GifColorType *)reallocarray(Map, ++ GifColorType *new_map = (GifColorType *)giflib_private_reallocarray(Map, + RoundUpTo, sizeof(GifColorType)); + if( new_map == NULL ) { + GifFreeMapObject(ColorUnion); +@@ -232,7 +232,7 @@ + if (*ExtensionBlocks == NULL) + *ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock)); + else { +- ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray ++ ExtensionBlock* ep_new = (ExtensionBlock *)giflib_private_reallocarray + (*ExtensionBlocks, (*ExtensionBlockCount + 1), + sizeof(ExtensionBlock)); + if( ep_new == NULL ) +@@ -325,7 +325,7 @@ + if (GifFile->SavedImages == NULL) + GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage)); + else +- GifFile->SavedImages = (SavedImage *)reallocarray(GifFile->SavedImages, ++ GifFile->SavedImages = (SavedImage *)giflib_private_reallocarray(GifFile->SavedImages, + (GifFile->ImageCount + 1), sizeof(SavedImage)); + + if (GifFile->SavedImages == NULL) +@@ -355,7 +355,7 @@ + } + + /* next, the raster */ +- sp->RasterBits = (unsigned char *)reallocarray(NULL, ++ sp->RasterBits = (unsigned char *)giflib_private_reallocarray(NULL, + (CopyFrom->ImageDesc.Height * + CopyFrom->ImageDesc.Width), + sizeof(GifPixelType)); +@@ -369,7 +369,7 @@ + + /* finally, the extension blocks */ + if (sp->ExtensionBlocks != NULL) { +- sp->ExtensionBlocks = (ExtensionBlock *)reallocarray(NULL, ++ sp->ExtensionBlocks = (ExtensionBlock *)giflib_private_reallocarray(NULL, + CopyFrom->ExtensionBlockCount, + sizeof(ExtensionBlock)); + if (sp->ExtensionBlocks == NULL) { +diff -ur giflib-5.1.4.orig/lib/gif_lib.h giflib-5.1.4/lib/gif_lib.h +--- giflib-5.1.4.orig/lib/gif_lib.h 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gif_lib.h 2018-02-28 20:31:43.135716712 +0100 +@@ -244,9 +244,6 @@ + GifPixelType ColorTransIn2[]); + extern int GifBitSize(int n); + +-extern void * +-reallocarray(void *optr, size_t nmemb, size_t size); +- + /****************************************************************************** + Support for the in-core structures allocation (slurp mode). + ******************************************************************************/ +diff -ur giflib-5.1.4.orig/lib/gif_lib_private.h giflib-5.1.4/lib/gif_lib_private.h +--- giflib-5.1.4.orig/lib/gif_lib_private.h 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gif_lib_private.h 2018-02-28 22:38:11.657126423 +0100 +@@ -54,6 +54,9 @@ + bool gif89; + } GifFilePrivateType; + ++extern void * ++giflib_private_reallocarray(void *optr, size_t nmemb, size_t size); ++ + #endif /* _GIF_LIB_PRIVATE_H */ + + /* end */ +diff -ur giflib-5.1.4.orig/lib/openbsd-reallocarray.c giflib-5.1.4/lib/openbsd-reallocarray.c +--- giflib-5.1.4.orig/lib/openbsd-reallocarray.c 2018-02-28 20:31:02.295682659 +0100 ++++ giflib-5.1.4/lib/openbsd-reallocarray.c 2018-02-28 22:38:11.656126428 +0100 +@@ -27,7 +27,7 @@ + #define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) + + void * +-reallocarray(void *optr, size_t nmemb, size_t size) ++giflib_private_reallocarray(void *optr, size_t nmemb, size_t size) + { + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) { -- cgit v1.2.3 From b14a04b24bc0bbd5dc1196efc9e6c6bbffe8cb8e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Mar 2018 15:25:40 +0100 Subject: gnu: meson: Don't wrap the meson executable. * gnu/packages/build-tools.scm (meson)[arguments]: Delete WRAP-PHASE. --- gnu/packages/build-tools.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 2abb44fdb8..9fb7dfdccd 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -81,6 +81,11 @@ (define-public meson (base32 "06r8limj38mv884s5riiz6lpzw37cvhbf9jd0smzcbi7fwmv3yah")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; Meson calls the various executables in out/bin through the + ;; Python interpreter, so we cannot use the shell wrapper. + (delete 'wrap)))) (inputs `(("ninja", ninja))) (propagated-inputs `(("python" ,python))) (home-page "https://mesonbuild.com/") -- cgit v1.2.3 From d31558632cb2d2ca0a5a70000ee5e3e1cbc92948 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Mar 2018 15:26:21 +0100 Subject: gnu: meson-for-build: Update to 0.44.0. * gnu/packages/build-tools.scm (meson-for-build)[version]: Remove field. [source]: Inherit from MESON. --- gnu/packages/build-tools.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 9fb7dfdccd..94ca104c9b 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -103,15 +103,8 @@ (define-public meson-for-build (package (inherit meson) (name "meson-for-build") - (version "0.42.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mesonbuild/meson/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1494hdnd40g2v6pky34j0f2iwc6kwn51vck37qwz7nl2xr17b18q")) + (inherit (package-source meson)) (patches (search-patches "meson-for-build-rpath.patch")))) ;; People should probably install "meson", not "meson-for-build". -- cgit v1.2.3 From 3f6c185e0c2e800efed15761f5769761c8405289 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Mar 2018 15:29:19 +0100 Subject: gnu: meson: Update to 0.45.0. * gnu/packages/build-tools.scm (meson): Update to 0.45.0. [arguments]: Explicitly disable tests (they were skipped before). --- gnu/packages/build-tools.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 94ca104c9b..6a759f2b71 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -71,7 +71,7 @@ (define-public bam (define-public meson (package (name "meson") - (version "0.44.0") + (version "0.45.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -79,10 +79,14 @@ (define-public meson version ".tar.gz")) (sha256 (base32 - "06r8limj38mv884s5riiz6lpzw37cvhbf9jd0smzcbi7fwmv3yah")))) + "1r3wlimllakrswx2rb4mbdk1iricqk6myvdvib6dkyx362yanm9l")))) (build-system python-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH + ;; patch in meson-for-build, and patching many hard-coded file system + ;; locations in "run_unittests.py". + #:tests? #f + #:phases (modify-phases %standard-phases ;; Meson calls the various executables in out/bin through the ;; Python interpreter, so we cannot use the shell wrapper. (delete 'wrap)))) -- cgit v1.2.3 From 09a45ffb146fda75b87f89c729c31d1da5bf93da Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Mar 2018 17:30:22 +0100 Subject: build-system/meson: Add the output directory to RUNPATH. * guix/build/meson-build-system.scm (configure): Set LDFLAGS before invoking meson. --- guix/build/meson-build-system.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index 2b92240c52..e8cb5440eb 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -46,6 +46,15 @@ (define* (configure #:key outputs configure-flags build-type ,(string-append "--buildtype=" build-type) ,@configure-flags ,source-dir))) + + ;; Meson lacks good facilities for dealing with RUNPATH, so we + ;; add the output "lib" directory here to avoid doing that in + ;; many users. Related issues: + ;; * + ;; * + ;; * + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) + (mkdir build-dir) (chdir build-dir) (zero? (apply system* "meson" args)))) -- cgit v1.2.3 From d5b5a15a4046362377f1a45d466b43bb6e93d4f8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Mar 2018 17:32:20 +0100 Subject: build-system/meson: Skip the 'fix-runpath' phase on armhf. * guix/build-system/meson.scm (lower): Remove DEFAULT-PATCHELF from inputs on armhf. (meson-build): Ignore the 'fix-runpath' phase when building for arm systems. --- guix/build-system/meson.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index d7754e460a..529a2b8b0f 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Peter Mikkelsen +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,8 +81,15 @@ (define private-keywords (system system) (build-inputs `(("meson" ,meson) ("ninja" ,ninja) - ;; Add patchelf for (guix build rpath) to work. - ("patchelf" ,(default-patchelf)) + ;; XXX PatchELF fails to build on armhf, so we skip + ;; the 'fix-runpath' phase there for now. It is used + ;; to avoid superfluous entries in RUNPATH as described + ;; in , so armhf may now + ;; have different runtime dependencies from other arches. + ,@(if (not (string-prefix? "arm" (or (%current-target-system) + (%current-system)))) + `(("patchelf" ,(default-patchelf))) + '()) ,@native-inputs)) (host-inputs `(,@(if source `(("source" ,source)) @@ -139,7 +147,11 @@ (define builder #:inputs %build-inputs #:search-paths ',(map search-path-specification->sexp search-paths) - #:phases build-phases + #:phases + (if (string-prefix? "arm" ,(or (%current-target-system) + (%current-system))) + (modify-phases build-phases (delete 'fix-runpath)) + build-phases) #:configure-flags ,configure-flags #:build-type ,build-type #:tests? ,tests? -- cgit v1.2.3 From 285c091e80782bf46a0b4d75f41f1eb26105124a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Mar 2018 18:34:10 +0100 Subject: gnu: libinput: Update to 1.10.2. * gnu/packages/freedesktop.scm (libinput): Update to 1.10.2. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Add #:configure-flags to not build documentation. [native-inputs]: Add CHECK and VALGRIND. Move CAIRO and GTK+ ... [inputs]: ... here. Move LIBEVDEV, LIBWACOM and MTDEV ... [propagated-inputs]: ... here. (libinput-minimal)[native-inputs]: Inherit from LIBINPUT. [inputs]: New field; set to empty list. [arguments]: Inherit from LIBINPUT. Adjust to build system change. --- gnu/packages/freedesktop.scm | 50 ++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 3c83e668b0..a323778cab 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Mark H Weaver -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -30,10 +30,12 @@ (define-module (gnu packages freedesktop) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (gnu packages acl) @@ -68,11 +70,13 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages python) + #:use-module (gnu packages valgrind) #:use-module (gnu packages w3m) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (srfi srfi-1)) (define-public xdg-utils (package @@ -142,26 +146,31 @@ (define-public xdg-utils (define-public libinput (package (name "libinput") - (version "1.7.3") + (version "1.10.2") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89")))) - (build-system gnu-build-system) + "1fbv354ii1g4wc4k7d7gbnalqjpzmk9zlpi8linqrzlf6inpc28m")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags '("-Ddocumentation=false"))) (native-inputs - `(("cairo" ,cairo) - ("gtk+" ,gtk+) - ("pkg-config" ,pkg-config))) + `(("check" ,check) + ("pkg-config" ,pkg-config) + ("valgrind" ,valgrind))) (propagated-inputs - `(("libudev" ,eudev))) ; required by libinput.pc - (inputs - `(("glib" ,glib) + `(;; In Requires.private of libinput.pc. ("libevdev" ,libevdev) - ("mtdev" ,mtdev) - ("libwacom" ,libwacom))) + ("libudev" ,eudev) + ("libwacom" ,libwacom) + ("mtdev" ,mtdev))) + (inputs + `(("cairo" ,cairo) + ("glib" ,glib) + ("gtk+" ,gtk+))) (home-page "https://www.freedesktop.org/wiki/Software/libinput/") (synopsis "Input devices handling library") (description @@ -172,14 +181,15 @@ (define-public libinput (define-public libinput-minimal (package (inherit libinput) (name "libinput-minimal") - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("libevdev" ,libevdev) - ("mtdev" ,mtdev))) + (inputs '()) + (propagated-inputs + (alist-delete "libwacom" (package-propagated-inputs libinput))) (arguments - `(#:configure-flags - '("--disable-libwacom"))))) + (substitute-keyword-arguments (package-arguments libinput) + ((#:configure-flags flags ''()) + `(cons* "-Dlibwacom=false" + "-Ddebug-gui=false" ;requires gtk+@3 + ,flags)))))) (define-public libxdg-basedir (package -- cgit v1.2.3 From f4f69c5174783b1a5aa920cf275ccae6eff7394e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Mar 2018 19:03:53 +0100 Subject: gnu: libwacom: Update to 0.29. * gnu/packages/xdisorg.scm (libwacom): Update to 0.29. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 444c3ea39b..443d618aab 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -885,14 +885,14 @@ (define-public xcape (define-public libwacom (package (name "libwacom") - (version "0.26") + (version "0.29") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/linuxwacom/libwacom/" name "-" version ".tar.bz2")) (sha256 (base32 - "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63")))) + "1diklgcjhmvcxi9p1ifp6wcnyr6k7z9jhrlzfhzjqd6zipk01slw")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From ee9c7156a4cca33fe7d7143fd3f20f675aa0ccc7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Mar 2018 19:04:14 +0100 Subject: gnu: xf86-input-wacom: Update to 0.36.0. * gnu/packages/xdisorg.scm (xf86-input-wacom): Update to 0.36.0. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 443d618aab..d5dc0f10f1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -917,7 +917,7 @@ (define-public libwacom (define-public xf86-input-wacom (package (name "xf86-input-wacom") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (string-append @@ -925,7 +925,7 @@ (define-public xf86-input-wacom name "-" version ".tar.bz2")) (sha256 (base32 - "0za44snc0zirq65a4lxsmg7blp1bynj6j835hm459x8yx1qhmxjm")))) + "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza")))) (arguments `(#:configure-flags (list (string-append "--with-sdkdir=" -- cgit v1.2.3 From fe2520c389d7c8dced432e9687d51f19fba817d6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:28:14 +0100 Subject: gnu: libical: Update to 3.0.3. * gnu/packages/calendar.scm (libical): Update to 3.0.3. --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 474c1758cf..b2f6aec83d 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -47,7 +47,7 @@ (define-module (gnu packages calendar) (define-public libical (package (name "libical") - (version "3.0.2") + (version "3.0.3") (source (origin (method url-fetch) (uri (string-append @@ -55,7 +55,7 @@ (define-public libical version "/libical-" version ".tar.gz")) (sha256 (base32 - "03k45dg79bf8lgymn94z2in1c3926v93h76xsap1svln63b3zg0c")))) + "0hcjyf35b8rrvy8xziqxc4imi28mmkixb09gknisvp6jsa5fp4av")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken -- cgit v1.2.3 From a270ba9e01fa1d0e906058176c50331d2037e8d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 8 Mar 2018 18:09:02 +0100 Subject: gnu: libxshmfence: Update to 1.3. * gnu/packages/xorg.scm (libxshmfence): Update to 1.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1bdb1add07..3a822871c7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1028,7 +1028,7 @@ (define-public libdmx (define-public libxshmfence (package (name "libxshmfence") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) (uri (string-append @@ -1036,7 +1036,7 @@ (define-public libxshmfence name "-" version ".tar.bz2")) (sha256 (base32 - "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj")))) + "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("xproto" ,xproto))) -- cgit v1.2.3 From 7b5506fc718ca3df99f180e90de8338c07193cc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 09:49:48 +0100 Subject: gnu: xkbcomp: Update to 1.4.1. * gnu/packages/xorg.scm (xkbcomp-intermediate): Update to 1.4.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3a822871c7..b258f446b9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3707,7 +3707,7 @@ (define-public xinput (define xkbcomp-intermediate ; used as input for xkeyboard-config (package (name "xkbcomp-intermediate") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) @@ -3717,7 +3717,7 @@ (define xkbcomp-intermediate ; used as input for xkeyboard-config ".tar.bz2")) (sha256 (base32 - "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw")))) + "0djp7bb0ch2ddwmc1bkg4fddxdvamiiz375x0r0ni5dcb37w93bl")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) -- cgit v1.2.3 From ddc162afd48a7a4f10c772d3e7fd2f382dffd742 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:38:27 +0100 Subject: gnu: nspr: Update to 4.19. * gnu/packages/gnuzilla.scm (nspr): Update to 4.19. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a097e2df7a..dfc6e1080f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -250,7 +250,7 @@ (define-public mozjs-38 (define-public nspr (package (name "nspr") - (version "4.18") + (version "4.19") (source (origin (method url-fetch) (uri (string-append @@ -258,7 +258,7 @@ (define-public nspr version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq")))) + "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 9fcec717d3912c3c4bc05f81703e51ce93ae8753 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:38:55 +0100 Subject: gnu: nss, nss-certs: Update to 3.36. * gnu/packages/gnuzilla.scm (nss): Update to 3.36. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index e016d9f2ad..3cbf9202f9 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -75,7 +75,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.35") + (version "3.36") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -86,7 +86,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl")))) + "1580qc0a4s8v3k3vg7zz4xly4alkjrw7qq9zy2nf6p4v56wcfg53")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index dfc6e1080f..c9c96c4746 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -286,7 +286,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.35") + (version "3.36") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -297,7 +297,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl")) + "1580qc0a4s8v3k3vg7zz4xly4alkjrw7qq9zy2nf6p4v56wcfg53")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) -- cgit v1.2.3 From 8aca66be5386f521799733e69eb7c47402081459 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:40:21 +0100 Subject: gnu: bluez: Update to 5.49. * gnu/packages/linux.scm (bluez): Update to 5.49. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 875f110622..7a02657f53 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2991,7 +2991,7 @@ (define-public sbc (define-public bluez (package (name "bluez") - (version "5.48") + (version "5.49") (source (origin (method url-fetch) (uri (string-append @@ -2999,7 +2999,7 @@ (define-public bluez version ".tar.xz")) (sha256 (base32 - "140fjyxa2q4y35d9n52vki649jzb094pf71hxkkvlrpgf8q75a5r")))) + "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 569c33309efacd6f28f0ab32af006bc0e839af7e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:46:45 +0100 Subject: gnu: alsa-lib: Update to 1.1.5. * gnu/packages/linux.scm (alsa-lib): Update to 1.1.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7a02657f53..2fe5ea269b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -960,7 +960,7 @@ (define-public ltrace (define-public alsa-lib (package (name "alsa-lib") - (version "1.1.4.1") + (version "1.1.5") (source (origin (method url-fetch) (uri (string-append @@ -968,7 +968,7 @@ (define-public alsa-lib version ".tar.bz2")) (sha256 (base32 - "0xjvi381105gldhv0z872a0x58sghznyx19j45lw5iyi2h68gfwi")))) + "1rhacnlj0grvfagjx5qzsnbhw7m7lyccghqs4jsv0dnsqv9qmxpl")))) (build-system gnu-build-system) (home-page "https://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") -- cgit v1.2.3 From c86e7a893f3a708d4bfec99648149b3fc7209e4c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:47:03 +0100 Subject: gnu: alsa-utils: Update to 1.1.5. * gnu/packages/linux.scm (alsa-utils): Update to 1.1.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2fe5ea269b..b9f6e99e4d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -980,14 +980,14 @@ (define-public alsa-lib (define-public alsa-utils (package (name "alsa-utils") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "17cxih9ibjp1193dyd79j50pyfa9dvrs6r9kpwrvzicjvr2110x7")))) + "1s727md6mb408y2cfwzjkx23abxhampyrjdkgpyygdhxx62x42rj")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. -- cgit v1.2.3 From 5f42430367d3f0509585b6e4c03784be76ec6ce2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:48:37 +0100 Subject: gnu: alsa-plugins: Update to 1.1.5. * gnu/packages/linux.scm (alsa-plugins): Update to 1.1.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b9f6e99e4d..c0c963ec55 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1027,14 +1027,14 @@ (define-public alsa-utils (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "12hsvm6rpinjkg06pa9hzndkdrbfw6wk6yk00cm8y1gbv8xiq3ak")))) + "073zpgvj4pldmzqq97l40wngvbqnvrkc8yw153mgny9kypwaazbr")))) (build-system gnu-build-system) ;; TODO: Split libavcodec and speex if possible. It looks like they can not ;; be split, there are references to both in files. -- cgit v1.2.3 From f3b97f4770399857d1ccf39239cbb64ca0a5a675 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:51:48 +0100 Subject: gnu: libdrm: Update to 2.4.91. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.91. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d5dc0f10f1..407f2f80df 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -319,7 +319,7 @@ (define-public pixman (define-public libdrm (package (name "libdrm") - (version "2.4.90") + (version "2.4.91") (source (origin (method url-fetch) @@ -329,7 +329,7 @@ (define-public libdrm ".tar.bz2")) (sha256 (base32 - "12xnbmqaysppkcb6zs9ih3l8m1cbk38ch0wrmn9c38ms3n7yqdyv")) + "0068dn47c478vm1lyyhy02gilrpsma0xmcblhvs0dzqyrk80wjk3")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From f961231368370feb7440973d41e1557464d65996 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:56:00 +0100 Subject: gnu: libepoxy: Update to 1.5.0. * gnu/packages/gl.scm (libepoxy): Update to 1.5.0. [arguments]: Remove obsolete substitution. --- gnu/packages/gl.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6ce7fbc9b8..039f6a62db 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -556,7 +556,7 @@ (define (dynamic-link-substitute file lib input) (define-public libepoxy (package (name "libepoxy") - (version "1.4.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append @@ -564,7 +564,7 @@ (define-public libepoxy version "/libepoxy-" version ".tar.xz")) (sha256 (base32 - "19hsyap2p0sflj75ycf4af9bsp453bamymbcgnmrphigabsspil8")))) + "1md58amxyp34yjnw4xa185hw5jm0hnb2xnhdc28zdsx6k19rk52c")))) (arguments `(#:phases (modify-phases %standard-phases @@ -575,10 +575,6 @@ (define-public libepoxy (mesa (assoc-ref inputs "mesa"))) (substitute* "src/gen_dispatch.py" (("/usr/bin/env python") python)) - ;; Add support for aarch64, see upstream: - ;; https://github.com/anholt/libepoxy/pull/114 - (substitute* "test/dlwrap.c" - (("GLIBC_2.4") "GLIBC_2.17\", \"GLIBC_2.4")) (substitute* (find-files "." "\\.[ch]$") (("libGL.so.1") (string-append mesa "/lib/libGL.so.1")) (("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1"))) -- cgit v1.2.3 From b7184cf1a706d3536c4c64efb9bf3c37c63b4c1c Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 27 Feb 2018 08:27:36 +0100 Subject: gnu: mesa: Update to 17.3.6. * gnu/packages/gl.scm (mesa): Update to 17.3.6. Signed-off-by: Marius Bakke --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 039f6a62db..2a674a9fb7 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -222,7 +222,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "17.3.5") + (version "17.3.6") (source (origin (method url-fetch) @@ -234,7 +234,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "0slksyk2b3j74w6h6sv4kgnblbkmayqwb08lbhhf0wdaiby2i4pb")) + "1y7vawz2sbpzdqk4b60w8kfrxb2rfkdjkifyxxfx1jaasj05d4g5")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch" "mesa-skip-disk-cache-test.patch")))) -- cgit v1.2.3 From 54130743c5318840f9dc829628bd61cd12b3df0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 18:02:08 +0100 Subject: gnu: libogg: Update to 1.3.3. * gnu/packages/xiph.scm (libogg): Update to 1.3.3. --- gnu/packages/xiph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index a8e7833990..f9caea4192 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -57,14 +57,14 @@ (define-module (gnu packages xiph) (define libogg (package (name "libogg") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) (uri (string-append "http://downloads.xiph.org/releases/ogg/libogg-" version ".tar.xz")) (sha256 (base32 - "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z")))) + "022wjlzn8fx7mfby4pcgyjwx8zir7jr7cizichh3jgaki8bwcgsg")))) (build-system gnu-build-system) (synopsis "Library for manipulating the ogg multimedia format") (description -- cgit v1.2.3 From c24f1f1614a2ba7ff7c5828a8753f82c9792349a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Mar 2018 21:33:29 +0200 Subject: gnu: patchelf: Use 'target-arm32?' for armhf-linux case. * gnu/packages/elf.scm (patchelf)[inputs]: Replace armhf-linux detection logic with 'target-arm32?' macro. [arguments]: Same. --- gnu/packages/elf.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 8fb568b841..8329637da3 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -22,6 +22,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages elf) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -121,12 +122,12 @@ (define-public patchelf ;; patch makes significant changes to the algorithm, possibly ;; introducing bugs. So, we apply the patch only on ARM systems. (inputs - (if (string-prefix? "arm" (or (%current-target-system) (%current-system))) + (if (target-arm32?) `(("patch/rework-for-arm" ,(search-patch "patchelf-rework-for-arm.patch"))) '())) (arguments - (if (string-prefix? "arm" (or (%current-target-system) (%current-system))) + (if (target-arm32?) `(#:phases (alist-cons-after 'unpack 'patch/rework-for-arm (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From c1d1cd817c7ab8d99e962e286c207943765a8e8f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Mar 2018 21:43:09 +0200 Subject: gnu: patchelf: Update argument phase. * gnu/packages/elf.scm (patchelf)[arguments]: Use 'modify-phases' syntax. Replace 'system*' with 'invoke'. --- gnu/packages/elf.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 8329637da3..350cd2a3c1 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -128,14 +128,12 @@ (define-public patchelf '())) (arguments (if (target-arm32?) - `(#:phases (alist-cons-after - 'unpack 'patch/rework-for-arm - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch-file - (assoc-ref inputs "patch/rework-for-arm"))) - (zero? (system* "patch" "--force" "-p1" - "--input" patch-file)))) - %standard-phases)) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch/rework-for-arm + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch-file (assoc-ref inputs "patch/rework-for-arm"))) + (invoke "patch" "--force" "-p1" "--input" patch-file)))))) '())) (home-page "https://nixos.org/patchelf.html") -- cgit v1.2.3 From 05666fb8dbcc7cb482ba1e4caa0fba333a738621 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Mar 2018 21:44:50 +0200 Subject: patchelf: Use 'https' for source uri. * gnu/packages/elf.scm (patchelf)[source]: Use 'https' for source uri. --- gnu/packages/elf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 350cd2a3c1..08d92532fa 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -109,7 +109,7 @@ (define-public patchelf (source (origin (method url-fetch) (uri (string-append - "http://nixos.org/releases/patchelf/patchelf-" + "https://nixos.org/releases/patchelf/patchelf-" version "/patchelf-" version ".tar.bz2")) (sha256 -- cgit v1.2.3 From 24a2e9172a2d8970d57865c6130f2184385183a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Mar 2018 22:06:22 +0200 Subject: build-system/meson: Use 'target-arm32?' for armhf-linux case. * guix/build-system/meson.scm (lower, meson-build): Replace armhf-linux detection with 'target-arm32?' macro. --- guix/build-system/meson.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 529a2b8b0f..88a7b58286 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -86,8 +86,7 @@ (define private-keywords ;; to avoid superfluous entries in RUNPATH as described ;; in , so armhf may now ;; have different runtime dependencies from other arches. - ,@(if (not (string-prefix? "arm" (or (%current-target-system) - (%current-system)))) + ,@(if (not (target-arm32?)) `(("patchelf" ,(default-patchelf))) '()) ,@native-inputs)) @@ -148,8 +147,7 @@ (define builder #:search-paths ',(map search-path-specification->sexp search-paths) #:phases - (if (string-prefix? "arm" ,(or (%current-target-system) - (%current-system))) + (if (target-arm32?) (modify-phases build-phases (delete 'fix-runpath)) build-phases) #:configure-flags ,configure-flags -- cgit v1.2.3 From b1d096f869ed53b84486855d73c7e9070fdf3ae2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 19 Mar 2018 23:46:25 +0100 Subject: Revert "gnu: patchelf: Update argument phase." It causes too many rebuilds this late in the 'staging' cycle. This reverts commit c1d1cd817c7ab8d99e962e286c207943765a8e8f. --- gnu/packages/elf.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 08d92532fa..253547e70f 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -128,12 +128,14 @@ (define-public patchelf '())) (arguments (if (target-arm32?) - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch/rework-for-arm - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch-file (assoc-ref inputs "patch/rework-for-arm"))) - (invoke "patch" "--force" "-p1" "--input" patch-file)))))) + `(#:phases (alist-cons-after + 'unpack 'patch/rework-for-arm + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch-file + (assoc-ref inputs "patch/rework-for-arm"))) + (zero? (system* "patch" "--force" "-p1" + "--input" patch-file)))) + %standard-phases)) '())) (home-page "https://nixos.org/patchelf.html") -- cgit v1.2.3 From 061f204dcd9d003a45026baff4bd1492306029d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Mar 2018 00:03:05 +0100 Subject: Revert "build-system/meson: Use 'target-arm32?' for armhf-linux case." This requires adding (guix utils) to the build inputs, and causes too many rebuilds for now. This reverts commit 24a2e9172a2d8970d57865c6130f2184385183a3. --- guix/build-system/meson.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 88a7b58286..529a2b8b0f 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -86,7 +86,8 @@ (define private-keywords ;; to avoid superfluous entries in RUNPATH as described ;; in , so armhf may now ;; have different runtime dependencies from other arches. - ,@(if (not (target-arm32?)) + ,@(if (not (string-prefix? "arm" (or (%current-target-system) + (%current-system)))) `(("patchelf" ,(default-patchelf))) '()) ,@native-inputs)) @@ -147,7 +148,8 @@ (define builder #:search-paths ',(map search-path-specification->sexp search-paths) #:phases - (if (target-arm32?) + (if (string-prefix? "arm" ,(or (%current-target-system) + (%current-system))) (modify-phases build-phases (delete 'fix-runpath)) build-phases) #:configure-flags ,configure-flags -- cgit v1.2.3 From dbc75dadb54dd0e6b3a125949c26aadfa3bff4ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Mar 2018 00:20:59 +0100 Subject: Revert "Revert "gnu: patchelf: Update argument phase."" This change only affects armhf, which doesn't use PatchELF. My bad! This reverts commit b1d096f869ed53b84486855d73c7e9070fdf3ae2. --- gnu/packages/elf.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 253547e70f..08d92532fa 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -128,14 +128,12 @@ (define-public patchelf '())) (arguments (if (target-arm32?) - `(#:phases (alist-cons-after - 'unpack 'patch/rework-for-arm - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch-file - (assoc-ref inputs "patch/rework-for-arm"))) - (zero? (system* "patch" "--force" "-p1" - "--input" patch-file)))) - %standard-phases)) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch/rework-for-arm + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch-file (assoc-ref inputs "patch/rework-for-arm"))) + (invoke "patch" "--force" "-p1" "--input" patch-file)))))) '())) (home-page "https://nixos.org/patchelf.html") -- cgit v1.2.3