From 8c6b077bfae3c257ad7b9967f63428f8504d61f0 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 16 Jan 2017 16:27:51 +0100 Subject: gnu: gdk-pixbuf: Make it reproducible. Fixes . * gnu/packages/gtk.scm (gdk-pixbuf)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 3 ++- gnu/packages/patches/gdk-pixbuf-list-dir.patch | 35 ++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gdk-pixbuf-list-dir.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7e816f79af..34c4587db7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -568,6 +568,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-6-arm-none-eabi-multilib.patch \ %D%/packages/patches/gcc-6-cross-environment-variables.patch \ %D%/packages/patches/gcj-arm-mode.patch \ + %D%/packages/patches/gdk-pixbuf-list-dir.patch \ %D%/packages/patches/gd-CVE-2016-7568.patch \ %D%/packages/patches/gd-CVE-2016-8670.patch \ %D%/packages/patches/gd-fix-chunk-size-on-boundaries.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a506949aba..8f9d5f4786 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -433,7 +433,8 @@ (define-public gdk-pixbuf name "-" version ".tar.xz")) (sha256 (base32 - "1v1rssjd8p5s3lymsfhiq5mbs2pc0h1r6jd0asrwdbrign7i68sj")))) + "1v1rssjd8p5s3lymsfhiq5mbs2pc0h1r6jd0asrwdbrign7i68sj")) + (patches (search-patches "gdk-pixbuf-list-dir.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-x11") diff --git a/gnu/packages/patches/gdk-pixbuf-list-dir.patch b/gnu/packages/patches/gdk-pixbuf-list-dir.patch new file mode 100644 index 0000000000..137914a19c --- /dev/null +++ b/gnu/packages/patches/gdk-pixbuf-list-dir.patch @@ -0,0 +1,35 @@ +Sort directory entries so that the output of +‘gdk-pixbuf-query-loaders’ is deterministic. + +See: https://bugzilla.gnome.org/show_bug.cgi?id=777332 +--- gdk-pixbuf-2.34.0/gdk-pixbuf/queryloaders.c.orig 2017-01-11 00:17:32.865843062 +0100 ++++ gdk-pixbuf-2.34.0/gdk-pixbuf/queryloaders.c 2017-01-16 16:12:03.420667874 +0100 +@@ -354,16 +354,27 @@ + + dir = g_dir_open (path, 0, NULL); + if (dir) { ++ GList *entries = NULL; + const char *dent; + + while ((dent = g_dir_read_name (dir))) { + gint len = strlen (dent); + if (len > SOEXT_LEN && + strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) { +- query_module (contents, path, dent); ++ entries = g_list_append (entries, g_strdup (dent)); + } + } + g_dir_close (dir); ++ /* Sort directory entries so that the output of ++ ‘gdk-pixbuf-query-loaders’ is deterministic. */ ++ entries = g_list_sort (entries, (GCompareFunc) strcmp); ++ GList *xentries; ++ for (xentries = entries; xentries; xentries = g_list_next (xentries)) { ++ dent = xentries->data; ++ query_module (contents, path, dent); ++ g_free (xentries->data); ++ } ++ g_list_free (entries); + } + #else + g_string_append_printf (contents, "# dynamic loading of modules not supported\n"); -- cgit v1.2.3 From b1972a83e8429cd8e37f5befef53a25060338171 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 1 Jan 2017 17:53:10 -0500 Subject: gnu: libsndfile: Update to 1.0.27. * gnu/packages/pulseaudio.scm (libsndfile): Update to 1.0.27. --- gnu/packages/pulseaudio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 9a22b38ec2..a5c1470da7 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -42,14 +42,14 @@ (define-module (gnu packages pulseaudio) (define-public libsndfile (package (name "libsndfile") - (version "1.0.26") + (version "1.0.27") (source (origin (method url-fetch) (uri (string-append "http://www.mega-nerd.com/libsndfile/files/libsndfile-" version ".tar.gz")) (sha256 (base32 - "14jhla289cj45946h0hq2an0a9g4wkwb3v4571bla6ixfvn20rfd")))) + "1h7s61nhf7vklh9sdsbbqzb6x287q4x4j1jc5gmjragl4wprb4d3")))) (build-system gnu-build-system) (inputs `(("libvorbis" ,libvorbis) -- cgit v1.2.3 From 8efd10cd11f6e0d014b08410bd81d89941a52662 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 1 Jan 2017 17:53:34 -0500 Subject: gnu: speex: Update to 1.2.0. * gnu/packages/xiph.scm (speex): Update to 1.2.0. --- 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 fc5cd6ca95..46afe08c6c 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -127,7 +127,7 @@ (define libtheora (define speex (package (name "speex") - (version "1.2rc1") + (version "1.2.0") (source (origin (method url-fetch) @@ -135,7 +135,7 @@ (define speex version ".tar.gz")) (sha256 (base32 - "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl")))) + "150047wnllz4r94whb9r73l5qf0z5z3rlhy98bawfbblmkq8mbpa")))) (build-system gnu-build-system) (inputs `(("libogg" ,libogg))) (home-page "https://gnu.org/software/speex") -- cgit v1.2.3 From b4fddeae20f1c575e17203c709d322bd1d9c43e0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 1 Jan 2017 17:53:51 -0500 Subject: gnu: flac: Update to 1.3.2. * gnu/packages/xiph.scm (flac): Update to 1.3.2. --- 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 46afe08c6c..0d2aa81919 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -202,14 +202,14 @@ (define ao (define flac (package (name "flac") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append "http://downloads.xiph.org/releases/flac/flac-" version ".tar.xz")) (sha256 (base32 - "0v65w7ph6ldwp5a8fbhp0a3w8f737ck468fr7yb7sxmskl4w0ws7")))) + "0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) -- cgit v1.2.3 From 7e5b944e8f54b9e216e0edff2116b3e37a7e37ff Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 1 Jan 2017 23:20:18 -0500 Subject: gnu: libdrm: Update to 2.4.74. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.74. --- 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 21d396972a..b05debade7 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -266,7 +266,7 @@ (define-public pixman (define-public libdrm (package (name "libdrm") - (version "2.4.68") + (version "2.4.74") (source (origin (method url-fetch) @@ -276,7 +276,7 @@ (define-public libdrm ".tar.bz2")) (sha256 (base32 - "1px91j6imaaq2fy8ksvgldmv0cdz3w379jqiciqvqa99jajxjjsv")) + "02w4xy3gsp0556l9d395mlxhlzixqscxkk6was3lq7s0djkxa3fq")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 603308ee601b9ca96e90822b61b4e150106db425 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Tue, 3 Jan 2017 12:58:28 +0100 Subject: gnu: doxygen: Use sh from the store. * gnu/packages/documentation.scm (doxygen)[inputs]: Add bash-minimal. [arguments]: Add phase to add store prefix to "/bin/sh". Signed-off-by: Leo Famulari --- gnu/packages/documentation.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index bbc25e8797..e0713c31c6 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2016 Andreas Enge ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Roel Janssen +;;; Copyright © 2016 Thomas Danckaert ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages documentation) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages python) #:use-module (gnu packages bison) #:use-module (gnu packages docbook) @@ -99,8 +101,18 @@ (define-public doxygen ("flex" ,flex) ("libxml2" ,libxml2) ; provides xmllint for the tests ("python" ,python-2))) ; for creating the documentation + (inputs + `(("bash" ,bash-minimal))) (arguments - `(#:test-target "tests")) + `(#:test-target "tests" + #:phases (modify-phases %standard-phases + (add-before 'configure 'patch-sh + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/portable.cpp" + (("/bin/sh") + (string-append + (assoc-ref inputs "bash") "/bin/sh"))) + #t))))) (home-page "http://www.stack.nl/~dimitri/doxygen/") (synopsis "Generate documentation from annotated sources") (description "Doxygen is the de facto standard tool for generating -- cgit v1.2.3 From 79e90f05b6c11525215aae65ae5134f9a37ed7ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Jan 2017 16:44:45 +0100 Subject: gnu: cups-filters: Disable mutool integration. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cups.scm (cups-filters)[arguments]: Add ‘--disable-mutool’ to #:configure-flags. [inputs]: Remove mupdf. --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 39ab41c192..adf94a5128 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -88,6 +88,7 @@ (define-public cups-filters `(#:make-flags (list (string-append "PREFIX=" %output)) #:configure-flags `("--disable-driverless" ; TODO: enable this + "--disable-mutool" ; depends on yet another PDF library (mupdf) ,(string-append "--with-test-font-path=" (assoc-ref %build-inputs "font-dejavu") "/share/fonts/truetype/DejaVuSans.ttf") @@ -114,7 +115,6 @@ (define-public cups-filters ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff) - ("mupdf" ,mupdf) ("glib" ,glib) ("qpdf" ,qpdf) ("poppler" ,poppler) -- cgit v1.2.3 From 4c9c8a294ea64fcb969da84e6fe207780ebdb387 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 14 Jan 2017 00:28:54 +0100 Subject: gnu: boost: Update to 1.63.0. * gnu/packages/boost.scm (boost): Update to 1.63.0. --- gnu/packages/boost.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index e6abf4d5e3..b3fccdf2eb 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -34,7 +34,7 @@ (define-module (gnu packages boost) (define-public boost (package (name "boost") - (version "1.61.0") + (version "1.63.0") (source (origin (method url-fetch) (uri (string-append @@ -43,7 +43,7 @@ (define-public boost ".tar.bz2")) (sha256 (base32 - "0h5nk7pgxf7xsvvshj9qfpsfp9wx6gq9r78n3nx736pxq83bsix5")))) + "1c5kzhcqahnic55dxcnw7r80qvwx5sfa2sa97yzv7xjrywljbbmy")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) (native-inputs -- cgit v1.2.3 From c063f34f6bbeaf1cf3351dbce3d8e7f1ff388bb2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jan 2017 17:39:21 +0100 Subject: gnu: libxi: Update to 1.7.9. * gnu/packages/xorg.scm (libxi): Update to 1.7.9. --- 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 b780d47c32..bb3182f5ab 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4793,7 +4793,7 @@ (define-public libxfont (define-public libxi (package (name "libxi") - (version "1.7.8") + (version "1.7.9") (source (origin (method url-fetch) @@ -4803,7 +4803,7 @@ (define-public libxi ".tar.bz2")) (sha256 (base32 - "1fr7mi4nbcxsa88qin9g2ipmzh595ydxy9qnabzl270laf6zmwnq")))) + "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2")))) (build-system gnu-build-system) (propagated-inputs `(("inputproto" ,inputproto) -- cgit v1.2.3 From 737c572a2b7131fc69a07ac7639b173914d48363 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Jan 2017 15:34:19 +0100 Subject: gnu: libdrm: Update to 2.4.75. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.75. --- 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 b05debade7..2df9bd22f1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -266,7 +266,7 @@ (define-public pixman (define-public libdrm (package (name "libdrm") - (version "2.4.74") + (version "2.4.75") (source (origin (method url-fetch) @@ -276,7 +276,7 @@ (define-public libdrm ".tar.bz2")) (sha256 (base32 - "02w4xy3gsp0556l9d395mlxhlzixqscxkk6was3lq7s0djkxa3fq")) + "0kq5hmck0gq7b29fr8jp94njc7jpkpbyws12s63w4b21xw750nid")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From fbb4755c8ad49d82437bfc1db86ca7957769d67b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jan 2017 14:59:22 +0100 Subject: gnu: libxkbcommon: Update to 0.7.1. * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.7.1. [source]: Use HTTPS. [home-page]: Ditto. --- gnu/packages/xdisorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2df9bd22f1..a606f68b0e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -131,14 +131,14 @@ (define-public xclip (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.6.1") + (version "0.7.1") (source (origin (method url-fetch) - (uri (string-append "http://xkbcommon.org/download/" name "-" + (uri (string-append "https://xkbcommon.org/download/" name "-" version ".tar.xz")) (sha256 (base32 - "0q47xa1szlxwgvwmhv4b7xwawnykz1hnc431d84nj8dlh2q8f22v")))) + "12z6hih3n1r0asp2hzp9qsiwdfkfz46jwp06x8kprr0r5rfk0nds")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) @@ -155,7 +155,7 @@ (define-public libxkbcommon (string-append "--with-x-locale-root=" (assoc-ref %build-inputs "libx11") "/share/X11/locale")))) - (home-page "http://xkbcommon.org/") + (home-page "https://xkbcommon.org/") (synopsis "Library to handle keyboard descriptions") (description "Xkbcommon is a library to handle keyboard descriptions, including loading them from disk, parsing them and handling their -- cgit v1.2.3 From b23992afb2771ed9ef7f8f9ab2aaa100fa3031d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jan 2017 15:31:01 +0100 Subject: gnu: wayland, weston: Update to 1.12.0. * gnu/packages/freedesktop.scm (wayland): Update to 1.12.0. (weston): Update to 1.12.0. [arguments]: Adjust to source file renames. --- gnu/packages/freedesktop.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0c8f97f6be..e4bfa0609f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -274,14 +274,14 @@ (define-public python2-pyxdg (define-public wayland (package (name "wayland") - (version "1.11.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1c0d5ivy9n44hykvw2ggrvqrnn7naw3wg11vbvgwzgi8g5gr4h4m")))) + "1c8sha5vm8w346wcbvgnjihisxfyvrr3qlbmfb5sp201p9f17d6n")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) (native-inputs @@ -331,7 +331,7 @@ (define-public wayland-protocols (define-public weston (package (name "weston") - (version "1.11.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append @@ -339,7 +339,7 @@ (define-public weston "weston-" version ".tar.xz")) (sha256 (base32 - "09biddxw3ar797kxf9mywjkb2iwky6my39gpp51ni846y7lqdq05")))) + "0cshmw4ql4cr36v90bbi4qi6plvb6b9dbpnc3w9m17rv5siw4ymc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -372,9 +372,11 @@ (define-public weston ;; Use elogind instead of systemd (substitute* "configure" (("libsystemd-login >= 198") "libelogind")) - (substitute* '("src/launcher-logind.c" "src/weston-launch.c") + (substitute* '("libweston/launcher-logind.c" + "libweston/weston-launch.c") (("#include ") - "#include ")))) + "#include ")) + #t)) (add-after 'configure 'patch-confdefs.h (lambda _ (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h"))) -- cgit v1.2.3 From b1b8e8f1b2d4e30da9e793535f23ac5cf6cfa574 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Feb 2017 14:44:59 +0100 Subject: gnu: mesa: Update to 13.0.4. * gnu/packages/gl.scm (mesa): Update to 13.0.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 a3862f1ec3..7f97277541 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -197,7 +197,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "13.0.3") + (version "13.0.4") (source (origin (method url-fetch) @@ -205,7 +205,7 @@ (define-public mesa version "/mesa-" version ".tar.xz")) (sha256 (base32 - "03m4gc6qc50lb0ic06f83r3yl0x4lmj2zjq3sl60vl3nq7jqpanr")) + "09p740qvmf4vqnpgxxlizk0dhdhj6i519qsbbrc8hpxxyzl7qpd9")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From b097a3387ea78797104f97eef445f5da6278c922 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Feb 2017 14:45:22 +0100 Subject: gnu: xkeyboard-config: Update to 2.20. * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.20. --- 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 bb3182f5ab..35a3b06297 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3722,7 +3722,7 @@ (define-public xkbutils (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.18") + (version "2.20") (source (origin (method url-fetch) @@ -3732,7 +3732,7 @@ (define-public xkeyboard-config ".tar.bz2")) (sha256 (base32 - "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4")))) + "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3