From 36de968554a8b8a997c2c5de190566a54d611af1 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 17 Apr 2017 23:57:36 +0200 Subject: [PATCH 01/81] gnu: glib: Update to 2.52.1. * gnu/packages/glib.scm (glib): Update to 2.52.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 6de9cce0b7..4e29a550b1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -137,7 +137,7 @@ (define dbus (define glib (package (name "glib") - (version "2.50.3") + (version "2.52.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -145,7 +145,7 @@ (define glib name "-" version ".tar.xz")) (sha256 (base32 - "16frrwhc1yqkzx6bgh3060g94dr2biab17fb01mrni819jzr9vl2")) + "0vsqrvjwsk2x3mm2i428hpm5vgsi1b384l6xdhm7xmzj2yw2d34l")) (patches (search-patches "glib-tests-timer.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything From 8785f02591128017aaec4854f8b266516e7b1ed1 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 18 Apr 2017 20:53:25 -0400 Subject: [PATCH 02/81] gnu: at-spi2-core: Update to 2.24.0. * gnu/packages/gtk.scm (at-spi2-core): Update to 2.24.0. --- 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 f8526053ea..9e3e995d21 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -508,7 +508,7 @@ (define-public gdk-pixbuf+svg (define-public at-spi2-core (package (name "at-spi2-core") - (version "2.22.0") + (version "2.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -516,7 +516,7 @@ (define-public at-spi2-core name "-" version ".tar.xz")) (sha256 (base32 - "02n8ybhg8344mpjwvkhnzvr0qbvvl6ryi2q9irwhi0ri46ps6pj1")))) + "1kdgc5gkw3fsgxvwwsg7djvqijpc3xmpp9bp6k6v60yrzcag6yb1")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments From b4a6497ca38eb9bfa8fd90eb0aac68c841f55468 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Apr 2017 17:32:10 +0200 Subject: [PATCH 03/81] gnu: harfbuzz: Update to 1.4.6. * gnu/packages/gtk.scm (harfbuzz): Update to 1.4.6. --- 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 9e3e995d21..9fda9e0d55 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -170,7 +170,7 @@ (define-public cairo-xcb (define-public harfbuzz (package (name "harfbuzz") - (version "1.4.3") + (version "1.4.6") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -178,7 +178,7 @@ (define-public harfbuzz version ".tar.bz2")) (sha256 (base32 - "08akv3qzwnf48xajb60dfcchkmfdjkpp65a0xd8s98w81901g343")))) + "14yj514yfy373np3gxk930a443j1zgnwg6mm0kdzzjr0rn0qp9r1")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo From ac5c4346ebe361d12c788ea4566c6e97fc40ca15 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Apr 2017 13:53:27 -0400 Subject: [PATCH 04/81] gnu: dbus: Update to 1.10.18. * gnu/packages/glib.scm (dbus): Update to 1.10.18. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 4e29a550b1..8c334c467d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -67,7 +67,7 @@ (define-module (gnu packages glib) (define dbus (package (name "dbus") - (version "1.10.16") + (version "1.10.18") (source (origin (method url-fetch) (uri (string-append @@ -75,7 +75,7 @@ (define dbus version ".tar.gz")) (sha256 (base32 - "121kqkjsd3vgf8vca8364xl44qa5086h7qy5zs5f1l78ldpbmc57")) + "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments From dc4b64ae3f410c5f5d09eaed89666427d1d8d162 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 29 Apr 2017 14:24:43 -0400 Subject: [PATCH 05/81] gnu: eog: Update to 3.24.1. * gnu/packages/gnome.scm (eog): Update to 3.24.1. --- 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 8db53f109a..8f40134334 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3506,7 +3506,7 @@ (define-public rhythmbox (define-public eog (package (name "eog") - (version "3.20.5") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3514,7 +3514,7 @@ (define-public eog name "-" version ".tar.xz")) (sha256 (base32 - "0fqvfc4y1lbv0awh8dbx9khfha0hdkmnj1lzw5jq0l7jmahwbrz6")))) + "1rr7zy8afqgl15j1zz8l37svyv6bw4r3l04yf70zlnf1w8bf27pm")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases From a5d8c7863c83ad701191ef95c1391a4334d1e315 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 1 May 2017 10:42:48 -0400 Subject: [PATCH 06/81] gnu: evince: Update to 3.24.0. * gnu/packages/gnome.scm (evince): Update to 3.24.0. --- gnu/packages/gnome.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8f40134334..308428c278 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -512,7 +512,7 @@ (define-public gnome-keyring (define-public evince (package (name "evince") - (version "3.22.1") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -520,15 +520,10 @@ (define-public evince name "-" version ".tar.xz")) (sha256 (base32 - "0713mcrym5ykhl5smqxi6m9578gz3nkibmkmc794amss7gdkkm7k")))) + "13yw0i68dgqp9alyliy3zifszh7rikkpi1xbz5binvxxgfpraf04")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus") - - ;; FIXME: Tests fail with: - ;; ImportError: No module named gi.repository - ;; Where should that module come from? - #:tests? #f #:phases (modify-phases %standard-phases (add-before 'install 'skip-gtk-update-icon-cache From e62a38d4aebeccf6fa712383c14734a469d189d4 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 1 May 2017 10:46:27 -0400 Subject: [PATCH 07/81] gnu: file-roller: Update to 3.24.1. * gnu/packages/gnome.scm (file-roller): Update to 3.24.1. --- 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 308428c278..3c9eb3db86 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4039,7 +4039,7 @@ (define-public shotwell (define-public file-roller (package (name "file-roller") - (version "3.22.2") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4047,7 +4047,7 @@ (define-public file-roller name "-" version ".tar.xz")) (sha256 (base32 - "1yaxd0lqhajszilblkidqfkaffhzml10l7ib64023y36qgf8q597")))) + "0fkz9h9a6149crmf6311fsqlmv9wyrxk86470vxib941ppl4a581")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases From 2df65d37a9b08041314973908d700622a7c3ab2d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 1 May 2017 10:57:33 -0400 Subject: [PATCH 08/81] gnu: gnome-backgrounds: Update to 3.24.0. * gnu/packages/gnome.scm (gnome-backgrounds): Update to 3.24.0. --- 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 3c9eb3db86..1443b53106 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5270,7 +5270,7 @@ (define-public baobab (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "3.22.1") + (version "3.24.0") (source (origin (method url-fetch) @@ -5279,7 +5279,7 @@ (define-public gnome-backgrounds name "-" version ".tar.xz")) (sha256 (base32 - "09gfdrm1kaz2knyghhjb0ka1kklgbcbnqgy4c90bg0v3n899ij5z")))) + "1jkikis9k3psp6rb8axnqy86awdyg5rzfbcp9gx40a99b4hlrnnb")))) (build-system glib-or-gtk-build-system) (native-inputs `(("intltool" ,intltool))) From c854815c73fd5aa685d3c77d45c248448dbca78f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 May 2017 17:26:51 +0200 Subject: [PATCH 09/81] gnu: xkbcomp: Update to 1.4.0. * gnu/packages/xorg.scm (xkbcomp-intermediate, xkbcomp): Update to 1.4.0. --- 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 3c9195b1bf..9985524394 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3623,7 +3623,7 @@ (define-public xinput (define xkbcomp-intermediate ; used as input for xkeyboard-config (package (name "xkbcomp-intermediate") - (version "1.3.1") + (version "1.4.0") (source (origin (method url-fetch) @@ -3633,7 +3633,7 @@ (define xkbcomp-intermediate ; used as input for xkeyboard-config ".tar.bz2")) (sha256 (base32 - "0gcjy70ppmcl610z8gxc7sydsx93f8cm8pggm4qhihaa1ngdq103")))) + "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) From 796a0c03585505cae5ea41cde226393ba7ad0132 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 2 May 2017 11:14:51 -0400 Subject: [PATCH 10/81] gnu: gsettings-desktop-schemas: Update to 3.24.0. * gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to 3.24.0. --- 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 1443b53106..5d00757c7d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -579,7 +579,7 @@ (define-public evince (define-public gsettings-desktop-schemas (package (name "gsettings-desktop-schemas") - (version "3.22.0") + (version "3.24.0") (source (origin (method url-fetch) @@ -588,7 +588,7 @@ (define-public gsettings-desktop-schemas name "-" version ".tar.xz")) (sha256 (base32 - "1qgalzqwg0fl0n22vslqcsnsmj9kc54qj25ib16rxaf36jxcf1hg")))) + "145vpcljy4660cnk8zk91qf7ywa7hqfl5hhw025gy8hxcqzklmzn")))) (build-system gnu-build-system) (inputs `(("glib" ,glib))) From 28ee4d41edf072776777ff3f83aef8502df909e5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 2 May 2017 13:01:54 -0400 Subject: [PATCH 11/81] gnu: gnome-settings-daemon: Update to 3.24.1. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.24.1. --- 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 5d00757c7d..c04fbe5352 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2741,7 +2741,7 @@ (define-public libgweather (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.22.1") + (version "3.24.1") (source (origin (method url-fetch) @@ -2750,7 +2750,7 @@ (define-public gnome-settings-daemon name "-" version ".tar.xz")) (sha256 (base32 - "1finsr7yqvix6n3rdwclv4fpgagmz6xyrk3qzapkn9ljv76rfzdm")))) + "02vm0jwhs9rdi3dphxw7dxharx7ng0l12j6hfdmn3vjc7v3ds50v")))) (build-system glib-or-gtk-build-system) (arguments `(;; Color management test can't reach the colord system service. From 3590a6b5cf4b46a76b69f3719740d6d5b8a04428 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 May 2017 19:36:22 +0200 Subject: [PATCH 12/81] gnu: bluez: Update to 5.45. * gnu/packages/linux.scm (bluez): Update to 5.45. --- 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 fb70bf0bb9..958d111403 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2746,7 +2746,7 @@ (define-public sbc (define-public bluez (package (name "bluez") - (version "5.44") + (version "5.45") (source (origin (method url-fetch) (uri (string-append @@ -2754,7 +2754,7 @@ (define-public bluez version ".tar.xz")) (sha256 (base32 - "11bc6pndivd0rkqr3c8a1xd9ar9bb60gx79piskycicb3wliwchc")))) + "1sb4aflgyrl7apricjipa8wx95qm69yja0lmn2f19g560c3v1b2c")))) (build-system gnu-build-system) (arguments '(#:configure-flags From dbf0424d7b984c277707f6b9d3f57bf6bd6dcf13 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 3 May 2017 00:26:29 -0400 Subject: [PATCH 13/81] gnu: json-glib: Update to 1.2.8. * gnu/packages/gnome.scm (json-glib): Update to 1.2.8. [source]: Remove snippet. --- gnu/packages/gnome.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0be399cbda..2718f6974f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2070,7 +2070,7 @@ (define-public dconf (define-public json-glib (package (name "json-glib") - (version "1.2.2") + (version "1.2.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2078,14 +2078,7 @@ (define-public json-glib name "-" version ".tar.xz")) (sha256 (base32 - "08d6449sgnwfh92x8rhwsm03g8frv0mvp3s4wl3cskw25asql4pa")) - (modules '((guix build utils))) - (snippet - ;; Don't duplicate test names. - ;; . - '(substitute* "json-glib/tests/builder.c" - (("\"/builder/complex\", test_builder_empty") - "\"/builder/empty\", test_builder_empty"))))) + "02pl0wl3mf47c038bgv2r4pa6pr6y3shjhxn1l7s3rrrgl1sjmgx")))) (build-system gnu-build-system) (native-inputs `(("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal From eb6f315b044bd23c5207a36cdce43e197f8ff00f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 3 May 2017 21:38:40 -0400 Subject: [PATCH 14/81] gnu: epiphany: Update to 3.24.1. * gnu/packages/gnome.scm (epiphany): Update to 3.24.1. [inputs]: Add JSON-GLIB. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2718f6974f..c4ab5feb98 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3740,7 +3740,7 @@ (define-public simple-scan (define-public epiphany (package (name "epiphany") - (version "3.22.7") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3748,7 +3748,7 @@ (define-public epiphany name "-" version ".tar.xz")) (sha256 (base32 - "1167x5s0kawkqngjnzml0a11ib18raxqc4p11kacivj4jv0pwnx1")))) + "1p499ncsrbpfjna9h5v1cafr7fv1zb4cmihz05pgr07bb625y991")))) (build-system glib-or-gtk-build-system) (arguments ;; FIXME: tests run under Xvfb, but fail with: @@ -3771,6 +3771,7 @@ (define-public epiphany ("glib-networking" ,glib-networking) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("json-glib" ,json-glib) ("iso-codes" ,iso-codes) ("libnotify" ,libnotify) ("libsecret" ,libsecret) From 982b35747854f7be35700572ec75e45881fa55e2 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 10 May 2017 08:23:30 -0400 Subject: [PATCH 15/81] gnu: gtk+: Enable wayland backend. * gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Add libxkbcommon, mesa, wayland and wayland-protocols. [arguments]: Add "--enable-wayland-backend" and "--enable-x11-backend" to #:configure-flags. --- gnu/packages/gtk.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 985056b95b..9732ee4ccd 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -50,6 +50,7 @@ (define-module (gnu packages gtk) #:use-module (gnu packages docbook) #:use-module (gnu packages enchant) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -673,8 +674,12 @@ (define-public gtk+ ("libxcursor" ,libxcursor) ("libxi" ,libxi) ("libxinerama" ,libxinerama) + ("libxkbcommon" ,libxkbcommon) ("libxdamage" ,libxdamage) - ("pango" ,pango))) + ("mesa" ,mesa) + ("pango" ,pango) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("libxml2" ,libxml2) ;; XXX: colord depends on mozjs (through polkit), which fails on @@ -700,7 +705,12 @@ (define-public gtk+ ;; to "doc". #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) + "/share/gtk-doc/html") + ;; The header file is required + ;; by gnome-control-center + "--enable-wayland-backend" + ;; This is necessary to build both backends. + "--enable-x11-backend") #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda _ From 31860852cd5fcdb12ab42d638512cb4ff701e63c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 10 May 2017 08:23:31 -0400 Subject: [PATCH 16/81] gnu: cogl: Enable wayland support. * gnu/packages/gnome.scm (cogl)[inputs]: Add wayland. [arguments]: Add "--enable-wayland-egl-platform" and "--enable-wayland-egl-server". --- gnu/packages/gnome.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c4ab5feb98..e98a5523b3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2935,9 +2935,13 @@ (define-public cogl ("cairo" ,cairo) ("pango" ,pango) ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base))) + ("gst-plugins-base" ,gst-plugins-base) + ("wayland" ,wayland))) (arguments `(#:configure-flags (list "--enable-cogl-gst" + "--enable-wayland-egl-platform" + "--enable-wayland-egl-server" + ;; Arrange to pass an absolute file name to ;; dlopen for libGL.so. (string-append "--with-gl-libname=" From 521cdb4bbffc4bc4bd3ca20f9a6d62d85895b719 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 10 May 2017 08:23:32 -0400 Subject: [PATCH 17/81] gnu: gnome-desktop: Update to 3.24.1. * gnu/packages/gnome.scm (gnome-desktop): Update to 3.24.1. --- 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 e98a5523b3..5d03517ffd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -261,7 +261,7 @@ (define-public gnome-common (define-public gnome-desktop (package (name "gnome-desktop") - (version "3.22.2") + (version "3.24.1") (source (origin (method url-fetch) @@ -270,7 +270,7 @@ (define-public gnome-desktop name "-" version ".tar.xz")) (sha256 (base32 - "074yjz4g9gii045v2pl1ad34hcg92ci04ynxqcabwnf3lvvypmsi")))) + "1as5ri52n6wphvhqnxa813q15jri0x47hxsjikjcmb2big9vf2fy")))) (build-system gnu-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) From f8cb2fbf5ef288b0d2ae3ba9589b524b7ff38c92 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 10 May 2017 08:23:33 -0400 Subject: [PATCH 18/81] gnu: gnome-bluetooth: Update to 3.20.1. * gnu/packages/gnome.scm (gnome-bluetooth): Update to 3.20.1. --- 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 5d03517ffd..87b4959f0e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4891,7 +4891,7 @@ (define-public libgtop (define-public gnome-bluetooth (package (name "gnome-bluetooth") - (version "3.20.0") + (version "3.20.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4899,7 +4899,7 @@ (define-public gnome-bluetooth name "-" version ".tar.xz")) (sha256 (base32 - "0lzbwk2kn7kp39sv5bf4ja92mfkxkc27gxxk8k86i8a8ncbcmcwk")))) + "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. From 6ebccb845fb617661fd0da0f3d38ef077eac617c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 10 May 2017 08:23:34 -0400 Subject: [PATCH 19/81] gnu: gnome-online-accounts: Update to 3.24.0. * gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.24.0. --- 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 87b4959f0e..be900dbdc5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4416,7 +4416,7 @@ (define-public mutter (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.22.3") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4424,7 +4424,7 @@ (define-public gnome-online-accounts name "-" version ".tar.xz")) (sha256 (base32 - "13wvnfh3hnasdnb6fhjssybj2327qihd32kpdjjb3r1qiyc8dvqb")))) + "0yy10znqj278lnhdiqjcqxrwwv5c1jdjd0ncjbbdyh8n0q77hbwy")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. From a158cfd00bef861bf627622195e29d0f507c4d32 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 10 May 2017 08:23:35 -0400 Subject: [PATCH 20/81] gnu: gnome-control-center: Update to 3.24.1. * gnu/packages/gnome.scm (gnome-control-center): Update to 3.24.1. --- 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 be900dbdc5..d24500b0be 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4924,7 +4924,7 @@ (define-public gnome-bluetooth (define-public gnome-control-center (package (name "gnome-control-center") - (version "3.22.1") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4932,7 +4932,7 @@ (define-public gnome-control-center name "-" version ".tar.xz")) (sha256 (base32 - "06h9937sjfrzjf36pxqybg4wmkc5xdhbxgdkclnkjxiiqidjjsax")))) + "0g55i4w0a8qpfkl0vnzr3ng6adx8pdxqk8vzc3kvvx6xzlcqxk1h")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases From 17cf06c3851b89e84ea9fef367e9f2e2da5b82e6 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 10 May 2017 08:23:36 -0400 Subject: [PATCH 21/81] gnu: gnome-session: Update to 3.24.1. * gnu/packages/gnome.scm (gnome-session): Update to 3.24.1. --- 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 d24500b0be..7f1f6b34f6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4094,7 +4094,7 @@ (define-public file-roller (define-public gnome-session (package (name "gnome-session") - (version "3.22.2") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4102,7 +4102,7 @@ (define-public gnome-session name "-" version ".tar.xz")) (sha256 (base32 - "1xahljysbpnc1zafm1y2lqnmmqi2jh4fx7h2y48d9ipqnknk26in")))) + "1vkfjsgks9czajivcg3y1krzlnilv2cnzzbdc7wrasrriqilji1v")))) (arguments '(#:phases (modify-phases %standard-phases From 86c44e7230243c101168f3a38466cfa9bf73ad14 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 10 May 2017 08:23:37 -0400 Subject: [PATCH 22/81] gnu: mutter: Update to 3.24.1. * gnu/packages/gnome.scm (mutter): Update to 3.24.1. [source]: Use a release tarball instead of a git checkout. [arguments]: Enable wayland and the native backend. Add "use-elogind" phase. Remove "autoreconf" phase. [propagated-inputs]: Remove wayland and wayland-protocols. [inputs]: Add elogind and libxtst. --- gnu/packages/gnome.scm | 45 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7f1f6b34f6..81c747ce14 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4315,24 +4315,21 @@ (define-public zenity (license license:lgpl2.0+))) (define-public mutter - ;; Uses the gnome 3.22 branch that only contains bug fixes. - (let ((commit "23c315ea7121e9bd108e2837d0b4beeba53c5e18")) (package (name "mutter") - (version (git-version "3.22.2" "1" commit)) + (version "3.24.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.gnome.org/mutter") - (commit commit))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 (base32 - "1v1f9xyzjr1ihmfwpq9kzlv2lyr9qn63ck8zny699mbp5hsi11mb")))) - ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked - ;; versions of cogl and clutter. As a result, many of the inputs, - ;; propagated-inputs, and configure flags used in cogl and clutter are - ;; needed here as well. + "093ax3ng7fv28qfkxpbvcx67mfiizwj5b4s17m5cmijwf3wpgamc")))) + ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked + ;; versions of cogl and clutter. As a result, many of the inputs, + ;; propagated-inputs, and configure flags used in cogl and clutter are + ;; needed here as well. (build-system gnu-build-system) (arguments '(#:configure-flags @@ -4341,8 +4338,7 @@ (define-public mutter ;; implicit declaration of function ?roundf? (list "--enable-compile-warnings=minimum" - "--disable-wayland" ; TODO enable wayland - ;; "--enable-native-backend" ; TODO enable the native backend + "--enable-native-backend" ;; The following flags are needed for the bundled clutter "--enable-x11-backend=yes" @@ -4354,9 +4350,14 @@ (define-public mutter "/lib/libGL.so")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + ;; Replace references to systemd libraries to elogind references. + (add-before 'configure 'use-elogind + (lambda _ + (substitute* (list "configure" + "src/backends/native/meta-launcher.c" + "src/core/main.c") + (("systemd") "elogind")) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("gobject-introspection" ,gobject-introspection) @@ -4389,17 +4390,17 @@ (define-public mutter ("mesa" ,mesa) ("pango" ,pango) ("udev" ,eudev) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("xinput" ,xinput))) (inputs - `(("gnome-desktop" ,gnome-desktop) + `(("elogind" ,elogind) + ("gnome-desktop" ,gnome-desktop) ("libcanberra-gtk" ,libcanberra) ("libgudev" ,libgudev) ("libice" ,libice) ("libsm" ,libsm) ("libxkbfile" ,libxkbfile) ("libxrandr" ,libxrandr) + ("libxtst" ,libxtst) ("startup-notification" ,startup-notification) ("upower-glib" ,upower) ("xkeyboard-config" ,xkeyboard-config) @@ -4411,7 +4412,7 @@ (define-public mutter desktop via OpenGL. Mutter combines a sophisticated display engine using the Clutter toolkit with solid window-management logic inherited from the Metacity window manager.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public gnome-online-accounts (package From 0789280f047a519f22a2d9ccb87271bf14bca48d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 May 2017 17:54:33 +0200 Subject: [PATCH 23/81] gnu: mesa: Update to 17.0.6. * gnu/packages/gl.scm (mesa): Update to 17.0.6. --- 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 40b756394e..7457809300 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -217,7 +217,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "17.0.4") + (version "17.0.6") (source (origin (method url-fetch) @@ -227,7 +227,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "0im3ca1vwwmkjf5w761vh7vabr4vrrdxpckr0wm974x18n2xqs8j")) + "17d60jjzg4ddm95gk2cqx0xz6b9anmmz6ax4majwr3gis2yg7v49")) (patches (search-patches "mesa-fix-32bit-test-failures.patch" "mesa-wayland-egl-symbols-check-mips.patch" From 98bb983ca7ea2b393021bfee155a72b1c6183f72 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Tue, 16 May 2017 23:43:18 +0200 Subject: [PATCH 24/81] gnu: ruby: Update to 2.4.0. * gnu/packages/ruby.scm (ruby): Update to 2.4.0. (ruby-2.3): New variable. --- gnu/packages/ruby.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0d4ae1dbb0..4977337517 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -48,8 +48,7 @@ (define-module (gnu packages ruby) (define-public ruby (package (name "ruby") - (version "2.3.3") - (replacement ruby-2.3.4) + (version "2.4.0") (source (origin (method url-fetch) @@ -58,7 +57,7 @@ (define-public ruby "/ruby-" version ".tar.xz")) (sha256 (base32 - "1p0rfk0blrbfjcnv0vb0ha4hxflgkfhv9zbzp4vvld2pi31ahkqs")) + "141nnsdk2q83c23p5kl404id8gy1ap261gin48rbjj5sbksgx1rs")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi @@ -102,11 +101,11 @@ (define-public ruby (home-page "https://ruby-lang.org") (license license:ruby))) -(define ruby-2.3.4 +(define-public ruby-2.3 (package (inherit ruby) - (name "ruby") (version "2.3.4") + (replacement #f) (source (origin (method url-fetch) From 962d017158e513e941fad65dd2a0e18769133421 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 23 May 2017 21:44:46 -0400 Subject: [PATCH 25/81] gnu: gobject-introspection: Update to 1.52.1. * gnu/packages/glib.scm (gobject-introspection): Update to 1.52.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8c334c467d..67db51dc85 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -289,14 +289,14 @@ (define pattern+procs (define gobject-introspection (package (name "gobject-introspection") - (version "1.50.0") + (version "1.52.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "1i9pccig8mv6qf0c1z8fcapays190nmr7j6pyc7cfhzmcv39fr8w")) + (base32 "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f")) (modules '((guix build utils))) (snippet '(substitute* "tools/g-ir-tool-template.in" From 144f94d0a212f1cecd28be59b99e867fbd58aa93 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 24 May 2017 11:47:49 -0400 Subject: [PATCH 26/81] gnu: gjs: Update to 1.48.3. * gnu/packages/gnome.scm (gjs): Update to 1.48.3. [source]: Remove snippet. [arguments]: Disable failing tests. [propagated-inputs]: Use mozjs-38 instead of mozjs-24; add cairo. --- gnu/packages/gnome.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d53d15894f..2cf6f4e3f0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4174,7 +4174,7 @@ (define-public gnome-session (define-public gjs (package (name "gjs") - (version "1.46.0") + (version "1.48.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4182,10 +4182,7 @@ (define-public gjs name "-" version ".tar.xz")) (sha256 (base32 - "1m2ssa6qsipbp8lz4xbhf0nhadhv0xkdpmz1jcvl9187lwgmk0r2")) - (modules '((guix build utils))) - (snippet '(substitute* "test/run-with-dbus" - (("/bin/rm") "rm"))))) + "0cqgv460wfhwkw6j1h46v6bg29bycg6dfl7c5rv0lfcqmmw7v6v6")))) (build-system gnu-build-system) (arguments '(#:phases @@ -4200,11 +4197,11 @@ (define-public gjs ;; For the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0") - ;; XXX: fails with: - ;; Failed to convert UTF-8 string to JS string: ... - ;; TODO: actually fix it. - (substitute* "installed-tests/js/testEverythingBasic.js" - ((".*test_utf8_inout.*") "")) + ;; Our mozjs-38 package does not compile the required Intl API + ;; support for these failing tests. + (substitute* "installed-tests/js/testLocale.js" + ((".*toBeDefined.*") "") + ((".*expect\\(datestr\\).*") "")) #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources @@ -4216,8 +4213,9 @@ (define-public gjs ("xvfb" ,xorg-server))) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. - `(("gobject-introspection" ,gobject-introspection) - ("mozjs" ,mozjs-24))) + `(("cairo" ,cairo) + ("gobject-introspection" ,gobject-introspection) + ("mozjs" ,mozjs-38))) (inputs `(("gtk+" ,gtk+) ("readline" ,readline))) From f3fc65f9d68acd9d9a015796d7a2bfe2f6cb32ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 20:08:52 +0200 Subject: [PATCH 27/81] gnu: libva: Update to 1.8.2. * gnu/packages/video.scm (libva): Update to 1.8.2. --- 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 b7c26a0424..aaf211ce89 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -408,7 +408,7 @@ (define-public libdv (define-public libva (package (name "libva") - (version "1.8.1") + (version "1.8.2") (source (origin (method url-fetch) @@ -416,7 +416,7 @@ (define-public libva "https://www.freedesktop.org/software/vaapi/releases/libva/libva-" version".tar.bz2")) (sha256 - (base32 "0wswfznj93jpnxhc3jwdk5j3pmyki0rs6k9vk4vnzds0dddximf1")))) + (base32 "1pnfl3q7dzxs26l3jk9xi97gr0qwnaz6dhvf9ifp2yplr3fy7lwy")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From 6a5751650e76cb501455b212793c0cacb8426510 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:32:32 +0200 Subject: [PATCH 28/81] gnu: glib: Update to 2.52.2. * gnu/packages/glib.scm (glib): Update to 2.52.2. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 67db51dc85..8927bcf343 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -137,7 +137,7 @@ (define dbus (define glib (package (name "glib") - (version "2.52.1") + (version "2.52.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -145,7 +145,7 @@ (define glib name "-" version ".tar.xz")) (sha256 (base32 - "0vsqrvjwsk2x3mm2i428hpm5vgsi1b384l6xdhm7xmzj2yw2d34l")) + "1l65kab6jr9zlllgbjcbvrbgah3sdd577fpw4pdb2j195ag5s3ph")) (patches (search-patches "glib-tests-timer.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything From db167f8273caf1eff10c7ba0d6e28a6996c162e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:32:58 +0200 Subject: [PATCH 29/81] gnu: glibmm: Update to 2.50.1. * gnu/packages/glib.scm (glibmm): Update to 2.50.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8927bcf343..a20685da03 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -492,7 +492,7 @@ (define libsigc++ (define glibmm (package (name "glibmm") - (version "2.50.0") + (version "2.50.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glibmm/" @@ -500,7 +500,7 @@ (define glibmm "/glibmm-" version ".tar.xz")) (sha256 (base32 - "152yz5w0lx0y5j9ml72az7pc83p4l92bc0sb8whpcazldqy6wwnz")))) + "1926b3adx903hzvdp8glblsgjyadzqnwgkj8hg605d4wv98m1n0z")))) (build-system gnu-build-system) (arguments `(#:phases (alist-cons-before From 9a1100ca524712f402b1d936d63f4d9f0a2eb886 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 20:05:19 +0200 Subject: [PATCH 30/81] gnu: gtk+: Update to 3.22.15. * gnu/packages/gtk.scm (gtk+): Update to 3.22.15. --- 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 9732ee4ccd..5d78de7f7f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -654,7 +654,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.12") + (version "3.22.15") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -662,7 +662,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "1359w81sxs2izkan2rni985x78s6zr1arf469qmyw4bazg7f1yl4")) + "1nqgb71vx222g9fd2p017948hqybnyi69xs3n2d64clim7115868")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) From fcbf05f9a217359ba0269037a5989a51393c2647 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 20:05:43 +0200 Subject: [PATCH 31/81] gnu: mate-themes: Update to 3.22.11. * gnu/packages/mate.scm (mate-themes): Update to 3.22.11. --- gnu/packages/mate.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index c8c7c63ee5..a39cd25d30 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -61,7 +61,7 @@ (define-public mate-icon-theme (define-public mate-themes (package (name "mate-themes") - (version "3.22.10") + (version "3.22.11") (source (origin (method url-fetch) (uri (string-append "http://pub.mate-desktop.org/releases/themes/" @@ -69,7 +69,7 @@ (define-public mate-themes version ".tar.xz")) (sha256 (base32 - "03ficjfxa4qpx4vcshhk2zxryivckxpw7wcjgbn8xqnjk3lgzjcb")))) + "1gfa1cny3q68y139m96iz8haiik6ygad5613gx0m4wd9hi5scafm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 048813966ab6dc91dc2416dad74500f11fddea97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:59:32 +0200 Subject: [PATCH 32/81] gnu: at-spi2-atk: Update to 2.24.1. * gnu/packages/gtk.scm (at-spi2-atk): Update to 2.24.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 5d78de7f7f..28b5f59060 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -554,7 +554,7 @@ (define-public at-spi2-core (define-public at-spi2-atk (package (name "at-spi2-atk") - (version "2.22.0") + (version "2.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -562,7 +562,7 @@ (define-public at-spi2-atk name "-" version ".tar.xz")) (sha256 (base32 - "1h8k271ad78smm41c9bmw5dc4gki0wfy324cn2g25svkp2zfvgg8")))) + "0zcmsq7g4jg5dpmfzkyfpa0v6hx4119c4qwkdblzzf3l9yn91p30")))) (build-system gnu-build-system) (arguments '(#:phases From feaf6a14076eb76cc55b2308a00d140c9d1c270c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:59:03 +0200 Subject: [PATCH 33/81] gnu: at-spi2-core: Update to 2.24.1. * gnu/packages/gtk.scm (at-spi2-core): Update to 2.24.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 28b5f59060..46a9d40d49 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -509,7 +509,7 @@ (define-public gdk-pixbuf+svg (define-public at-spi2-core (package (name "at-spi2-core") - (version "2.24.0") + (version "2.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -517,7 +517,7 @@ (define-public at-spi2-core name "-" version ".tar.xz")) (sha256 (base32 - "1kdgc5gkw3fsgxvwwsg7djvqijpc3xmpp9bp6k6v60yrzcag6yb1")))) + "0nwvjmd30rgq6d1zznavx0bdfa1xwv3jl8wnkbkwzaipp5jd140y")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments From df54e0b3d24a886ed3493c17bcebd748a5f035f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:57:54 +0200 Subject: [PATCH 34/81] gnu: atk: Update to 2.24.0. * gnu/packages/gtk.scm (atk): Update to 2.24.0. --- 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 46a9d40d49..16391184f1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -73,7 +73,7 @@ (define-module (gnu packages gtk) (define-public atk (package (name "atk") - (version "2.22.0") + (version "2.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -81,7 +81,7 @@ (define-public atk name "-" version ".tar.xz")) (sha256 (base32 - "1dj47ndvspa7lghw1jvjhv3v08q5f9ab5rb395mcgjbl975gajfk")))) + "0jbs90vacl95mwgvmqsizi1bwx5sw0rz70r9knksfwwch2dalbdv")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments From 9d5aadb35d60769ce46aad9ed8d09b8b0bd00cd0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:58:16 +0200 Subject: [PATCH 35/81] gnu: pango: Update to 1.40.6. * gnu/packages/gtk.scm (pango): Update to 1.40.6. --- 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 16391184f1..858fd07710 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -209,7 +209,7 @@ (define-public harfbuzz (define-public pango (package (name "pango") - (version "1.40.3") + (version "1.40.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -217,7 +217,7 @@ (define-public pango name "-" version ".tar.xz")) (sha256 (base32 - "1lqi4yncw5q0v7g5makzxyp18g5cksqyld8m1wx0qli8wxf8pfmb")))) + "0wz5b5knpw4gfvz3ny8l6h2ca3bpqqyh55mffkyzgsd1hdrjn5fa")))) (build-system gnu-build-system) (propagated-inputs `(("cairo" ,cairo) From 15d34a18c33a349b6817ba21daaf1e369b5e0dd1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:50:26 +0200 Subject: [PATCH 36/81] gnu: libcroco: Update to 0.6.12. * gnu/packages/gnome.scm (libcroco/fixed): Remove variable. (libcroco): Update to 0.6.12. [source]: Use patches from LIBCROCO/FIXED. [replacement]: Remove field. --- gnu/packages/gnome.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2cf6f4e3f0..c0f8392ed3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -949,16 +949,18 @@ (define-public glade3 (define-public libcroco (package (name "libcroco") - (replacement libcroco/fixed) - (version "0.6.11") + (version "0.6.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches + (search-patches "libcroco-CVE-2017-7960.patch" + "libcroco-CVE-2017-7961.patch")) (sha256 (base32 - "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk")))) + "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -977,19 +979,6 @@ (define-public libcroco ;; LGPLv2.1-only. (license license:lgpl2.1))) -(define libcroco/fixed - (package - (inherit libcroco) - (replacement #f) - (source - (origin - (inherit (package-source libcroco)) - (patches - (append - (origin-patches (package-source libcroco)) - (search-patches "libcroco-CVE-2017-7960.patch" - "libcroco-CVE-2017-7961.patch"))))))) - (define-public libgsf (package (name "libgsf") From 8e8fefb62245cde30a05119db4d0604a9cc5cfbb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:42:08 +0200 Subject: [PATCH 37/81] gnu: gvfs: Update to 1.32.1. * gnu/packages/gnome.scm (gvfs): Update to 1.32.1. --- 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 c0f8392ed3..fbf7b50c96 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3581,7 +3581,7 @@ (define-public libgudev (define-public gvfs (package (name "gvfs") - (version "1.30.3") + (version "1.32.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3589,7 +3589,7 @@ (define-public gvfs name "-" version ".tar.xz")) (sha256 (base32 - "0xgis1kgglnazy1vm66xiqyz8yvvmiad3h0g3agg7ryai6aa495q")))) + "1pkahczniar1yyas7awcqpkb4ca8l7qa4msn6mr29m89mgnwkdnh")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; XXX: requiring `pidof' From 6d836f4d83e36f6639e4eed9e4497a9c2aaa013c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:36:54 +0200 Subject: [PATCH 38/81] gnu: vala: Update to 0.36.3. * gnu/packages/gnome.scm (vala): Update to 0.36.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 fbf7b50c96..575a701a67 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1813,7 +1813,7 @@ (define-public seahorse (define-public vala (package (name "vala") - (version "0.34.4") + (version "0.36.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1821,7 +1821,7 @@ (define-public vala name "-" version ".tar.xz")) (sha256 (base32 - "10vbd74jazc3vhfagzx8v197bshrg61hnjzna6y3wmhljhrvs5vb")))) + "0706izk9prxqclm7gv4f63diwnlc1llvfl5sc9ghqbgn076lx2mc")))) (build-system gnu-build-system) (arguments '(#:phases From ffaf5cbd361b6589daac1912aa5a43abea86e52b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:37:21 +0200 Subject: [PATCH 39/81] gnu: libsoup: Update to 2.58.1. * gnu/packages/gnome.scm (libsoup): Update to 2.58.1. [arguments]<#:configure-flags>: Specify HTTPD module directory. [arguments]<#:phases>: Don't load mod_mpm_prefork for tests. --- gnu/packages/gnome.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 575a701a67..4b66bec619 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2242,7 +2242,7 @@ (define-public rest (define-public libsoup (package (name "libsoup") - (version "2.56.0") + (version "2.58.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -2250,14 +2250,17 @@ (define-public libsoup name "-" version ".tar.xz")) (sha256 (base32 - "1r8zz270qdg92gbsvy61d51y1cj7hp059h2f4xpvqiw2vrqnn8fq")))) + "1fggmshk2mfsyfvml6paki65xj9rv1s5p7ds41xmnx6yazsnkik2")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments `(#:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) + "/share/gtk-doc/html") + (string-append "--with-apache-module-dir=" + (assoc-ref %build-inputs "httpd") + "/modules")) #:phases (modify-phases %standard-phases (add-before 'configure 'disable-unconnected-socket-test @@ -2275,6 +2278,9 @@ (define-public libsoup ;; The ca-certificates.crt is not available in the build ;; environment. (setenv "SSL_CERT_FILE" "/dev/null") + ;; HTTPD in Guix uses mod_event and does not build prefork. + (substitute* "tests/httpd.conf" + (("^LoadModule mpm_prefork_module.*$") "\n")) #t)) (replace 'install (lambda _ From 9ec3a14788428cc430eb8de0237a2e7900572911 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:58:39 +0200 Subject: [PATCH 40/81] gnu: gtksourceview: Update to 3.24.2. * gnu/packages/gtk.scm (gtksourceview): Update to 3.24.2. --- 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 858fd07710..1d9ee15246 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -379,7 +379,7 @@ (define-public gtksourceview-2 (define-public gtksourceview (package (name "gtksourceview") - (version "3.22.2") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -387,7 +387,7 @@ (define-public gtksourceview name "-" version ".tar.xz")) (sha256 (base32 - "0pmgff3p9q1z500aiqfn5l4mmij4yfi4qhq8fxscqc89vlql5s3c")))) + "17xqrnh2v9gba57ij2m9kngxwh19fzsqkx1rfasnv4zaqvqqhv69")))) (build-system gnu-build-system) (arguments '(#:phases From 155f0d69d1ce7da3a96e2516f8729bd29f31f12a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:57:08 +0200 Subject: [PATCH 41/81] gnu: gnome-system-monitor: Update to 3.24.0. * gnu/packages/gnome.scm (gnome-system-monitor): Update to 3.24.0. --- 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 8d30975cac..8d4983299a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6003,7 +6003,7 @@ (define-public bluefish (define-public gnome-system-monitor (package (name "gnome-system-monitor") - (version "3.22.2") + (version "3.24.0") (source (origin (method url-fetch) @@ -6012,7 +6012,7 @@ (define-public gnome-system-monitor name "-" version ".tar.xz")) (sha256 (base32 - "10n9bl2q9xxnd6mfi4scfw5x0xyyzvnblz26q9gl8vks2nbv19b8")))) + "1x3343hchkllj8wyifk844v8psi45kyjhphyd03fzahi4h34aay3")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums. From 2c2da7ec0c68895e3df85d8bdc7da540a687cb4e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:56:45 +0200 Subject: [PATCH 42/81] gnu: gnome-calculator: Update to 3.24.0. * gnu/packages/gnome.scm (gnome-calculator): Update to 3.24.0. [inputs]: Add MPC. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8d4983299a..c10985cc75 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5881,7 +5881,7 @@ (define-public libunique (define-public gnome-calculator (package (name "gnome-calculator") - (version "3.22.2") + (version "3.24.0") (source (origin (method url-fetch) @@ -5890,7 +5890,7 @@ (define-public gnome-calculator name "-" version ".tar.xz")) (sha256 (base32 - "03il7xl4yr6xbzj6x1lbl16yzlb166c9h9wny1w7mj9dccnz99wr")))) + "041d40as8y0r5d0kk83dy842711zchydwwqh71kh1lpd373qlxa4")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. @@ -5900,6 +5900,7 @@ (define-public gnome-calculator (inputs `(("gtksourceview" ,gtksourceview) ("libsoup" ,libsoup) + ("mpc" ,mpc) ("mpfr" ,mpfr))) (home-page "https://wiki.gnome.org/Apps/Calculator") (synopsis "Desktop calculator") From a5b5fcaeadfaceb81aed36f1824f4cbb8243e9ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:55:57 +0200 Subject: [PATCH 43/81] gnu: gnome-shell-extensions: Update to 3.24.2. * gnu/packages/gnome.scm (gnome-shell-extensions): Update to 3.24.2. --- 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 c10985cc75..3e967efaac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5617,7 +5617,7 @@ (define-public gnome-tweak-tool (define-public gnome-shell-extensions (package (name "gnome-shell-extensions") - (version "3.22.2") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5625,7 +5625,7 @@ (define-public gnome-shell-extensions name "-" version ".tar.xz")) (sha256 (base32 - "11wa4f9arr89a4y8nsvla5j58dzwlawjb2q1lz0jn5i9kv324z6z")))) + "10sg87wml5cmyk90pybnr6r942ba7173sl7yplhj2sfggp0wc74s")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-extensions=all"))) From bc91a80c79906b2086dd475d1b1fd531b9654e86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:55:37 +0200 Subject: [PATCH 44/81] gnu: gnome-tweak-tool: Update to 3.24.0. * gnu/packages/gnome.scm (gnome-tweak-tool): Update to 3.24.0. --- 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 3e967efaac..52a853956a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5566,7 +5566,7 @@ (define-public gnome-dictionary (define-public gnome-tweak-tool (package (name "gnome-tweak-tool") - (version "3.22.0") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweak-tool/" @@ -5576,7 +5576,7 @@ (define-public gnome-tweak-tool (search-patch "gnome-tweak-tool-search-paths.patch"))) (sha256 (base32 - "1frs16p2284mdw65g1ldmf9cz5sn3rg16wz58gjrw5pn2cgf2six")))) + "000ygz9wgnv8pimb6rwbjfm12vbx4138pwkq36ci0k6v827282wk")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--localstatedir=/tmp" From 6e2fc6c7f6ca03326163885cbedcde210c62e16d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:55:14 +0200 Subject: [PATCH 45/81] gnu: gnome-dictionary: Update to 3.24.0. * gnu/packages/gnome.scm (gnome-dictionary): Update to 3.24.0. --- 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 52a853956a..3411fc0a5c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5536,7 +5536,7 @@ (define-public gnome-calendar (define-public gnome-dictionary (package (name "gnome-dictionary") - (version "3.20.0") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5544,7 +5544,7 @@ (define-public gnome-dictionary name "-" version ".tar.xz")) (sha256 (base32 - "08b1f5s5aqka3dwxnzmwr2fmyddjm9xw7zmqsf8r5zvfsivn7czg")))) + "1wnrpg8yndacq0xnzc84d519yp7f28brzklm3a48xcgs1i50drs1")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") From 44b1e86db24073f9148e0b91be152c89c7745d2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:54:53 +0200 Subject: [PATCH 46/81] gnu: gnome-calendar: Update to 3.24.2. * gnu/packages/gnome.scm (gnome-calendar): Update to 3.24.2. --- 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 3411fc0a5c..d26546b715 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5507,7 +5507,7 @@ (define-public libzapojit (define-public gnome-calendar (package (name "gnome-calendar") - (version "3.22.2") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5515,7 +5515,7 @@ (define-public gnome-calendar name "-" version ".tar.xz")) (sha256 (base32 - "03wivk7hbyqrqcrd7jg0m2xj6q13248la2184qkf7zncnj72g5ih")))) + "0lc0xdgn0y12i87775xyy0p3a5l82w9k49cmwl1my8r8pwf9lp6s")))) (build-system glib-or-gtk-build-system) (native-inputs `(("intltool" ,intltool) From ac8f1ce477fa806a43507293595e3c89003129ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:54:28 +0200 Subject: [PATCH 47/81] gnu: nautilus: Update to 3.24.1. * gnu/packages/gnome.scm (nautilus): Update to 3.24.1. --- 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 d26546b715..14101c8d36 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5200,7 +5200,7 @@ (define-public tracker (define-public nautilus (package (name "nautilus") - (version "3.22.2") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5208,7 +5208,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1cv5xsah04svxx0b6di7iah9gcwk6na2c6lp442pal9v2ybrw76f")))) + "1cn6bmzmahzlwcd4gllsvx6dva386xm3papgzpv1r34abw73sf27")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags From ce1e6de0763a148ed4fe7e0a455831d2f5973ac3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:53:21 +0200 Subject: [PATCH 48/81] gnu: gnome-shell: Update to 3.24.2. * gnu/packages/patches/gnome-shell-CVE-2017-8288.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/gnome.scm (gnome-shell): Update to 3.24.2. [source]: Remove patch. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 5 +- .../patches/gnome-shell-CVE-2017-8288.patch | 54 ------------------- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 gnu/packages/patches/gnome-shell-CVE-2017-8288.patch diff --git a/gnu/local.mk b/gnu/local.mk index 16b80fde9d..26ce266e4b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -634,7 +634,6 @@ 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-shell-CVE-2017-8288.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 14101c8d36..4123cdf097 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4990,16 +4990,15 @@ (define-public gnome-control-center (define-public gnome-shell (package (name "gnome-shell") - (version "3.22.2") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "gnome-shell-CVE-2017-8288.patch")) (sha256 (base32 - "16smvjfrpyfphv479hjky5261hgl4kli4q86bcb2b8xdcav4w3yq")))) + "1xp2ccmdrvzlczsrcplykwqwx2v4lbmkr0rxyylb06danlw9mivh")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/gnome-shell-CVE-2017-8288.patch b/gnu/packages/patches/gnome-shell-CVE-2017-8288.patch deleted file mode 100644 index 5d8e31563f..0000000000 --- a/gnu/packages/patches/gnome-shell-CVE-2017-8288.patch +++ /dev/null @@ -1,54 +0,0 @@ -Fix CVE-2017-8288: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8288 -http://seclists.org/oss-sec/2017/q2/136 - -Patch copied from upstream source repository: - -https://git.gnome.org/browse/gnome-shell/commit/?id=ff425d1db7082e2755d2a405af53861552acf2a1 - -From ff425d1db7082e2755d2a405af53861552acf2a1 Mon Sep 17 00:00:00 2001 -From: Emilio Pozuelo Monfort -Date: Tue, 25 Apr 2017 17:27:42 +0200 -Subject: extensionSystem: handle reloading broken extensions - -Some extensions out there may fail to reload. When that happens, -we need to catch any exceptions so that we don't leave things in -a broken state that could lead to leaving extensions enabled in -the screen shield. - -https://bugzilla.gnome.org/show_bug.cgi?id=781728 ---- - js/ui/extensionSystem.js | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js -index a4dc29e..fc352b8 100644 ---- a/js/ui/extensionSystem.js -+++ b/js/ui/extensionSystem.js -@@ -282,12 +282,20 @@ function _onVersionValidationChanged() { - // temporarily disable them all - enabledExtensions = []; - for (let uuid in ExtensionUtils.extensions) -- reloadExtension(ExtensionUtils.extensions[uuid]); -+ try { -+ reloadExtension(ExtensionUtils.extensions[uuid]); -+ } catch(e) { -+ logExtensionError(uuid, e); -+ } - enabledExtensions = getEnabledExtensions(); - - if (Main.sessionMode.allowExtensions) { - enabledExtensions.forEach(function(uuid) { -- enableExtension(uuid); -+ try { -+ enableExtension(uuid); -+ } catch(e) { -+ logExtensionError(uuid, e); -+ } - }); - } - } --- -cgit v0.12 - From 44da12be489e8bb8c14b63e3a2c2dccead0a640b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:52:55 +0200 Subject: [PATCH 49/81] gnu: gnome-control-center: Update to 3.24.2. * gnu/packages/gnome.scm (gnome-control-center): Update to 3.24.2. --- 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 4123cdf097..53976f1262 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4919,7 +4919,7 @@ (define-public gnome-bluetooth (define-public gnome-control-center (package (name "gnome-control-center") - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4927,7 +4927,7 @@ (define-public gnome-control-center name "-" version ".tar.xz")) (sha256 (base32 - "0g55i4w0a8qpfkl0vnzr3ng6adx8pdxqk8vzc3kvvx6xzlcqxk1h")))) + "0awga40jh6gvn335mn6kyl6yg79frap1znrsz3sw2m27yldlnaiq")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases From 8f37813e8aac9949ce7363ae7b0e5433be664f5e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:46:11 +0200 Subject: [PATCH 50/81] gnu: gdm: Update to 3.24.2. * gnu/packages/gnome.scm (gdm): Update to 3.24.2. --- 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 53976f1262..ea7676d8fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4799,7 +4799,7 @@ (define-public libxml++-2 (define-public gdm (package (name "gdm") - (version "3.22.1") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4807,7 +4807,7 @@ (define-public gdm name "-" version ".tar.xz")) (sha256 (base32 - "17wnsrv91mx14xp96wrc21g2hsjjc38yhbkw55kf7hk3yliychva")))) + "1s2xzrwcjhfb4ra8jrxqfycs1jpv97id0f6idb2h6vjkspxbjy23")))) (build-system gnu-build-system) (arguments '(#:configure-flags From 743aebd78d535bbbb0f532844af488679d41daaf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:44:57 +0200 Subject: [PATCH 51/81] gnu: evolution-data-server: Update to 3.24.2. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.24.2. [build-system]: Change to CMAKE-BUILD-SYSTEM. [arguments]<#:configure-flags>: Adjust accordingly. Enable introspection. <#:phases>: Patch tests after unpack. [native-inputs]: Change PYTHON to PYTHON-WRAPPER. [inputs]: Add MIT-KRB5 and OPENLDAP. --- gnu/packages/gnome.scm | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ea7676d8fb..b72f4b5282 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -46,6 +46,7 @@ (define-module (gnu packages gnome) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system trivial) @@ -4449,7 +4450,7 @@ (define-public gnome-online-accounts (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.22.3") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4457,26 +4458,20 @@ (define-public evolution-data-server name "-" version ".tar.xz")) (sha256 (base32 - "0kygd46s0is6i451bqykagrfx34wjvrgjbjyyszaabnppp1dyn0c")))) - (build-system gnu-build-system) + "1ywqy939n27v3kchlnyxs6ikhjxmlasv6f08ap4bldgr121vkfx9")))) + (build-system cmake-build-system) (arguments - '(;; XXX: fails with: - ;; /Fixture/Calendar0: cleaning up pid xxxx - ;; t status: 139) + '(;; XXX FIXME: 11/85 tests are failing. #:tests? #f #:configure-flags - (let ((nss (assoc-ref %build-inputs "nss")) - (nspr (assoc-ref %build-inputs "nspr"))) - (list "--disable-uoa" ; disable Ubuntu Online Accounts support - "--disable-google" ; disable Google Contacts support - "--disable-google-auth" ; disable Google authentication - "--enable-vala-bindings" - (string-append "--with-nspr-includes=" nspr "/include/nspr") - (string-append "--with-nss-includes=" nss "/include/nss") - (string-append "--with-nss-libs=" nss "/lib/nss"))) + (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" + "-DENABLE_INTROSPECTION=ON") ;required for Vala bindings #:phases (modify-phases %standard-phases - (add-before 'check 'pre-check + (add-after 'unpack 'patch-paths (lambda _ (substitute* "tests/test-server-utils/e-test-server-utils.c" (("/bin/rm") (which "rm"))) @@ -4488,7 +4483,7 @@ (define-public evolution-data-server ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("vala" ,vala) - ("python" ,python))) + ("python" ,python-wrapper))) (propagated-inputs ;; These are all in the Requires field of .pc files. `(("gtk+" ,gtk+) @@ -4501,7 +4496,9 @@ (define-public evolution-data-server `(("bdb" ,bdb) ("gcr" ,gcr) ("gnome-online-accounts" ,gnome-online-accounts) - ("libgweather" ,libgweather))) + ("libgweather" ,libgweather) + ("mit-krb5" ,mit-krb5) + ("openldap" ,openldap))) (synopsis "Store address books and calendars") (home-page "https://wiki.gnome.org/Apps/Evolution") (description From de20d910581db12a6d6dad70fe5f8a24eae0f13b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:44:37 +0200 Subject: [PATCH 52/81] gnu: mutter: Update to 3.24.2. * gnu/packages/gnome.scm (mutter): Update to 3.24.2. --- 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 b72f4b5282..5fce58fe51 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4312,7 +4312,7 @@ (define-public zenity (define-public mutter (package (name "mutter") - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4320,7 +4320,7 @@ (define-public mutter name "-" version ".tar.xz")) (sha256 (base32 - "093ax3ng7fv28qfkxpbvcx67mfiizwj5b4s17m5cmijwf3wpgamc")))) + "043q3384vwrkjdfhbwn9pwdml6z0g0ad0cj2fjnjzg6402i67071")))) ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked ;; versions of cogl and clutter. As a result, many of the inputs, ;; propagated-inputs, and configure flags used in cogl and clutter are From 380cb96e35fa36386f9f6cf9c1174b01e5af43e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:44:15 +0200 Subject: [PATCH 53/81] gnu: zenity: Update to 3.24.0. * gnu/packages/gnome.scm (zenity): Update to 3.24.0. --- 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 5fce58fe51..0cc4e1a250 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4285,7 +4285,7 @@ (define-public gedit (define-public zenity (package (name "zenity") - (version "3.22.0") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4293,7 +4293,7 @@ (define-public zenity name "-" version ".tar.xz")) (sha256 (base32 - "0rp4l0vgyjhlkpk2imfwf7b05m1qxjrm8n8kp1rv70ykf48gmk8y")))) + "1xzpm63cib2xzr99phplhbcjzy7lahggk3gp60dvrrclxhka1w3g")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) From 16c2b151a32a916f64cbcc8259def51f24af8041 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:43:09 +0200 Subject: [PATCH 54/81] gnu: epiphany: Update to 3.24.2. * gnu/packages/gnome.scm (epiphany): Update to 3.24.2. --- 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 0cc4e1a250..a98aa34d7c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3741,7 +3741,7 @@ (define-public simple-scan (define-public epiphany (package (name "epiphany") - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3749,7 +3749,7 @@ (define-public epiphany name "-" version ".tar.xz")) (sha256 (base32 - "1p499ncsrbpfjna9h5v1cafr7fv1zb4cmihz05pgr07bb625y991")))) + "13f5h7mbxdyjf93jp46hiaxsrngpr6frgf69d8iza7arc060vg2s")))) (build-system glib-or-gtk-build-system) (arguments ;; FIXME: tests run under Xvfb, but fail with: From aad56d0e21124b51e1a32687f2a6dda70d406590 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:41:41 +0200 Subject: [PATCH 55/81] gnu: totem: Update to 3.24.0. * gnu/packages/gnome.scm (totem): Update to 3.24.0. --- 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 a98aa34d7c..031203d031 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3343,7 +3343,7 @@ (define-public grilo-plugins (define-public totem (package (name "totem") - (version "3.22.0") + (version "3.24.0") (source (origin (method url-fetch) @@ -3352,7 +3352,7 @@ (define-public totem name "-" version ".tar.xz")) (sha256 (base32 - "1sjgjqhpsh3kipnbc8y31xz64s61xjayxq98pi0vkgbl2rdmnsh2")))) + "00cdlll5b0wj5ckl1pc0a3g39a0hlq0gxkcsh1f6p20fjixqzmwv")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 9bf10a74241854f6dbe785eccac3bc3a0d42ebdc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:40:03 +0200 Subject: [PATCH 56/81] gnu: devhelp: Update to 3.24.0. * gnu/packages/gnome.scm (devhelp): Update to 3.24.0. --- 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 031203d031..0905a112f0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2873,7 +2873,7 @@ (define-public aisleriot (define-public devhelp (package (name "devhelp") - (version "3.22.0") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2881,7 +2881,7 @@ (define-public devhelp name "-" version ".tar.xz")) (sha256 (base32 - "1c7zqn8apm1lnpsp74bd880rga2vi5wxfjghqdgwqf6j28pf1jjr")))) + "0c74rk46dy3kvy78m42jl3ip56c5536zmy8v1lbascjmh4fdwn28")))) (build-system glib-or-gtk-build-system) (native-inputs `(("intltool" ,intltool) From 6481cad75433af619a3fade5dcb128571b20e8db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:39:40 +0200 Subject: [PATCH 57/81] gnu: gnome-settings-daemon: Update to 3.24.2. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.24.2. --- 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 0905a112f0..e96d5f03c0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2746,7 +2746,7 @@ (define-public libgweather (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) @@ -2755,7 +2755,7 @@ (define-public gnome-settings-daemon name "-" version ".tar.xz")) (sha256 (base32 - "02vm0jwhs9rdi3dphxw7dxharx7ng0l12j6hfdmn3vjc7v3ds50v")))) + "1jnw920zn4cadhgmcv2q5ylzqhwm1rmrhf3a14q8mvp38hkdgaaa")))) (build-system glib-or-gtk-build-system) (arguments `(;; Color management test can't reach the colord system service. From becd37043a8735f3496af96d7c54a231dd252e91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:39:17 +0200 Subject: [PATCH 58/81] gnu: libgweather: Update to 3.24.0. * gnu/packages/gnome.scm (libgweather): Update to 3.24.0. --- 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 e96d5f03c0..0e6523a38a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2691,7 +2691,7 @@ (define-public upower (define-public libgweather (package (name "libgweather") - (version "3.20.4") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2699,7 +2699,7 @@ (define-public libgweather name "-" version ".tar.xz")) (sha256 (base32 - "1higj4nmn3srqjbzl4iva7c0b4fkdq74xi4b35xd0qc4qiawbkbx")))) + "0ggspn3wmlkdxpfv4ym68qn1mzqc3hv666sykv8sv1ah40rbk28h")))) (build-system gnu-build-system) (arguments `(#:configure-flags From e20d997fbfcfff33aafccf555584eecd7d2311c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:38:53 +0200 Subject: [PATCH 59/81] gnu: gnome-terminal: Update to 3.24.2. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.24.2. --- 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 0e6523a38a..f3d4db5488 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2440,7 +2440,7 @@ (define-public gnome-sudoku (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) @@ -2449,7 +2449,7 @@ (define-public gnome-terminal name "-" version ".tar.xz")) (sha256 (base32 - "1q303bljcr06w3ra737kq1hpjda45wk16kmrixxwldf3zkk2dgx7")))) + "03zcvxlzg7n4pz65vrg5xj3qpkqr4bz162mgmaz4bjh71b1xl7i8")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags From 34a8af2d9d5236b9ec35c6f98fec6090ba300337 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:38:28 +0200 Subject: [PATCH 60/81] gnu: gnome-sudoku: Update to 3.24.0. * gnu/packages/gnome.scm (gnome-sudoku): Update to 3.24.0. --- 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 f3d4db5488..c52b2050fe 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2405,7 +2405,7 @@ (define-public gnome-mines (define-public gnome-sudoku (package (name "gnome-sudoku") - (version "3.22.2") + (version "3.24.0") (source (origin (method url-fetch) @@ -2414,7 +2414,7 @@ (define-public gnome-sudoku name "-" version ".tar.xz")) (sha256 (base32 - "1sz2ln2nc9ff7zigghil32vbmr2qhb98dc0rbrz755rlrsh8pi08")))) + "1mw5ykk7wr0r9770jj5270f07rjws0pmpjs0b1fywj4li13r98h4")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) From ac89f213e32887cdac0493950bdd9b1fa99ffa47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:38:07 +0200 Subject: [PATCH 61/81] gnu: gnome-mines: Update to 3.24.0. * gnu/packages/gnome.scm (gnome-mines): Update to 3.24.0. --- 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 c52b2050fe..8cf7a79f5a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2367,7 +2367,7 @@ (define-public libsecret (define-public gnome-mines (package (name "gnome-mines") - (version "3.22.2") + (version "3.24.0") (source (origin (method url-fetch) @@ -2376,7 +2376,7 @@ (define-public gnome-mines name "-" version ".tar.xz")) (sha256 (base32 - "1wia0nj5i244m6pq3lridvk3vx9yipsa9l921nsskd97115mnyza")))) + "1xh2as2xmh7gx45gpnl0fh9xjpvyyn3m84qgv41kyp2s4clsyqz6")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases From 539f52de6dbed067a4b2d26607727cf9fd13823a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:37:44 +0200 Subject: [PATCH 62/81] gnu: gnome-maps: Update to 3.24.3. * gnu/packages/geo.scm (gnome-maps): Update to 3.24.3. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4f137a88d7..d8d5490f3e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -75,7 +75,7 @@ (define-public geos (define-public gnome-maps (package (name "gnome-maps") - (version "3.18.3") + (version "3.24.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -83,7 +83,7 @@ (define-public gnome-maps name "-" version ".tar.xz")) (sha256 (base32 - "1vdnr2wmhqhql2gxd5n1ijwk88qhim14izbkczncg35846hfsr5i")))) + "1mnhcrawdp6fyqylh0m8l259xdd7pqwibrjyl54rmsvnm8vfrwsy")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags ; Ensure that geoclue is referred to by output. From 62963f568e0d4f14a40ca8eae760454cdee57bad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:34:06 +0200 Subject: [PATCH 63/81] gnu: gnome-disk-utility: Update to 3.24.1. * gnu/packages/gnome.scm (gnome-disk-utility): Update to 3.24.1. --- 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 8cf7a79f5a..19403d5f43 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -340,7 +340,7 @@ (define-public gnome-doc-utils (define-public gnome-disk-utility (package (name "gnome-disk-utility") - (version "3.22.1") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -348,7 +348,7 @@ (define-public gnome-disk-utility name "-" version ".tar.xz")) (sha256 (base32 - "1hqynlcgwm72il2rdml98gcarz0alsgxs5xf6ww2x0czaj3s3953")))) + "18akarcbhm8djlmz49jzavc7qx8dg71gvxc9xd23p0bwjj4h93w7")))) (build-system gnu-build-system) (native-inputs `(("glib:bin" ,glib "bin") From 7a0d78fc52440c72954ef8ac446e3a7989cf5e8c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 May 2017 19:33:34 +0200 Subject: [PATCH 64/81] gnu: gnome-desktop: Update to 3.24.2. * gnu/packages/gnome.scm (gnome-desktop): Update to 3.24.2. --- 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 19403d5f43..299f11b2d2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -263,7 +263,7 @@ (define-public gnome-common (define-public gnome-desktop (package (name "gnome-desktop") - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) @@ -272,7 +272,7 @@ (define-public gnome-desktop name "-" version ".tar.xz")) (sha256 (base32 - "1as5ri52n6wphvhqnxa813q15jri0x47hxsjikjcmb2big9vf2fy")))) + "0pkq5l1llw8gkjhfq6y58iyj6wac8dh1mc3rzjzn6nd7lrkdx8cg")))) (build-system gnu-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) From ae40e02cd68d4e0ab10690bd4e59c698df472857 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 24 May 2017 16:29:29 -0400 Subject: [PATCH 65/81] gnu: python-pyobject: Update to 3.24.1. * gnu/packages/glib.scm (python-pyobject, python2-pyobject): Update to 3.24.1. [arguments]: Remove field. [native-inputs]: Add dbus. --- gnu/packages/glib.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a20685da03..fcd1daf5e8 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -573,7 +573,7 @@ (define-public python2-pygobject-2 (define-public python-pygobject (package (name "python-pygobject") - (version "3.22.0") + (version "3.24.1") (source (origin (method url-fetch) @@ -582,11 +582,13 @@ (define-public python-pygobject "/pygobject-" version ".tar.xz")) (sha256 (base32 - "1ryblpc4wbhxcwf7grgib4drrab5xi6p78ihhrx0zj7g13xrrch8")))) + "1zdzznrj2s1gsrv2z4r0n88fzba8zjc1n2r313xi77lhl1daja56")))) (build-system gnu-build-system) (native-inputs `(("which" ,which) - ("glib-bin" ,glib "bin") ;for tests: glib-compile-schemas + ;for tests: dbus-run-session and glib-compile-schemas + ("dbus" ,dbus) + ("glib-bin" ,glib "bin") ("pkg-config" ,pkg-config))) (inputs `(("python" ,python) @@ -596,16 +598,6 @@ (define-public python-pygobject ;; pygobject-3.0.pc refers to all these. `(("glib" ,glib) ("libffi" ,libffi))) - (arguments - ;; TODO: failing tests: test_native_calls_async - ;; test_native_calls_async_errors test_native_calls_sync - ;; test_native_calls_sync_errors test_python_calls_async - ;; test_python_calls_async_error test_python_calls_async_error_result - ;; test_python_calls_sync test_python_calls_sync_errors - ;; test_python_calls_sync_noargs test_callback_user_data_middle_none - ;; test_callback_user_data_middle_single - ;; test_callback_user_data_middle_tuple - '(#:tests? #f)) ;; For finding typelib files, since gobject-introscpetion isn't propagated. (native-search-paths (package-native-search-paths gobject-introspection)) (home-page "https://live.gnome.org/PyGObject") From 1622637bb74d03cd3070ce14195252ead032d99d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 25 May 2017 23:17:04 -0400 Subject: [PATCH 66/81] gnu: Add liboauth. * gnu/packages/web.scm (liboauth): New variable. --- gnu/packages/web.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bcc20bfdde..ab872d96b9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,6 +69,7 @@ (define-module (gnu packages web) #:use-module (gnu packages gnome) #:use-module (gnu packages gnu-doc) #:use-module (gnu packages gnupg) + #:use-module (gnu packages gnuzilla) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) @@ -708,6 +710,34 @@ (define-public wwwoffle changes, and much more.") (license l:gpl2+))) +(define-public liboauth + (package + (name "liboauth") + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/liboauth/liboauth-" + version ".tar.gz")) + (sha256 + (base32 + "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd")))) + (build-system gnu-build-system) + (arguments '(#:configure-flags '("--enable-nss"))) + (native-inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("curl" ,curl) + ("nss" ,nss))) + (home-page "https://sourceforge.net/projects/liboauth") + (synopsis "C library implementing the http://oauth.net API") + (description + "liboauth is a collection of C functions implementing the http://oauth.net +API. liboauth provides functions to escape and encode stings according to +OAuth specifications and offers high-level functionality built on top to sign +requests or verify signatures using either NSS or OpenSSL for calculating the +hash/signatures.") + ;; Source code may be distributed under either license. + (license (list l:expat l:gpl2+)))) + (define-public libyaml (package (name "libyaml") From adc5cb1b499d4878be5663e1aea2b290898f82d0 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 26 May 2017 01:13:23 -0400 Subject: [PATCH 67/81] gnu: Add libgdata. * gnu/packages/gnome.scm (libgdata): New variable. * gnu/packages/patches/libgdata-fix-tests.patch, gnu/packages/patches/libgdata-glib-duplicate-tests.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 2 + gnu/packages/gnome.scm | 52 ++- gnu/packages/patches/libgdata-fix-tests.patch | 325 ++++++++++++++++++ .../libgdata-glib-duplicate-tests.patch | 16 + 4 files changed, 394 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libgdata-fix-tests.patch create mode 100644 gnu/packages/patches/libgdata-glib-duplicate-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index e08146f3b2..922c33aca3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -729,6 +729,8 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-dns-tests.patch \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libextractor-ffmpeg-3.patch \ + %D%/packages/patches/libgdata-fix-tests.patch \ + %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgit2-use-after-free.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 299f11b2d2..6ffa10b252 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2016, 2017 Rene Saavedra ;;; Copyright © 2016 Jochem Raat -;;; Copyright © 2016 Kei Kebreau +;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Leo Famulari @@ -238,6 +238,56 @@ (define-public dia formats like PNG, SVG, PDF and EPS.") (license license:gpl2+)))) +(define-public libgdata + (package + (name "libgdata") + (version "0.16.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "09q8h1129xjpw33rvzz7856drygxwlm0s64z9cm0vbmjxiqy0h47")) + (patches + (search-patches "libgdata-fix-tests.patch" + "libgdata-glib-duplicate-tests.patch")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'use-empty-ssl-cert-file + (lambda _ + ;; The ca-certificates.crt is not available in the build + ;; environment. + (setenv "SSL_CERT_FILE" "/dev/null") + #t))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("uhttpmock" ,uhttpmock))) + (inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("glib" ,glib) + ("glib-networking" ,glib-networking) + ("json-glib" ,json-glib) + ("libsoup" ,libsoup))) + (propagated-inputs + `(("gcr" ,gcr) + ("gnome-online-accounts" ,gnome-online-accounts) + ("liboauth" ,liboauth) + ("libxml2" ,libxml2))) + (home-page "https://wiki.gnome.org/Projects/libgdata") + (synopsis "Library for accessing online service APIs") + (description + "libgdata is a GLib-based library for accessing online service APIs using +the GData protocol — most notably, Google's services. It provides APIs to +access the common Google services, and has full asynchronous support.") + (license license:lgpl2.1+))) + (define-public gnome-common (package (name "gnome-common") diff --git a/gnu/packages/patches/libgdata-fix-tests.patch b/gnu/packages/patches/libgdata-fix-tests.patch new file mode 100644 index 0000000000..dc86b3ab5a --- /dev/null +++ b/gnu/packages/patches/libgdata-fix-tests.patch @@ -0,0 +1,325 @@ +From c87a112246e0bcbd5c3a8aa484a50c617d710dbf Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Fri, 12 Dec 2014 17:31:01 +0000 +Subject: [PATCH] tests: Eliminate ISO 8601 formatting workaround for dates + +Follow up to commit 732017e4e5235e28c578cc3367fa0c4548b65495. + +https://bugzilla.gnome.org/show_bug.cgi?id=739956 +--- + gdata/tests/calendar.c | 20 ++++++++++---------- + gdata/tests/general.c | 34 +++++++++++++++++----------------- + gdata/tests/tasks.c | 34 +++++++++++++++++----------------- + gdata/tests/youtube.c | 16 ++++++++-------- + 4 files changed, 52 insertions(+), 52 deletions(-) + +diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c +index bb1d609..c54ddda 100644 +--- a/gdata/tests/calendar.c ++++ b/gdata/tests/calendar.c +@@ -620,7 +620,7 @@ test_event_xml (void) + "" + "" + "" +- "" ++ "" + "" +@@ -706,7 +706,7 @@ test_event_xml_dates (void) + "" + "" + "" +- "" ++ "" + "" + ""); + +@@ -934,25 +934,25 @@ test_query_uri (void) + + /* Check the built query URI with a normal feed URI */ + query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com"); +- g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00" +- "&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00&singleevents=true&sortorder=descending" +- "&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00&ctz=America%2FLos_Angeles&max-attendees=15" ++ g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00Z" ++ "&recurrence-expansion-end=2010-04-17T15:00:00Z&singleevents=true&sortorder=descending" ++ "&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z&ctz=America%2FLos_Angeles&max-attendees=15" + "&showdeleted=true"); + g_free (query_uri); + + /* …with a feed URI with a trailing slash */ + query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com/"); +- g_assert_cmpstr (query_uri, ==, "http://example.com/?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00" +- "&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00&singleevents=true&sortorder=descending" +- "&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00&ctz=America%2FLos_Angeles&max-attendees=15" ++ g_assert_cmpstr (query_uri, ==, "http://example.com/?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00Z" ++ "&recurrence-expansion-end=2010-04-17T15:00:00Z&singleevents=true&sortorder=descending" ++ "&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z&ctz=America%2FLos_Angeles&max-attendees=15" + "&showdeleted=true"); + g_free (query_uri); + + /* …with a feed URI with pre-existing arguments */ + query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com/bar/?test=test&this=that"); + g_assert_cmpstr (query_uri, ==, "http://example.com/bar/?test=test&this=that&q=q&futureevents=true&orderby=starttime" +- "&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00" +- "&singleevents=true&sortorder=descending&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00" ++ "&recurrence-expansion-start=2009-04-17T15:00:00Z&recurrence-expansion-end=2010-04-17T15:00:00Z" ++ "&singleevents=true&sortorder=descending&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z" + "&ctz=America%2FLos_Angeles&max-attendees=15&showdeleted=true"); + g_free (query_uri); + +diff --git a/gdata/tests/general.c b/gdata/tests/general.c +index 237a908..f828d2e 100644 +--- a/gdata/tests/general.c ++++ b/gdata/tests/general.c +@@ -528,8 +528,8 @@ test_entry_parse_xml (void) + "" + "" + "Testing unhandled XML" +- "2009-01-25T14:07:37.000001+00:00" +- "2009-01-23T14:06:37.000001+00:00" ++ "2009-01-25T14:07:37Z" ++ "2009-01-23T14:06:37Z" + "Here we test unhandled XML elements." + "Test!" + "" +@@ -569,8 +569,8 @@ test_entry_parse_xml_kind_category (void) + "" + "" + "Testing kind categories" +- "2009-01-25T14:07:37.000001+00:00" +- "2009-01-23T14:06:37.000001+00:00" ++ "2009-01-25T14:07:37Z" ++ "2009-01-23T14:06:37Z" + "Here we test kind categories." + "" + "Escaped content & stuff" + "http://foo.com/?foo&bar" +- "2010-12-10T17:21:24.000001+00:00" +- "2010-12-10T17:21:24.000001+00:00" ++ "2010-12-10T17:21:24Z" ++ "2010-12-10T17:21:24Z" + "Summary & stuff" + "Free & open source" + "Content & things." +@@ -1106,7 +1106,7 @@ test_feed_escaping (void) + "" + "Test feed & stuff." + "http://foo.com?foo&bar" +- "2010-12-10T17:49:15.000001+00:00" ++ "2010-12-10T17:49:15Z" + ""); + g_object_unref (feed); + } +@@ -1157,28 +1157,28 @@ test_query_dates (void) + /* updated-min */ + gdata_query_set_updated_min (query, 1373280114); /* 2013-07-08T10:41:54Z */ + query_uri = gdata_query_get_query_uri (query, "http://example.com"); +- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-min=2013-07-08T10:41:54.000001+00:00"); ++ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-min=2013-07-08T10:41:54Z"); + g_free (query_uri); + gdata_query_set_updated_min (query, -1); + + /* updated-max */ + gdata_query_set_updated_max (query, 1373280114); /* 2013-07-08T10:41:54Z */ + query_uri = gdata_query_get_query_uri (query, "http://example.com"); +- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-max=2013-07-08T10:41:54.000001+00:00"); ++ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-max=2013-07-08T10:41:54Z"); + g_free (query_uri); + gdata_query_set_updated_max (query, -1); + + /* published-min */ + gdata_query_set_published_min (query, 1373280114); /* 2013-07-08T10:41:54Z */ + query_uri = gdata_query_get_query_uri (query, "http://example.com"); +- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-min=2013-07-08T10:41:54.000001+00:00"); ++ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-min=2013-07-08T10:41:54Z"); + g_free (query_uri); + gdata_query_set_published_min (query, -1); + + /* published-max */ + gdata_query_set_published_max (query, 1373280114); /* 2013-07-08T10:41:54Z */ + query_uri = gdata_query_get_query_uri (query, "http://example.com"); +- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-max=2013-07-08T10:41:54.000001+00:00"); ++ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-max=2013-07-08T10:41:54Z"); + g_free (query_uri); + gdata_query_set_published_max (query, -1); + +@@ -3127,7 +3127,7 @@ test_gd_reminder (void) + gdata_test_assert_xml (reminder, + "" + ""); ++ "absoluteTime='2005-06-07T00:55:00Z' method='alert'/>"); + g_object_unref (reminder); + } + +@@ -3218,8 +3218,8 @@ test_gd_when (void) + /* Check the outputted XML is the same */ + gdata_test_assert_xml (when, + "" +- ""); ++ ""); + g_object_unref (when); + + /* Now parse a time with different information */ +@@ -3258,7 +3258,7 @@ test_gd_when (void) + "" + "" +- "" ++ "" + "" + ""); + g_object_unref (when); +@@ -3278,7 +3278,7 @@ test_gd_when_escaping (void) + gdata_test_assert_xml (when, + "" + ""); ++ "startTime='2005-06-07T01:00:00Z' valueString='Value string & stuff!'/>"); + g_object_unref (when); + } + +diff --git a/gdata/tests/tasks.c b/gdata/tests/tasks.c +index 7a5bc7e..7bf3174 100644 +--- a/gdata/tests/tasks.c ++++ b/gdata/tests/tasks.c +@@ -122,11 +122,11 @@ test_query_uri (void) + g_assert_cmpstr (query_uri, ==, + "http://example.com" + "?maxResults=10" +- "&updatedMin=1970-01-01T01:53:09.000001+00:00" +- "&completedMin=1970-01-01T01:34:38.000001+00:00" +- "&completedMax=1970-01-01T00:20:34.000001+00:00" +- "&dueMin=1970-01-01T00:39:05.000001+00:00" +- "&dueMax=1970-01-01T00:57:36.000001+00:00" ++ "&updatedMin=1970-01-01T01:53:09Z" ++ "&completedMin=1970-01-01T01:34:38Z" ++ "&completedMax=1970-01-01T00:20:34Z" ++ "&dueMin=1970-01-01T00:39:05Z" ++ "&dueMax=1970-01-01T00:57:36Z" + "&showCompleted=true" + "&showDeleted=true" + "&showHidden=true"); +@@ -148,11 +148,11 @@ test_query_uri (void) + g_assert_cmpstr (query_uri, ==, + "http://example.com" + "?maxResults=10" +- "&updatedMin=1970-01-01T01:53:09.000001+00:00" +- "&completedMin=1970-01-01T01:34:38.000001+00:00" +- "&completedMax=1970-01-01T00:20:34.000001+00:00" +- "&dueMin=1970-01-01T00:39:05.000001+00:00" +- "&dueMax=1970-01-01T00:57:36.000001+00:00" ++ "&updatedMin=1970-01-01T01:53:09Z" ++ "&completedMin=1970-01-01T01:34:38Z" ++ "&completedMax=1970-01-01T00:20:34Z" ++ "&dueMin=1970-01-01T00:39:05Z" ++ "&dueMax=1970-01-01T00:57:36Z" + "&showCompleted=false" + "&showDeleted=false" + "&showHidden=false"); +@@ -317,8 +317,8 @@ test_task_properties (void) + "\"title\": \"some-other-title\"," + "\"notes\": \"more-notes\"," + "\"status\": \"completed\"," +- "\"due\": \"2014-08-30T17:20:00.000001+00:00\"," +- "\"completed\": \"2014-08-30T17:20:00.000001+00:00\"," ++ "\"due\": \"2014-08-30T17:20:00Z\"," ++ "\"completed\": \"2014-08-30T17:20:00Z\"," + "\"deleted\": true," + "\"hidden\": false" + "}"); +@@ -332,8 +332,8 @@ test_task_properties (void) + "\"title\": \"some-other-title\"," + "\"notes\": \"more-notes\"," + "\"status\": \"completed\"," +- "\"due\": \"2014-08-30T17:20:00.000001+00:00\"," +- "\"completed\": \"2014-08-30T17:20:00.000001+00:00\"," ++ "\"due\": \"2014-08-30T17:20:00Z\"," ++ "\"completed\": \"2014-08-30T17:20:00Z\"," + "\"deleted\": false," + "\"hidden\": false" + "}"); +@@ -496,14 +496,14 @@ test_task_parser_normal (void) + "\"id\": \"some-id\"," + "\"etag\": \"some-etag\"," + "\"title\": \"some-title \\\"with quotes\\\"\"," +- "\"updated\": \"2014-08-30T19:40:00.000001+00:00\"," ++ "\"updated\": \"2014-08-30T19:40:00Z\"," + "\"selfLink\": \"http://some-uri/\"," + "\"parent\": \"some-parent-id\"," + "\"position\": \"some-position\"," + "\"notes\": \"Some notes!\"," + "\"status\": \"needsAction\"," +- "\"due\": \"2014-08-30T20:00:00.000001+00:00\"," +- "\"completed\": \"2014-08-30T20:10:05.000001+00:00\"," ++ "\"due\": \"2014-08-30T20:00:00Z\"," ++ "\"completed\": \"2014-08-30T20:10:05Z\"," + "\"deleted\": false," + "\"hidden\": true," + /* Unhandled for the moment: */ +diff --git a/gdata/tests/youtube.c b/gdata/tests/youtube.c +index a1e070a..1195bc3 100644 +--- a/gdata/tests/youtube.c ++++ b/gdata/tests/youtube.c +@@ -967,8 +967,8 @@ test_parsing_yt_recorded (void) + "gd:etag='W/\"CEMFSX47eCp7ImA9WxVUGEw.\"'>" + "Judas Priest - Painkiller" + "tag:youtube.com,2008:video:JAagedeKdcQ" +- "2009-03-23T12:46:58.000001+00:00" +- "2006-05-16T14:06:37.000001+00:00" ++ "2009-03-23T12:46:58Z" ++ "2006-05-16T14:06:37Z" + "" + "" + "" +@@ -1055,8 +1055,8 @@ test_parsing_yt_access_control (void) + "gd:etag='W/\"CEMFSX47eCp7ImA9WxVUGEw.\"'>" + "Judas Priest - Painkiller" + "tag:youtube.com,2008:video:JAagedeKdcQ" +- "2009-03-23T12:46:58.000001+00:00" +- "2006-05-16T14:06:37.000001+00:00" ++ "2009-03-23T12:46:58Z" ++ "2006-05-16T14:06:37Z" + "" + "" + "" +@@ -1255,8 +1255,8 @@ test_parsing_georss_where (void) + "xmlns:gml='http://www.opengis.net/gml'>" + "Some video somewhere" + "tag:youtube.com,2008:video:JAagedeKdcQ" +- "2009-03-23T12:46:58.000001+00:00" +- "2006-05-16T14:06:37.000001+00:00" ++ "2009-03-23T12:46:58Z" ++ "2006-05-16T14:06:37Z" + "" + "" + "" +@@ -1295,8 +1295,8 @@ test_parsing_georss_where (void) + "xmlns:gml='http://www.opengis.net/gml'>" + "Some video somewhere" + "tag:youtube.com,2008:video:JAagedeKdcQ" +- "2009-03-23T12:46:58.000001+00:00" +- "2006-05-16T14:06:37.000001+00:00" ++ "2009-03-23T12:46:58Z" ++ "2006-05-16T14:06:37Z" + "" + "" + "" +-- +1.9.3 diff --git a/gnu/packages/patches/libgdata-glib-duplicate-tests.patch b/gnu/packages/patches/libgdata-glib-duplicate-tests.patch new file mode 100644 index 0000000000..d5d8d064de --- /dev/null +++ b/gnu/packages/patches/libgdata-glib-duplicate-tests.patch @@ -0,0 +1,16 @@ +diff -ur a/gdata/tests/oauth1-authorizer.c b/gdata/tests/oauth1-authorizer.c +--- a/gdata/tests/oauth1-authorizer.c 1969-12-31 19:00:00.000000000 -0500 ++++ b/gdata/tests/oauth1-authorizer.c 2017-05-27 19:35:30.551725678 -0400 +@@ -1045,10 +1045,10 @@ + /* Sync request-authentication-uri tests */ + g_test_add ("/oauth1-authorizer/request-authentication-uri/sync", OAuth1AuthorizerData, NULL, set_up_oauth1_authorizer_data, + test_oauth1_authorizer_request_authentication_uri_sync, tear_down_oauth1_authorizer_data); +- g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains", OAuth1AuthorizerData, NULL, ++ g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains1", OAuth1AuthorizerData, NULL, + set_up_oauth1_authorizer_data_multiple_domains, test_oauth1_authorizer_request_authentication_uri_sync, + tear_down_oauth1_authorizer_data); +- g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains", OAuth1AuthorizerData, NULL, ++ g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains2", OAuth1AuthorizerData, NULL, + set_up_oauth1_authorizer_data_locale, test_oauth1_authorizer_request_authentication_uri_sync, + tear_down_oauth1_authorizer_data); + g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/cancellation", OAuth1AuthorizerData, NULL, From dfb0323db04438d6dceebcb0f7280aceab70049b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 27 May 2017 20:28:51 -0400 Subject: [PATCH 68/81] gnu: shotwell: Update to 0.26.1. * gnu/packages/gnome.scm (shotwell): Update to 0.26.1. [inputs]: Add libgdata. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6ffa10b252..9cabfaef12 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4053,7 +4053,7 @@ (define-public gexiv2 (define-public shotwell (package (name "shotwell") - (version "0.25.5") + (version "0.26.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4061,7 +4061,7 @@ (define-public shotwell name "-" version ".tar.xz")) (sha256 (base32 - "10pv3v789hky8h7ladqzzmgvkmgy3c41n4xz0nnyjmpycwl26g29")))) + "0xak1f69lp1yx3p8jgmr9c0z3jypi8zjpy3kiknn5n9g2f5cqq0a")))) (build-system glib-or-gtk-build-system) (propagated-inputs `(("dconf" ,dconf))) @@ -4076,6 +4076,7 @@ (define-public shotwell `(("glib:bin" ,glib "bin") ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) + ("libgdata" ,libgdata) ("libgee" ,libgee) ("gexiv2" ,gexiv2) ("libraw" ,libraw) From 1ed398d192a28c49f4fc8dec3b3a15f2529104a4 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 31 May 2017 12:25:06 -0400 Subject: [PATCH 69/81] gnu: gnumeric: Update to 1.12.34. * gnu/packages/gnome.scm (gnumeric): Update to 1.12.34. [native-inputs]: Add docbook-xml and itstool. --- gnu/packages/gnome.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9cabfaef12..59ce2587ee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1733,7 +1733,7 @@ (define-public goffice-0.8 (define-public gnumeric (package (name "gnumeric") - (version "1.12.32") + (version "1.12.34") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1741,7 +1741,7 @@ (define-public gnumeric name "-" version ".tar.xz")) (sha256 (base32 - "1s3dxvdwzmppsp2dfg90rccilf4hknhwjdy7lazr9sys58zchyx0")))) + "09f7h4lvwzyl0amd3axapwbsrnrvvpwxyhs540jlrv425n0j0j8b")))) (build-system glib-or-gtk-build-system) (arguments `(;; The gnumeric developers don't worry much about failing tests. @@ -1774,7 +1774,9 @@ (define-public gnumeric ("zlib" ,zlib))) (native-inputs `(("bison" ,bison) + ("docbook-xml" ,docbook-xml) ("intltool" ,intltool) + ("itstool" ,itstool) ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (home-page "http://www.gnumeric.org") From a281accec5922672c3061f234668444ee01fcbf0 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 20:58:18 -0500 Subject: [PATCH 70/81] gnu: ruby-json: Update to 2.1.0. * gnu/packages/ruby.scm (ruby-json): Update to 2.1.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1df7d60a36..d376a7f381 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2436,14 +2436,14 @@ (define-public ruby-utils (define-public ruby-json (package (name "ruby-json") - (version "1.8.3") + (version "2.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "json" version)) (sha256 (base32 - "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc")))) + "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; dependency cycle with sdoc (synopsis "JSON library for Ruby") From b4092cb801e4d4c76cbfc8fbafeba10728ec4f6c Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 21:08:08 -0500 Subject: [PATCH 71/81] gnu: ruby-minitest: Update to 5.10.2. * gnu/packages/ruby.scm (ruby-minitest): Update to 5.10.2. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d376a7f381..d5fdd5b4fd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1480,13 +1480,13 @@ (define-public ruby-net-ssh (define-public ruby-minitest (package (name "ruby-minitest") - (version "5.10.1") + (version "5.10.2") (source (origin (method url-fetch) (uri (rubygems-uri "minitest" version)) (sha256 (base32 - "1yk2m8sp0p5m1niawa3ncg157a4i0594cg7z91rzjxv963rzrwab")))) + "11my86fnihvpndyknn3c14hc82nhsgggnhlxh8h3bdjpmfsvl0my")))) (build-system ruby-build-system) (native-inputs `(("ruby-hoe" ,ruby-hoe))) From 9a7017ebd5dd5693111a57f72c64f9c38ac7514e Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 21:37:50 -0500 Subject: [PATCH 72/81] gnu: ruby-minitest-4: Exclude failing tests. gnu/packages/ruby.scm (ruby-minitest-4): Exclude failing tests. --- gnu/packages/ruby.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d5fdd5b4fd..a8f21798af 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1513,7 +1513,13 @@ (define-public ruby-minitest-4 (lambda _ (substitute* "Rakefile" (("self\\.rubyforge_name = .*") "")) - #t))))))) + #t)) + (add-after 'build 'exclude-failing-tests + (lambda _ + ;; Some tests are failing on Ruby 2.4 due to the deprecation of + ;; Fixnum. + (delete-file "test/minitest/test_minitest_spec.rb") + #t))))))) (define-public ruby-minitest-sprint (package From fb4074897b403549b603c52881fdf7c9535348ad Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 21:46:45 -0500 Subject: [PATCH 73/81] gnu: bundler: Update to 1.15.1. * gnu/packages/ruby.scm (bundler): Update to 1.15.1. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a8f21798af..cc996bd865 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -446,13 +446,13 @@ (define-public ruby-rspec-2 (define-public bundler (package (name "bundler") - (version "1.14.6") + (version "1.15.1") (source (origin (method url-fetch) (uri (rubygems-uri "bundler" version)) (sha256 (base32 - "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl")))) + "1mq0n8g08vf2rnd7fvylx3f4sspx15abid49gycf9zzsjj7w8vps")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; avoid dependency cycles From fc29d5e61b5d00004ecb8c53a2a19f64f7f129f2 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 21:56:05 -0500 Subject: [PATCH 74/81] gnu: ruby-sdoc: Relax dependency requirement versions. * gnu/packages/ruby.scm (ruby-sdoc)[arguments]: Relax dependency requirement versions. --- gnu/packages/ruby.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cc996bd865..8acd05075c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2229,9 +2229,15 @@ (define-public ruby-sdoc (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'set-rubylib + (add-before 'check 'set-rubylib-and-patch-gemfile (lambda _ (setenv "RUBYLIB" "lib") + (substitute* "sdoc.gemspec" + (("s.add_runtime_dependency.*") "\n") + (("s.add_dependency.*") "\n")) + (substitute* "Gemfile" + (("gem \"rake\".*") + "gem 'rake'\ngem 'rdoc'\ngem 'json'\n")) #t))))) (propagated-inputs `(("ruby-json" ,ruby-json))) From 3fd577e3c51577403f5e8b7d77286f9ab72581ab Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 22:06:39 -0500 Subject: [PATCH 75/81] gnu: ruby-gem-hadar: Update to 1.9.1. * gnu/packages/ruby.scm (ruby-gem-hadar): Update to 1.9.1. [propagated-inputs]: Remove ruby-sdoc, add ruby-yard. [native-inputs]: Remove bundler. --- gnu/packages/ruby.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8acd05075c..60682bcbd7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2285,13 +2285,13 @@ (define-public ruby-tins (define-public ruby-gem-hadar (package (name "ruby-gem-hadar") - (version "1.3.1") + (version "1.9.1") (source (origin (method url-fetch) (uri (rubygems-uri "gem_hadar" version)) (sha256 (base32 - "1j8qri4m9wf8nbfv0kakrgsv2x8vg10914xgm6f69nw8zi3i39ws")))) + "1zxvd9l95rbks7x3cxn396w0sn7nha5542bf97v8akkn4vm7nby9")))) (build-system ruby-build-system) ;; This gem needs itself at development time. We disable rebuilding of the ;; gemspec to avoid this loop. @@ -2305,9 +2305,7 @@ (define-public ruby-gem-hadar (propagated-inputs `(("git" ,git) ("ruby-tins" ,ruby-tins) - ("ruby-sdoc" ,ruby-sdoc))) - (native-inputs - `(("bundler" ,bundler))) + ("ruby-yard" ,ruby-yard))) (synopsis "Library for the development of Ruby gems") (description "This library contains some useful functionality to support the From 5b884348cc877216f458c0b99371347e0a853799 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 22:23:15 -0500 Subject: [PATCH 76/81] gnu: ruby-test-unit: Update to 3.2.4. * gnu/packages/ruby.scm (ruby-test-unit): Update to 3.2.4. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 60682bcbd7..d3196bff2f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1198,13 +1198,13 @@ (define-public ruby-packnga (define-public ruby-test-unit (package (name "ruby-test-unit") - (version "3.1.5") + (version "3.2.4") (source (origin (method url-fetch) (uri (rubygems-uri "test-unit" version)) (sha256 (base32 - "0jxznjzwmrlp8wqjxsd06qbiddffn68pdhz6nrqpjbiln1z3af4w")))) + "09mb34lnffracsqxl4dav4c21p5nr4pj9hm5qy2s83k5hbjya3s7")))) (build-system ruby-build-system) (propagated-inputs `(("ruby-power-assert" ,ruby-power-assert))) From 39d4d6f6751bebae3daaeb53785660ea6826fb0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:09:45 +0200 Subject: [PATCH 77/81] gnu: ruby-ox: Update to 2.5.0. * gnu/packages/ruby.scm (ruby-ox): Update to 2.5.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d3196bff2f..27b5c56740 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2706,14 +2706,14 @@ (define-public ruby-sanitize (define-public ruby-ox (package (name "ruby-ox") - (version "2.2.1") + (version "2.5.0") (source (origin (method url-fetch) (uri (rubygems-uri "ox" version)) (sha256 (base32 - "00i11xd4ayh7349rhgskajfxn0qzkb74ab01217zix9qcapssxax")))) + "0rar0xr5qn3zac1r2z18kmpapx121c2l3z8jsgh60vsddwzpdh7h")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; no tests From 71153ef12cac59385f7bfb60970be45425c9e5b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:17:20 +0200 Subject: [PATCH 78/81] gnu: ruby-pg: Update to 0.20.0. * gnu/packages/ruby.scm (ruby-pg): Update to 0.20.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 27b5c56740..45f918ffac 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2768,14 +2768,14 @@ (define-public ruby-redcloth (define-public ruby-pg (package (name "ruby-pg") - (version "0.18.2") + (version "0.20.0") (source (origin (method url-fetch) (uri (rubygems-uri "pg" version)) (sha256 (base32 - "1axxbf6ij1iqi3i1r3asvjc80b0py5bz0m2wy5kdi5xkrpr82kpf")))) + "03xcgwjs6faxis81jxf2plnlalg55dhhafqv3kvjxfr8ic7plpw5")))) (build-system ruby-build-system) (arguments '(#:test-target "spec")) From a7938625920b65f425d01a46dc28ecc7b1af8a09 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:25:23 +0200 Subject: [PATCH 79/81] gnu: ruby-net-ssh: Update to 4.1.0. * gnu/packages/ruby.scm (ruby-net-ssh): Update to 4.1.0. [native-inputs]: Add BUNDLER. --- gnu/packages/ruby.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 45f918ffac..c91be6f6cb 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1459,16 +1459,17 @@ (define-public ruby-mocha (define-public ruby-net-ssh (package (name "ruby-net-ssh") - (version "3.0.1") + (version "4.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "net-ssh" version)) (sha256 (base32 - "1dzqkgwi9xm6mbfk1rkk17rzmz8m5xakqi21w1b97ybng6kkw0hf")))) + "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q")))) (build-system ruby-build-system) (native-inputs - `(("ruby-mocha" ,ruby-mocha) + `(("bundler" ,bundler) + ("ruby-mocha" ,ruby-mocha) ("ruby-test-unit" ,ruby-test-unit))) (synopsis "Ruby implementation of the SSH2 client protocol") (description "@code{Net::SSH} is a pure-Ruby implementation of the SSH2 From 0899352f970b321c22ff971bb674cb4a131587c9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:46:10 +0200 Subject: [PATCH 80/81] gnu: ruby-ansi: Fix build failure with ruby@2.4.0. * gnu/packages/ruby.scm (ruby-ansi)[arguments]<#:phases>: Add 'replace-broken-symlink'. --- gnu/packages/ruby.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c91be6f6cb..868188119c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -3586,7 +3587,19 @@ (define-public ruby-ansi ;; be require'd. (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "-r" "ansi"))))))) + (zero? (system* "ruby" "-Ilib" "-r" "ansi")))) + (add-before 'validate-runpath 'replace-broken-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (file (string-append out "/lib/ruby/gems/" + ,(package-version ruby) + "/gems/ansi-" ,version + "/lib/ansi.yml"))) + ;; XXX: This symlink is broken since ruby 2.4. + ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html + (delete-file file) + (symlink "../.index" file) + #t)))))) (synopsis "ANSI escape code related libraries") (description "This package is a collection of ANSI escape code related libraries From de6f6efd737e941aa7d6f77032525ea757b2909d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:54:40 +0200 Subject: [PATCH 81/81] gnu: ruby-ae: Fix build failure with ruby@2.4.0. * gnu/packages/ruby.scm (ruby-ae)[arguments]<#:phases>: Add 'replace-broken-symlink'. --- gnu/packages/ruby.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 868188119c..6691095e55 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3788,7 +3788,19 @@ (define-public ruby-ae `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "qed"))))))) + (lambda _ (zero? (system* "qed")))) + (add-before 'validate-runpath 'replace-broken-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (file (string-append out "/lib/ruby/gems/" + ,(package-version ruby) + "/gems/ae-" ,version + "/lib/ae.yml"))) + ;; XXX: This symlink is broken since ruby 2.4. + ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html + (delete-file file) + (symlink "../.index" file) + #t)))))) (propagated-inputs `(("ruby-ansi" ,ruby-ansi))) (native-inputs