From e7a5d40e243c0e8e93851cf99a4e4582bfbed46e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:04:10 +0100 Subject: [PATCH 01/22] gnu: gtk+: Update to 3.22.29. * gnu/packages/gtk.scm (gtk+): Update to 3.22.29. --- 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 f279c5c245..9a25d848a4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -659,7 +659,7 @@ application suites.") (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.28") + (version "3.22.29") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -667,7 +667,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "07syy63d2q12b7mkbhqpirq270365fsql5l9qsrdgzlc04mn36fj")) + "1y5vzdbgww9l7xcrg13azff2rs94kggkywmpcsh39h7w76wn8zd0")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) From 457f6f262b00d56b8d0407bbc4e2cef3e925c081 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:08:53 +0100 Subject: [PATCH 02/22] gnu: libxkbcommon: Update to 0.8.0. * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.8.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 6663a0e746..0ea8c9c2a6 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -157,14 +157,14 @@ avoiding password prompts when X11 forwarding has already been setup.") (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.7.1") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/" name "-" version ".tar.xz")) (sha256 (base32 - "12z6hih3n1r0asp2hzp9qsiwdfkfz46jwp06x8kprr0r5rfk0nds")))) + "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) From 12c77137ebeb14a33aed34939d91e3d8f31644ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:10:01 +0100 Subject: [PATCH 03/22] gnu: mesa: Update to 17.3.7. * gnu/packages/gl.scm (mesa): Update to 17.3.7. --- 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 79cbf71168..6eb6737541 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -222,7 +222,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "17.3.6") + (version "17.3.7") (source (origin (method url-fetch) @@ -234,7 +234,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1y7vawz2sbpzdqk4b60w8kfrxb2rfkdjkifyxxfx1jaasj05d4g5")) + "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch" "mesa-skip-disk-cache-test.patch")))) From bbdf2761f595da7830570fb93dca6aaca1815e90 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:17:04 +0100 Subject: [PATCH 04/22] gnu: meson: Update to 0.45.1. * gnu/packages/build-tools.scm (meson): Update to 0.45.1. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index b1534e09a4..a09b3b3fb4 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -71,7 +71,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (define-public meson (package (name "meson") - (version "0.45.0") + (version "0.45.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -79,7 +79,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") version ".tar.gz")) (sha256 (base32 - "1r3wlimllakrswx2rb4mbdk1iricqk6myvdvib6dkyx362yanm9l")))) + "1yqa4337nb8w92bvr91rsxmn0xkf7pmdybq9ljvnqmdvn7dv02sd")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH From a53f4311a1e9bf2f1e863a5d49ae2316b96fe469 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:41:11 +0100 Subject: [PATCH 05/22] gnu: gstreamer: Update to 1.14.0. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, python-gst): Update to 1.14.0. (gst-plugins-base): Likewise. [inputs]: Move ORC ... [propagated-inputs]: ... here. Add GLIB. --- gnu/packages/gstreamer.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 4ec5765bb1..d91657076b 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -100,7 +100,7 @@ arrays of data.") (define-public gstreamer (package (name "gstreamer") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) @@ -109,7 +109,7 @@ arrays of data.") version ".tar.xz")) (sha256 (base32 - "0x06jxmc5fhlz7cr1pl5lp0hm1jgz519jjic37d09srf9jm091ss")))) + "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -148,7 +148,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) @@ -156,15 +156,16 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "10i255q7i8an1hxz3szb36x1jcs9nfdy511pj2wg24h2vw1nnc2c")))) + "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs - `(("gstreamer" ,gstreamer))) ; required by gstreamer-plugins-base-1.0.pc + `(("glib" ,glib) ;required by gstreamer-sdp-1.0.pc + ("gstreamer" ,gstreamer) ;required by gstreamer-plugins-base-1.0.pc + ("orc" ,orc))) ;required by gstreamer-audio-1.0.pc (inputs `(("cdparanoia" ,cdparanoia) ("opus" ,opus) - ("orc" ,orc) ("pango" ,pango) ("libogg" ,libogg) ("libtheora" ,libtheora) @@ -176,7 +177,7 @@ This package provides the core library and elements.") ("alsa-lib" ,alsa-lib))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("python-wrapper" ,python-wrapper))) (arguments @@ -199,11 +200,10 @@ This package provides the core library and elements.") for the GStreamer multimedia library.") (license license:lgpl2.0+))) - (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) @@ -212,7 +212,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0mxrbrqrfq1946gn9im19maj7ivld4k946vkwrzd94h8qsz4k7v4")))) + "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -262,18 +262,18 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "021d3q81m968lpnah517sfclagadcqwd6jz3lqdmqvb82sz5fy0c")))) + "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments - '(#:tests? #f ; XXX: 18 of 65 tests fail + '(#:tests? #f ; XXX: 13 of 53 tests fail #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") @@ -338,7 +338,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) @@ -346,7 +346,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "08p5kggk1szvr76cdbx3q3yfc235w1przb76v2n51lwfi26mn5hw")))) + "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -377,7 +377,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append @@ -385,7 +385,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "0qly3lgamm36xql9q7wg5751gi6j2d3ifzz1pkr15ncc5mfslmia")))) + "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-system-libav") @@ -415,7 +415,7 @@ compression formats through the use of the libav library.") (define-public python-gst (package (name "python-gst") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append @@ -423,7 +423,7 @@ compression formats through the use of the libav library.") "gst-python-" version ".tar.xz")) (sha256 (base32 - "1sm3dy10klf6i3w6a6mz0rnm29l2lxci5hr8346496jwc7v6mki0")))) + "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0")))) (build-system gnu-build-system) (arguments ;; XXX: Factorize python-sitedir with python-build-system. From 3a7597e4147235781d43ba9cef7a52ced9ea5e7a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Mar 2018 22:06:22 +0200 Subject: [PATCH 06/22] 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 @@ ;; 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 @@ has a 'meson.build' file." #: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 From 919034068ecca6cd16b110fa44246bfe758f984e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Mar 2018 20:32:48 +0200 Subject: [PATCH 07/22] Revert "build-system/meson: Use 'target-arm32?' for armhf-linux case." This reverts commit 3a7597e4147235781d43ba9cef7a52ced9ea5e7a. --- 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 @@ ;; 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 @@ has a 'meson.build' file." #: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 From c5154b37ac93268a8acfc68688e9858a8af44a00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:14:29 +0200 Subject: [PATCH 08/22] gnu: nss, nss-certs: Update to 3.36.1. * gnu/packages/gnuzilla.scm (nss): Update to 3.36.1. * 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 3cbf9202f9..b4c09c7750 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -75,7 +75,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.36") + (version "3.36.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -86,7 +86,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "1580qc0a4s8v3k3vg7zz4xly4alkjrw7qq9zy2nf6p4v56wcfg53")))) + "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7d2ecd27d7..4a8f18a2e4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -286,7 +286,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.36") + (version "3.36.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -297,7 +297,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "1580qc0a4s8v3k3vg7zz4xly4alkjrw7qq9zy2nf6p4v56wcfg53")) + "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) From ed471e68487062c9cba8657eea9fdeafe64de35d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:17:23 +0200 Subject: [PATCH 09/22] gnu: mesa: Update to 17.3.8. * gnu/packages/gl.scm (mesa): Update to 17.3.8. --- 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 6eb6737541..db02d798f5 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -222,7 +222,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "17.3.7") + (version "17.3.8") (source (origin (method url-fetch) @@ -234,7 +234,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585")) + "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch" "mesa-skip-disk-cache-test.patch")))) From 45c053ac763d8a14454d5478de9962f6bbe87676 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:20:07 +0200 Subject: [PATCH 10/22] gnu: alsa-lib: Update to 1.1.6. * gnu/packages/linux.scm (alsa-lib): Update to 1.1.6. --- 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 5193385414..ae5dbdc1ce 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -986,7 +986,7 @@ intercept and print the system calls executed by the program.") (define-public alsa-lib (package (name "alsa-lib") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append @@ -994,7 +994,7 @@ intercept and print the system calls executed by the program.") version ".tar.bz2")) (sha256 (base32 - "1rhacnlj0grvfagjx5qzsnbhw7m7lyccghqs4jsv0dnsqv9qmxpl")))) + "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z")))) (build-system gnu-build-system) (home-page "https://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") From 7ff0577020ea2bca0c34ea461dc6b730e6e74055 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:22:04 +0200 Subject: [PATCH 11/22] gnu: alsa-utils: Update to 1.1.6. * gnu/packages/linux.scm (alsa-utils): Update to 1.1.6. --- 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 ae5dbdc1ce..c91e8ca8b3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1006,14 +1006,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-utils (package (name "alsa-utils") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "1s727md6mb408y2cfwzjkx23abxhampyrjdkgpyygdhxx62x42rj")))) + "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. From 6c69d24daf90966149f981dae360e4c191683de8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:22:26 +0200 Subject: [PATCH 12/22] gnu: alsa-plugins: Update to 1.1.6. * gnu/packages/linux.scm (alsa-plugins): Update to 1.1.6. --- 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 c91e8ca8b3..5790527c84 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1053,14 +1053,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "073zpgvj4pldmzqq97l40wngvbqnvrkc8yw153mgny9kypwaazbr")))) + "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg")))) (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. From f6a6a050eae08df1fc39c2ecc9733aacf054356f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:27:44 +0200 Subject: [PATCH 13/22] gnu: atk: Update to 2.28.1. * gnu/packages/gtk.scm (atk): Update to 2.28.1. --- 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 9a25d848a4..001c149f17 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -77,7 +77,7 @@ (define-public atk (package (name "atk") - (version "2.26.1") + (version "2.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -85,7 +85,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1jwpx8az0iifw176dc2hl4mmg6gvxzxdkd1qvg4ds7c5hdmzy07g")))) + "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments From 538d6d025cf40f890ea46131e917101cf1a7128b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 1 Apr 2018 12:37:15 +0200 Subject: [PATCH 14/22] build-system/meson: Don't override LDFLAGS if already set. * guix/build/meson-build-system.scm (configure): Test for LDFLAGS before adding ours. (cherry picked from commit 611c27db2aec8c2f72bc0c1e5c7d126dc95b39b2) --- guix/build/meson-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index e8cb5440eb..e7690a4c37 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -53,7 +53,8 @@ ;; * ;; * ;; * - (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) + (unless (getenv "LDFLAGS") + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))) (mkdir build-dir) (chdir build-dir) From 73a118bdc529c9d65e2d1c7c072880c9d6624a00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:42:09 +0200 Subject: [PATCH 15/22] gnu: gdk-pixbuf: Update to 2.36.12. * gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.36.12. --- 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 001c149f17..96bc27deac 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -433,7 +433,7 @@ highlighting and other features typical of a source code editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.36.11") + (version "2.36.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -441,7 +441,7 @@ highlighting and other features typical of a source code editor.") name "-" version ".tar.xz")) (sha256 (base32 - "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf")))) + "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-x11") From a430b1e7f7a5f9580fc1163a1ba52cd93979b884 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 16 Apr 2018 09:58:29 +0200 Subject: [PATCH 16/22] gnu: wayland: Update to 1.15.0. * gnu/packages/freedesktop.scm (wayland): Update to 1.15.0. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 91eb37fb7a..b196cb71b2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -432,14 +432,14 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.14.0") + (version "1.15.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d")))) + "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) From 16ff8d6aeb3b6ac58e857cd8e38d5877e7f3fd82 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 16 Apr 2018 10:01:11 +0200 Subject: [PATCH 17/22] gnu: wayland-protocols: Update to 1.13. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.13. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b196cb71b2..456f75d18f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -468,7 +468,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.12") + (version "1.13") (source (origin (method url-fetch) (uri (string-append @@ -476,7 +476,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "1cn8ny4zr9xlcdh8qi1qnkmvia8cp4ixnsbhd9sp9571w6lyh69v")))) + "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) From 55e76e420d66722d8d3b0895d99e68f9b5be3af6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 16:23:40 +0200 Subject: [PATCH 18/22] gnu: libinput: Update to 1.10.3. * gnu/packages/freedesktop.scm (libinput): Update to 1.10.3. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 456f75d18f..867e2398cb 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -146,14 +146,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.10.2") + (version "1.10.3") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "1fbv354ii1g4wc4k7d7gbnalqjpzmk9zlpi8linqrzlf6inpc28m")))) + "0002xk9cqzpqrlhgav1wp8nimsbp9d2w8rd8mgygczq2hjar0lhd")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) From bab5f3a7f62150ae009e78d03c4b1f5b1646104c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 16:12:27 +0200 Subject: [PATCH 19/22] gnu: eudev: Update to 3.2.5. * gnu/packages/linux.scm (eudev): Update to 3.2.5. [source](uri): Use tarball instead of zipball. [source](file-name): Adjust accordingly. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5790527c84..0ae61c41e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2007,15 +2007,15 @@ from the module-init-tools project.") ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.4") + (version "3.2.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/gentoo/eudev/archive/v" - version ".zip")) - (file-name (string-append name "-" version ".zip")) + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1r1ag0snarygrj5qqxi2xdq9w6g3sfjd5jx1b0fl7zmqlsz3vvxx")) + "0dlkcgy7j4fdcksqrpc373zfybiif1bal3n6lpy1kfc5280j02c7")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments From a9fda571c3e702ccd6b40f7ee320e55fd2e83d19 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 10 Apr 2018 12:54:09 +0530 Subject: [PATCH 20/22] gnu: texlive-bin: Use ghostscript executable "gs" in ps2eps. * gnu/packages/tex.scm (texlive-bin)[arguments]: Add fix-unix-detection phase. Replace system* with invoke in postint phase. --- gnu/packages/tex.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index db1f120ce6..2b35250dd0 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -175,6 +176,15 @@ (string-prefix? "mips64" s)))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-unix-detection + ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, + ;; and the "gs" ghostscript executable on Unix. It detects Unix by + ;; checking for the existence of the /usr/bin directory. Since + ;; GuixSD does not have /usr/bin, it is also detected as Windows. + (lambda _ + (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" + (("gswin32c") "gs")) + #t)) (add-after 'install 'postint (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) (let* ((out (assoc-ref outputs "out")) @@ -196,7 +206,7 @@ (with-directory-excursion "texlive-extra" (apply unpack (list #:source texlive-extra)) (apply patch-source-shebangs (list #:source texlive-extra)) - (system* "mv" "tlpkg" share)))))))) + (invoke "mv" "tlpkg" share)))))))) (synopsis "TeX Live, a package of the TeX typesetting system") (description "TeX Live provides a comprehensive TeX document production system. From b02b6f32a56a259873e8368ac0be2aed9eca76aa Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 11 Apr 2018 10:34:23 +0530 Subject: [PATCH 21/22] gnu: texlive-bin: Patch texlua shebangs. * gnu/packages/tex.scm (texlive-bin)[arguments]: Patch texlua shebangs in postint phase. --- gnu/packages/tex.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2b35250dd0..35b6b3f8d4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -206,7 +206,13 @@ (with-directory-excursion "texlive-extra" (apply unpack (list #:source texlive-extra)) (apply patch-source-shebangs (list #:source texlive-extra)) - (invoke "mv" "tlpkg" share)))))))) + (invoke "mv" "tlpkg" share)) + ;; texlua shebangs are not patched by the patch-source-shebangs + ;; phase because the texlua executable does not exist at that + ;; time. + (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")) + (with-directory-excursion out + (patch-source-shebangs)))))))) (synopsis "TeX Live, a package of the TeX typesetting system") (description "TeX Live provides a comprehensive TeX document production system. From 68c4759baa4c1bb87e1c7c5568d5cdf4e1434fb1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 19:07:41 +0200 Subject: [PATCH 22/22] gnu: gstreamer: Downgrade to 1.12.5. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, python-gst): Downgrade to 1.12.5. --- gnu/packages/gstreamer.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 0871533934..a65a43b5cf 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -101,7 +101,7 @@ arrays of data.") (define-public gstreamer (package (name "gstreamer") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) @@ -110,7 +110,7 @@ arrays of data.") version ".tar.xz")) (sha256 (base32 - "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw")))) + "0slwqav7bqasg4a9f033kv6ki3yz0wyr3k0w9jr80s1jba20sxcz")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -149,7 +149,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) @@ -157,7 +157,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y")))) + "0bkikdax4v3iv9sqrrwbavqw7kg7lh0vas08ad1nya7kcmdz5ncg")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -204,7 +204,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) @@ -213,7 +213,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka")))) + "0mam03i38j6iws815fky9sm1ayik1d9a8pnfvschrr06pqxv511c")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -263,14 +263,14 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd")))) + "10bx1h996nn45r3d53bgkfx0rfa3hqz0f4zx634wz3nffnkjzy20")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -339,7 +339,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) @@ -347,7 +347,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z")))) + "0vpr1rv99v7k2s78k15prdw453nq1va4rkli46yhm6s3i00lnwk7")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -378,7 +378,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) (uri (string-append @@ -386,7 +386,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv")))) + "0y1qawf21407smvpc6kc2q6f17y9hdki4skn1yrwbl1n75gqcaw1")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-system-libav") @@ -416,7 +416,7 @@ compression formats through the use of the libav library.") (define-public python-gst (package (name "python-gst") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) (uri (string-append @@ -424,7 +424,7 @@ compression formats through the use of the libav library.") "gst-python-" version ".tar.xz")) (sha256 (base32 - "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0")))) + "1x8g9mdkf6hzhlkx6nhrrp607p8g4zkhl3crs8vh504zpbbf71ip")))) (build-system gnu-build-system) (arguments ;; XXX: Factorize python-sitedir with python-build-system.