From f85ca6eda044c43bd5b9b54e756c02fd90c372f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 14:21:22 +0100 Subject: gnu: Remove WebKitGTK@2.20. * gnu/packages/gnome.scm (eolie, epiphany)[native-inputs]: Remove GCC-7. [inputs]: Change WEBKITGTK-2.22 to WEBKITGTK. [arguments]: Adjust accordingly. * gnu/packages/web-browsers.scm (next-gtk-webkit): Likewise. * gnu/packages/webkit.scm (webkitgtk): Update to 2.22.6. (webkitgtk-2.22): Remove variable. --- gnu/packages/gnome.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3a09ae373c..3a34356beb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4130,7 +4130,6 @@ (define-public eolie ;; These libraries must be on LD_LIBRARY_PATH. (libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret" "atk" "gtk+" "gsettings-desktop-schemas" - "gcc:lib" ; needed b/c webkitgtk is built with gcc-7 "gobject-introspection")) (path (string-join (map (lambda (lib) @@ -4143,8 +4142,7 @@ (define-public eolie `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) #t))))) (native-inputs - `(("gcc:lib" ,gcc-7 "lib") ; needed because webkitgtk is built with gcc-7 - ("intltool" ,intltool) + `(("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) ("python" ,python) @@ -4165,7 +4163,7 @@ (define-public eolie ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") (description @@ -4203,7 +4201,6 @@ (define-public epiphany `(("dconf" ,dconf))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database - ("gcc" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7 ("glib:bin" ,glib "bin") ; for glib-mkenums ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) @@ -4224,7 +4221,7 @@ (define-public epiphany ("libxslt" ,libxslt) ("nettle" ,nettle) ; for hogweed ("sqlite" ,sqlite) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description -- cgit v1.2.3 From c69959f0545e5383a8caab53944c86abc5dfeeed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 17:24:24 +0200 Subject: gnu: Replace uses of 'cmake' with 'cmake-minimal'. This follows up commit 2f33a7321e5e37d37f57c229c8079cb4ffd10834 which introduced a new CMAKE-MINIMAL variant for use in package inputs. * gnu/packages/databases.scm (python-pyarrow)[native-inputs]: Replace CMAKE with CMAKE-MINIMAL. * gnu/packages/emacs-xyz.scm (emacs-scel)[native-inputs]: Likewise. * gnu/packages/firmware.scm (ath9k-htc-firmware)[native-inputs]: Likewise. * gnu/packages/games.scm (0ad, the-butterfly-effect)[native-inputs]: Likewise. * gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise. * gnu/packages/ibus.scm (ibus-rime)[native-inputs]: Likewise. * gnu/packages/rust.scm (rust-1.19)[native-inputs]: Likewise. * gnu/packages/simulation.scm (fenics)[native-inputs]: Likewise. * gnu/packages/squirrel.scm (squirrel)[native-inputs]: Likewise. * gnu/packages/video.scm (handbrake)[native-inputs]: Likewise. * gnu/packages/virtualization.scm (xen)[native-inputs]: Likewise. * gnu/packages/vulkan.scm (shaderc)[native-inputs]: Likewise. --- gnu/packages/databases.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/firmware.scm | 2 +- gnu/packages/games.scm | 4 ++-- gnu/packages/gnome.scm | 2 +- gnu/packages/ibus.scm | 2 +- gnu/packages/rust.scm | 2 +- gnu/packages/simulation.scm | 2 +- gnu/packages/squirrel.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/virtualization.scm | 2 +- gnu/packages/vulkan.scm | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c38f6d2db7..f4966276a0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3052,7 +3052,7 @@ (define-public python-pyarrow ("python-pandas" ,python-pandas) ("python-six" ,python-six))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-cython" ,python-cython) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9bf101ab31..176aa90eab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3470,7 +3470,7 @@ (define-public emacs-scel (inputs `(("supercollider" ,supercollider))) (native-inputs - `(("cmake" ,cmake))) + `(("cmake" ,cmake-minimal))) (home-page "https://github.com/supercollider/scel") (synopsis "SuperCollider Emacs interface") (description "@code{emacs-scel} is an Emacs interface to SuperCollider. diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 90cb8845cf..8f0b6cb15e 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -84,7 +84,7 @@ (define-public ath9k-htc-firmware ;; Use our own tool chain for that. (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-elf")) ("cross-binutils" ,(cross-binutils "xtensa-elf")) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("perl" ,perl))) (home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc") (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b177c0b2f0..8e8c6c8058 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4779,7 +4779,7 @@ (define-public 0ad ("zlib" ,zlib))) (native-inputs `(("boost" ,boost) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("mesa" ,mesa) ("pkg-config" ,pkg-config) ("python-2" ,python-2))) @@ -5272,7 +5272,7 @@ (define-public the-butterfly-effect `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) ("qttools" ,qttools))) (synopsis "Realistic physics puzzle game") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c455b2838..ab2bd4e3e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -299,7 +299,7 @@ (define-public deja-dup ("gettext" ,gettext-minimal) ("itstool" ,itstool) ("intltool" ,intltool) - ("cmake" ,cmake))) + ("cmake" ,cmake-minimal))) (home-page "https://launchpad.net/deja-dup") (synopsis "Simple backup tool, for regular encrypted backups") (description diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f652cca1c2..eab35dbadd 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -677,7 +677,7 @@ (define-public ibus-rime ("librime" ,librime) ("rime-data" ,rime-data))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("pkg-config" ,pkg-config))) (home-page "https://rime.im/") (synopsis "Rime Input Method Engine for IBus") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 43725c64ce..f90bc52506 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -387,7 +387,7 @@ (define rust-1.19 (build-system gnu-build-system) (native-inputs `(("bison" ,bison) ; For the tests - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("flex" ,flex) ; For the tests ("gdb" ,gdb) ; For the tests ("procps" ,procps) ; For the tests diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index a8d214794e..edc8d6e190 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -620,7 +620,7 @@ (define-public fenics ("python-matplotlib" ,python-matplotlib) ,@(alist-delete "python" (package-inputs fenics-dolfin)))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("ply" ,python-ply) ("pytest" ,python-pytest) ("python-decorator" ,python-decorator) diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm index 2c3ed6e570..1b9489882f 100644 --- a/gnu/packages/squirrel.scm +++ b/gnu/packages/squirrel.scm @@ -71,7 +71,7 @@ (define-public squirrel (find-files "../squirrel3/include"))) #t))))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-sphinx" ,python-sphinx))) (home-page "https://squirrel-lang.org/") (synopsis "High level imperative, object-oriented programming language") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc6d2fb9b4..9859c55f98 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2604,7 +2604,7 @@ (define-public handbrake (native-inputs `(("automake" ,automake) ;gui subpackage must be bootstrapped ("autoconf" ,autoconf) - ("cmake" ,cmake) ;TODO: could probably strip check from make/configure.py + ("cmake" ,cmake-minimal) ;TODO: could probably strip check from make/configure.py ("curl" ,curl) ;not actually used, but tested for ("intltool" ,intltool) ("libtool" ,libtool) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 87839490b2..303171e61d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1291,7 +1291,7 @@ (define (filter-environment! filter-predicate (native-inputs `(("dev86" ,dev86) ("bison" ,bison) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("figlet" ,figlet) ("flex" ,flex) ("gettext" ,gettext-minimal) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6b151f0a31..6ae9ba9b87 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -326,7 +326,7 @@ (define-public shaderc `(("googletest" ,googletest) ("python" ,python))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("glslang-source" ,(package-source glslang)) ("pkg-config" ,pkg-config) ("spirv-headers-source" ,(package-source spirv-headers)) -- cgit v1.2.3 From 3387ee41ac1469200db3cf7f914285905024e871 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:06:54 +0100 Subject: gnu: gnome-desktop: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-desktop): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab2bd4e3e9..32f70b1394 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -468,7 +468,7 @@ (define-public gnome-common (define-public gnome-desktop (package (name "gnome-desktop") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) @@ -477,7 +477,7 @@ (define-public gnome-desktop name "-" version ".tar.xz")) (sha256 (base32 - "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30")))) + "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 0dd65d5a0ab462ef49653e8ccdecf9ed795f1f1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:07:14 +0100 Subject: gnu: gnome-disk-utility: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-disk-utility): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 32f70b1394..44b81e67c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -556,7 +556,7 @@ (define-public gnome-doc-utils (define-public gnome-disk-utility (package (name "gnome-disk-utility") - (version "3.28.3") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -564,7 +564,7 @@ (define-public gnome-disk-utility name "-" version ".tar.xz")) (sha256 (base32 - "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m")))) + "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") -- cgit v1.2.3 From 2dfc16d14ae5c702f989ebb4fa7dc14d84e9946e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:07:32 +0100 Subject: gnu: evince: Update to 3.30.2. * gnu/packages/gnome.scm (evince): Update to 3.30.2. [inputs]: Add gspell. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 44b81e67c3..3374229a8c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -755,7 +755,7 @@ (define-public gnome-keyring (define-public evince (package (name "evince") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -763,7 +763,7 @@ (define-public evince name "-" version ".tar.xz")) (sha256 (base32 - "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89")))) + "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus") @@ -788,6 +788,7 @@ (define-public evince ;; ("libkpathsea" ,texlive-bin) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gspell" ,gspell) ("libgnome-keyring" ,libgnome-keyring) ("adwaita-icon-theme" ,adwaita-icon-theme) ("gdk-pixbuf" ,gdk-pixbuf) -- cgit v1.2.3 From 10ff872f77ff01cee56e07e0364d49047c629beb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:07:48 +0100 Subject: gnu: gsettings-desktop-schemas: Update to 3.28.1. * gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to 3.28.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3374229a8c..9cf1a0a7ff 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -829,7 +829,7 @@ (define-public evince (define-public gsettings-desktop-schemas (package (name "gsettings-desktop-schemas") - (version "3.28.0") + (version "3.28.1") (source (origin (method url-fetch) @@ -838,7 +838,7 @@ (define-public gsettings-desktop-schemas name "-" version ".tar.xz")) (sha256 (base32 - "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c")))) + "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq")))) (build-system gnu-build-system) (inputs `(("glib" ,glib))) -- cgit v1.2.3 From 412e53024aa43e49b7545b09312d75d132fce7cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:07 +0100 Subject: gnu: adwaita-icon-theme: Update to 3.30.1. * gnu/packages/gnome.scm (adwaita-icon-theme): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9cf1a0a7ff..8b94c30526 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -927,7 +927,7 @@ (define-public gnome-icon-theme (define-public adwaita-icon-theme (package (inherit gnome-icon-theme) (name "adwaita-icon-theme") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -935,7 +935,7 @@ (define-public adwaita-icon-theme name "-" version ".tar.xz")) (sha256 (base32 - "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks")))) + "1kp1lis3dr16jmlgycz1b29jsr6ir8wmqj6laqwlhs663cmjlxbd")))) (native-inputs `(("gtk-encode-symbolic-svg" ,gtk+ "bin"))))) -- cgit v1.2.3 From d19db454feb717e0f822a6d5c1faf88af3f427e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:24 +0100 Subject: gnu: libgnomeprint: Update to 2.18.8. * gnu/packages/gnome.scm (libgnomeprint): Update to 2.18.8. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8b94c30526..9b58150a9d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1902,7 +1902,7 @@ (define-public libgnomeprint ;; . (package (name "libgnomeprint") - (version "2.8.2") + (version "2.18.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1910,7 +1910,7 @@ (define-public libgnomeprint name "-" version ".tar.bz2")) (sha256 (base32 - "129ka3nn8gx9dlfry17ib79azxk45wzfv5rgqzw6dwx2b5ns8phm")))) + "14cnimvlc7ky22g2snyf4362412k3jk1syjf8b9887q5a63fqd0h")))) (build-system gnu-build-system) (inputs `(("popt" ,popt) -- cgit v1.2.3 From 36053d7f1d601f77e7dcb614a4d0301f74743294 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:40 +0100 Subject: gnu: libgnomeprintui: Update to 2.18.6. * gnu/packages/gnome.scm (libgnomeprintui): Update to 2.18.6. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9b58150a9d..255867be59 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1933,7 +1933,7 @@ (define-public libgnomeprintui ;; Deprecated; see libgnomeprint. (package (name "libgnomeprintui") - (version "2.8.2") + (version "2.18.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1941,7 +1941,7 @@ (define-public libgnomeprintui name "-" version ".tar.bz2")) (sha256 (base32 - "1ivipk7r61rg90p9kp889j28xlyyj6466ypvwa4jvnrcllnaajsw")))) + "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm")))) (build-system gnu-build-system) ;; Mentioned as Required in the .pc file (propagated-inputs `(("libgnomeprint" ,libgnomeprint))) -- cgit v1.2.3 From 6cc6e3e514823dae0daad8310356f219701be5b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:58 +0100 Subject: gnu: libwnck: Update to 3.30.0. * gnu/packages/gnome.scm (libwnck): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 255867be59..5063b4fe4f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2006,7 +2006,7 @@ (define-public libbonoboui (define-public libwnck (package (name "libwnck") - (version "3.24.1") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2014,7 +2014,7 @@ (define-public libwnck name "-" version ".tar.xz")) (sha256 (base32 - "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg")))) + "0f9lvhm3w25046dqq8xyg7nzggxpmdriwrb661nng05a8qk0svdc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 0db6bafb3d4a68c59c84da344be93a70d602540c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:09:43 +0100 Subject: gnu: seahorse: Update to 3.30. * gnu/packages/gnome.scm (seahorse): Update to 3.30. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5063b4fe4f..4a82dfe488 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2214,7 +2214,7 @@ (define-public gnome-themes-standard (define-public seahorse (package (name "seahorse") - (version "3.20.0") + (version "3.30") (source (origin (method url-fetch) @@ -2223,7 +2223,7 @@ (define-public seahorse version ".tar.xz")) (sha256 (base32 - "1py6fj19kb8aaxvg6yrpd0876azc2zjvis98aqz37a2lxmhp9c72")))) + "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp")))) (build-system glib-or-gtk-build-system) (inputs `(("gtk+" ,gtk+) -- cgit v1.2.3 From 91185fe8f3d164ccf93ceb7cd41c4a760d8c75f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:10:00 +0100 Subject: gnu: vala: Update to 0.42.3. * gnu/packages/gnome.scm (vala): Update to 0.42.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a82dfe488..e9e3180b51 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2250,7 +2250,7 @@ (define-public seahorse (define-public vala (package (name "vala") - (version "0.40.9") + (version "0.42.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2258,7 +2258,7 @@ (define-public vala name "-" version ".tar.xz")) (sha256 (base32 - "0yvaijkpahzz26sa37cyzbj75a9vbcbgvxbqzzb7hbcvfy009zy7")))) + "0zaq9009wqk5aah131m426a2ia0scwpjpl4npf8p7p43wv8kvisz")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 5f36c5eb12c321dda992691638169192133e1ae6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:10:16 +0100 Subject: gnu: vte: Update to 0.54.2. * gnu/packages/gnome.scm (vte): Update to 0.54.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e9e3180b51..7da3143be6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2297,7 +2297,7 @@ (define-public vala (define-public vte (package (name "vte") - (version "0.52.2") + (version "0.54.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2305,7 +2305,7 @@ (define-public vte name "-" version ".tar.xz")) (sha256 (base32 - "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg")))) + "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From fd0557f84c03ccfdcab4ba2f6342c87b2bd53264 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:11:20 +0100 Subject: gnu: five-or-more: Update to 3.30.0. * gnu/packages/gnome.scm (five-or-more): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7da3143be6..7ecc468088 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2838,7 +2838,7 @@ (define-public libsecret (define-public five-or-more (package (name "five-or-more") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -2847,7 +2847,7 @@ (define-public five-or-more name "-" version ".tar.xz")) (sha256 (base32 - "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c")))) + "00d729p251kh96624i7qg2370r5mxwafs016i6hy01vsr71jzb9x")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From f7a584f4e37af3916ff818ea3b04230fa607eeb1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:11:40 +0100 Subject: gnu: gnome-mines: Update to 3.30.1.1. * gnu/packages/gnome.scm (gnome-mines): Update to 3.30.1.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7ecc468088..a312fce0fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2869,7 +2869,7 @@ (define-public five-or-more (define-public gnome-mines (package (name "gnome-mines") - (version "3.28.0") + (version "3.30.1.1") (source (origin (method url-fetch) @@ -2878,7 +2878,7 @@ (define-public gnome-mines name "-" version ".tar.xz")) (sha256 (base32 - "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf")))) + "08ddk400sg1g3q26gnm5mgv81vdqyix0yl7pd47p50vkc1w6f33z")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From b3f95507dff75790546ec22bd1b0f5b293a0dcc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:11:57 +0100 Subject: gnu: gnome-sudoku: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-sudoku): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a312fce0fc..c71b24614a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2907,7 +2907,7 @@ (define-public gnome-mines (define-public gnome-sudoku (package (name "gnome-sudoku") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -2916,7 +2916,7 @@ (define-public gnome-sudoku name "-" version ".tar.xz")) (sha256 (base32 - "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav")))) + "1xy986s51jnrcqwan2hy4bjdg6797yr9s7gxx2z2q4j4gkx3qa1f")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 1d7cb36e8ebe04f347cb8b9e0e6ff0658d8e80df Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 19:06:58 +0100 Subject: gnu: gnome-terminal: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c71b24614a..9ae2d5fe97 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2942,7 +2942,7 @@ (define-public gnome-sudoku (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) @@ -2951,7 +2951,7 @@ (define-public gnome-terminal name "-" version ".tar.xz")) (sha256 (base32 - "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2")))) + "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 85fb3df35d7ef134c146d70eda695d97ffe157d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:21:26 +0100 Subject: gnu: gnome-system-monitor: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-system-monitor): Update to 3.30.0. [build-system]: Use meson-build-system. [arguments]: Add configure flags to build without systemd. [native-inputs]: Add gtk+:bin. --- gnu/packages/gnome.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ae2d5fe97..960a3a999c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7348,7 +7348,7 @@ (define-public bluefish (define-public gnome-system-monitor (package (name "gnome-system-monitor") - (version "3.28.2") + (version "3.30.0") (source (origin (method url-fetch) @@ -7357,10 +7357,14 @@ (define-public gnome-system-monitor name "-" version ".tar.xz")) (sha256 (base32 - "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb")))) - (build-system glib-or-gtk-build-system) + "0g0y565bjs6bdszrnxsz1f7hcm1x59i3mfvplysirh7nz3hpz888")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t + #:configure-flags '("-Dsystemd=false"))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums. + ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("intltool" ,intltool) ("itstool" ,itstool) ("libgtop" ,libgtop) -- cgit v1.2.3 From 2d475910fbcb33de9da4629264d12cb4854120ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:22:44 +0100 Subject: gnu: gnome-calculator: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-calculator): Update to 3.30.1. [build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add gtk+:bin and vala. --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 960a3a999c..c1ab5d85ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7179,7 +7179,7 @@ (define-public libunique (define-public gnome-calculator (package (name "gnome-calculator") - (version "3.28.2") + (version "3.30.1") (source (origin (method url-fetch) @@ -7188,12 +7188,15 @@ (define-public gnome-calculator name "-" version ".tar.xz")) (sha256 (base32 - "0izsrqc9fm2lh25jr3nzi94p5hh2d3cklxqczbq16by85wr1xm5s")))) - (build-system glib-or-gtk-build-system) + "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc")))) + (build-system meson-build-system) + (arguments '(#:glib-or-gtk? #t)) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. + ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) ("itstool" ,itstool) + ("vala" ,vala) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) -- cgit v1.2.3 From 8c6d7b61bf05ee3c4154d8fc4279a20f509d2740 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:24:44 +0100 Subject: gnu: network-manager-applet: Update to 1.8.18. * gnu/packages/gnome.scm (network-manager-applet): Update to 1.8.18. [inputs]: Add mobile-broadband-provider-info. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c1ab5d85ab..4a8c8049cf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5487,7 +5487,7 @@ (define-public mobile-broadband-provider-info (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.8.14") + (version "1.8.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5495,7 +5495,7 @@ (define-public network-manager-applet name "-" version ".tar.xz")) (sha256 (base32 - "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya")))) + "0y31g0lxr93370xi74hbpvcy9m81n5wdkdhq8xy2nqp0y4219p13")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--disable-migration") #:phases -- cgit v1.2.3 From b74ef0bae75525227de092c4844b920625095f65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:25:57 +0100 Subject: gnu: gdm: Update to 3.30.2. * gnu/packages/gnome.scm (gdm): Update to 3.30.2. [arguments]: Add --with-udevdir configure flag. [source]: Remove patch. * gnu/packages/patches/gdm-CVE-2018-14424.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 8 +- gnu/packages/patches/gdm-CVE-2018-14424.patch | 172 -------------------------- 3 files changed, 5 insertions(+), 176 deletions(-) delete mode 100644 gnu/packages/patches/gdm-CVE-2018-14424.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 42b34ab90e..12a64b23f9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -836,7 +836,6 @@ dist_patch_DATA = \ %D%/packages/patches/gd-CVE-2019-6978.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ - %D%/packages/patches/gdm-CVE-2018-14424.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a8c8049cf..787d9ab074 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5584,16 +5584,15 @@ (define-public libxml++-2 (define-public gdm (package (name "gdm") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "gdm-CVE-2018-14424.patch")) (sha256 (base32 - "0wdm1503x66n1crdlmzmincbd2hccpxsdgjsl5anx3yjpdzs0hb0")))) + "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags @@ -5609,6 +5608,9 @@ (define-public gdm ;; systemd-specific '/etc/locale.conf'. "--with-lang-file=/etc/environment" + ,(string-append "--with-udevdir=" + (assoc-ref %outputs "out") "/lib/udev") + "--localstatedir=/var" ,(string-append "--with-default-path=" (string-join '("/run/setuid-programs" diff --git a/gnu/packages/patches/gdm-CVE-2018-14424.patch b/gnu/packages/patches/gdm-CVE-2018-14424.patch deleted file mode 100644 index 88a71f4151..0000000000 --- a/gnu/packages/patches/gdm-CVE-2018-14424.patch +++ /dev/null @@ -1,172 +0,0 @@ -Fix CVE-2018-14424: - -https://gitlab.gnome.org/GNOME/gdm/issues/401 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14424 - -Patch copied from upstream source repository: - -https://gitlab.gnome.org/GNOME/gdm/commit/1ac1697b3b019f50729a6e992065959586e170da - -From 1ac1697b3b019f50729a6e992065959586e170da Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Thu, 19 Jul 2018 18:26:05 +0100 -Subject: [PATCH] display-store: Pass the display object rather than the id in - the removed signal - -By the time GdmDisplayStore emits the "display-removed" signal, the display -is no longer in the store and gdm_display_store_lookup will not work in -signal handlers. - -Change the "display-removed" parameter from the display id to the GdmDisplay -object, so that signal handers can perform any cleanup they need to do - -CVE-2018-14424 - -Closes: https://gitlab.gnome.org/GNOME/gdm/issues/401 ---- - daemon/gdm-display-store.c | 11 +++-------- - daemon/gdm-display-store.h | 2 +- - daemon/gdm-local-display-factory.c | 13 +++---------- - daemon/gdm-manager.c | 19 +++++++++---------- - daemon/gdm-manager.h | 3 ++- - 5 files changed, 18 insertions(+), 30 deletions(-) - -diff --git a/daemon/gdm-display-store.c b/daemon/gdm-display-store.c -index af76f519..fd24334e 100644 ---- a/daemon/gdm-display-store.c -+++ b/daemon/gdm-display-store.c -@@ -76,15 +76,10 @@ stored_display_new (GdmDisplayStore *store, - static void - stored_display_free (StoredDisplay *stored_display) - { -- char *id; -- -- gdm_display_get_id (stored_display->display, &id, NULL); -- - g_signal_emit (G_OBJECT (stored_display->store), - signals[DISPLAY_REMOVED], - 0, -- id); -- g_free (id); -+ stored_display->display); - - g_debug ("GdmDisplayStore: Unreffing display: %p", - stored_display->display); -@@ -281,9 +276,9 @@ gdm_display_store_class_init (GdmDisplayStoreClass *klass) - G_STRUCT_OFFSET (GdmDisplayStoreClass, display_removed), - NULL, - NULL, -- g_cclosure_marshal_VOID__STRING, -+ g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, -- 1, G_TYPE_STRING); -+ 1, G_TYPE_OBJECT); - - g_type_class_add_private (klass, sizeof (GdmDisplayStorePrivate)); - } -diff --git a/daemon/gdm-display-store.h b/daemon/gdm-display-store.h -index 28359933..0aff8ee2 100644 ---- a/daemon/gdm-display-store.h -+++ b/daemon/gdm-display-store.h -@@ -49,7 +49,7 @@ typedef struct - void (* display_added) (GdmDisplayStore *display_store, - const char *id); - void (* display_removed) (GdmDisplayStore *display_store, -- const char *id); -+ GdmDisplay *display); - } GdmDisplayStoreClass; - - typedef enum -diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c -index 5f1ae89e..39f3e30a 100644 ---- a/daemon/gdm-local-display-factory.c -+++ b/daemon/gdm-local-display-factory.c -@@ -805,18 +805,11 @@ on_display_added (GdmDisplayStore *display_store, - - static void - on_display_removed (GdmDisplayStore *display_store, -- const char *id, -+ GdmDisplay *display, - GdmLocalDisplayFactory *factory) - { -- GdmDisplay *display; -- -- display = gdm_display_store_lookup (display_store, id); -- -- if (display != NULL) { -- g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory); -- g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory); -- -- } -+ g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory); -+ g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory); - } - - static gboolean -diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c -index f17bd1a5..f6684a8b 100644 ---- a/daemon/gdm-manager.c -+++ b/daemon/gdm-manager.c -@@ -1541,19 +1541,18 @@ on_display_status_changed (GdmDisplay *display, - - static void - on_display_removed (GdmDisplayStore *display_store, -- const char *id, -+ GdmDisplay *display, - GdmManager *manager) - { -- GdmDisplay *display; -+ char *id; - -- display = gdm_display_store_lookup (display_store, id); -- if (display != NULL) { -- g_dbus_object_manager_server_unexport (manager->priv->object_manager, id); -+ gdm_display_get_id (display, &id, NULL); -+ g_dbus_object_manager_server_unexport (manager->priv->object_manager, id); -+ g_free (id); - -- g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager); -+ g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager); - -- g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, id); -- } -+ g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, display); - } - - static void -@@ -2535,9 +2534,9 @@ gdm_manager_class_init (GdmManagerClass *klass) - G_STRUCT_OFFSET (GdmManagerClass, display_removed), - NULL, - NULL, -- g_cclosure_marshal_VOID__STRING, -+ g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, -- 1, G_TYPE_STRING); -+ 1, G_TYPE_OBJECT); - - g_object_class_install_property (object_class, - PROP_XDMCP_ENABLED, -diff --git a/daemon/gdm-manager.h b/daemon/gdm-manager.h -index 41c68a7a..c8fb3f22 100644 ---- a/daemon/gdm-manager.h -+++ b/daemon/gdm-manager.h -@@ -24,6 +24,7 @@ - - #include - -+#include "gdm-display.h" - #include "gdm-manager-glue.h" - - G_BEGIN_DECLS -@@ -50,7 +51,7 @@ typedef struct - void (* display_added) (GdmManager *manager, - const char *id); - void (* display_removed) (GdmManager *manager, -- const char *id); -+ GdmDisplay *display); - } GdmManagerClass; - - typedef enum --- -2.17.1 - -- cgit v1.2.3 From 5120f24f0eec81d44754f0bcc645d3aa06d31e3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:30:02 +0100 Subject: gnu: gnome-keyring: Add missing input. * gnu/packages/gnome.scm (gnome-keyring)[native-inputs]: Add glib. [arguments]: Move "fix-docbook" phase after "unpack" phase. --- gnu/packages/gnome.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 787d9ab074..ff102d40ee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -705,25 +705,24 @@ (define-public gnome-keyring (substitute* "po/Makefile.in.in" (("/bin/sh") (which "sh"))) #t)) - (add-before - 'configure 'fix-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "docs/Makefile.am" - (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl"))) - (setenv "XML_CATALOG_FILES" - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")) - ;; Rerun the whole thing to avoid version mismatch ("This is - ;; Automake 1.15.1, but the definition used by this - ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't - ;; use 'autoreconf' because it insists on running 'libtoolize'. - (invoke "autoconf") - (invoke "aclocal") - (invoke "automake" "-ac")))))) + (add-after 'unpack 'fix-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "docs/Makefile.am" + (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) + (setenv "XML_CATALOG_FILES" + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml")) + ;; Rerun the whole thing to avoid version mismatch ("This is + ;; Automake 1.15.1, but the definition used by this + ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't + ;; use 'autoreconf' because it insists on running 'libtoolize'. + (invoke "autoconf") + (invoke "aclocal") + (invoke "automake" "-ac")))))) (inputs `(("libgcrypt" ,libgcrypt) ("linux-pam" ,linux-pam) @@ -733,6 +732,7 @@ (define-public gnome-keyring (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") + ("glib" ,glib) ; for m4 macros ("python" ,python-2) ;for tests ("intltool" ,intltool) ("autoconf" ,autoconf) -- cgit v1.2.3 From 2fbe8cdb435a450133432bac8e232f8caa0939a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:32:15 +0100 Subject: gnu: gnome-settings-daemon: Update to 3.30.1.2. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.30.1.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ff102d40ee..886ad6dc6f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3240,7 +3240,7 @@ (define-public libgweather (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.28.1") + (version "3.30.1.2") (source (origin (method url-fetch) @@ -3249,7 +3249,7 @@ (define-public gnome-settings-daemon name "-" version ".tar.xz")) (sha256 (base32 - "0z9dip9p0iav646cmxisii5sbkdr9hmaklc5fzvschpbjkhphksr")))) + "079dh609rvpwfyzg4m898q8km9g7x04hg18rwwb1izj1dr7zdp2w")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 02710a9b558db8c5e56ab34a41ac6e30a1681a3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 19:50:29 +0100 Subject: gnu: network-manager: Update to 1.14.4. * gnu/packages/gnome.scm (network-manager): Update to 1.14.4. [source]: Simplify snippet. [arguments]: Pass more configure flags to use elogind; add phase "patch-ls-invocation"; adjust tests. [inputs]: Add coreutils. --- gnu/packages/gnome.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 886ad6dc6f..725a256e8b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5290,7 +5290,7 @@ (define-public caribou (define-public network-manager (package (name "network-manager") - (version "1.10.10") + (version "1.14.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/NetworkManager/" @@ -5298,20 +5298,13 @@ (define-public network-manager "NetworkManager-" version ".tar.xz")) (sha256 (base32 - "1jn3g0f2x1irc88awqp8m3gnpdx1whqqqbdgkbgr4x55s702jki4")) + "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm")) + (modules '((guix build utils))) (snippet - '(begin - (use-modules (guix build utils)) - (substitute* "configure" - ;; Replace libsystemd-login with libelogind. - (("libsystemd-login") "libelogind")) - (substitute* "src/devices/wwan/nm-modem-manager.c" - (("systemd") "elogind")) - (substitute* "src/nm-session-monitor.c" - (("systemd") "elogind")) - (substitute* "./src/nm-logging.c" - (("systemd") "elogind")) - #t)))) + '(begin + (substitute* "src/devices/wwan/nm-modem-manager.c" + (("systemd") "elogind")) + #t)))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 8 MiB of gtk-doc HTML @@ -5321,7 +5314,10 @@ (define-public network-manager (doc (assoc-ref %outputs "doc")) (dhclient (string-append (assoc-ref %build-inputs "isc-dhcp") "/sbin/dhclient"))) - (list "--with-systemd-logind=yes" ;In Guix System, this is provided by elogind. + (list "--with-libnm-glib" ; needed by network-manager-applet + "--with-systemd-journal=no" + "--with-session-tracking=elogind" + "--with-suspend-resume=elogind" "--with-consolekit=no" "--with-crypto=gnutls" "--disable-config-plugin-ibft" @@ -5336,6 +5332,13 @@ (define-public network-manager (string-append "--with-dhclient=" dhclient))) #:phases (modify-phases %standard-phases + ;; This bare "ls" invocation breaks some tests. + (add-after 'unpack 'patch-ls-invocation + (lambda _ + (substitute* "build-aux/ltmain.sh" + (("`ls -") + (string-append "`" (which "ls") " -"))) + #t)) (add-before 'configure 'pre-configure (lambda _ ;; These tests try to test aspects of network-manager's @@ -5348,26 +5351,24 @@ (define-public network-manager (("src/platform/tests/test-cleanup-linux") " ") (("src/platform/tests/test-link-linux") " ") (("src/platform/tests/test-route-linux") " ") + (("src/devices/tests/test-acd") "") (("src/devices/tests/test-arping") " ") (("src/devices/tests/test-lldp") " ") (("src/tests/test-route-manager-linux") " ")) #t)) (add-after 'unpack 'delete-failing-tests (lambda _ - ;; FIXME: These four tests fail for unknown reasons. + ;; FIXME: These three tests fail for unknown reasons. ;; ERROR:libnm-core/tests/test-general.c:5842: ;; _json_config_check_valid: assertion failed (res == expected): (1 == 0) ;; ERROR:libnm-core/tests/test-keyfile.c:647: ;; test_team_conf_read_invalid: assertion failed: (nm_setting_team_get_config (s_team) == NULL) ;; ERROR:libnm-core/tests/test-setting.c:907: ;; _test_team_config_sync: assertion failed: (nm_streq0 (nm_setting_team_get_runner (s_team), runner)) - ;; NetworkManager:ERROR:src/platform/tests/test-nmp-object.c:397: - ;; test_cache_link: assertion failed: (nmp_object_is_visible (obj_new)) (substitute* "Makefile.in" (("libnm-core/tests/test-general") " ") (("libnm-core/tests/test-keyfile") " ") - (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " ") - (("src/platform/tests/test-nmp-object") " ")) + (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " ")) #t)) (add-before 'check 'pre-check (lambda _ @@ -5398,7 +5399,8 @@ (define-public network-manager ("python-dbus" ,python-dbus) ("python-pygobject" ,python-pygobject))) (inputs - `(("curl" ,curl) + `(("coreutils" ,coreutils) ; for ls + ("curl" ,curl) ("cyrus-sasl" ,cyrus-sasl) ("dbus-glib" ,dbus-glib) ("dnsmasq" ,dnsmasq) -- cgit v1.2.3 From cd7f718ee0c51a6ad1f7d47d7d0d3ee0dcb74b90 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 21:17:59 +0100 Subject: gnu: network-manager-applet: Use meson build system. * gnu/packages/gnome.scm (network-manager-applet)[build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add glib:bin and gtk-doc. [inputs]: Add gcr. --- gnu/packages/gnome.scm | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 725a256e8b..c584edc245 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5498,28 +5498,14 @@ (define-public network-manager-applet (sha256 (base32 "0y31g0lxr93370xi74hbpvcy9m81n5wdkdhq8xy2nqp0y4219p13")))) - (build-system glib-or-gtk-build-system) - (arguments '(#:configure-flags '("--disable-migration") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (let ((mbpi (assoc-ref inputs - "mobile-broadband-provider-info")) - (iso-codes (assoc-ref inputs "iso-codes"))) - (substitute* "src/libnma/nma-mobile-providers.c" - (("(g_build_filename \\()dirs\\[i\\].*,\ - (MOBILE_BROADBAND_PROVIDER_INFO.*)" all start end) - (string-append start "\"" mbpi "/share\", " end))) - (substitute* "src/libnma/nma-mobile-providers.c" - (("(g_build_filename \\()dirs\\[i\\].*,\ - (ISO_3166_COUNTRY_CODES.*)" all start end) - (string-append start "\"" iso-codes - "/share\", " end))) - #t)))))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t)) (native-inputs `(("intltool" ,intltool) + ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config))) (propagated-inputs ;; libnm-gtk.pc refers to all these. @@ -5527,7 +5513,8 @@ (define-public network-manager-applet ("gtk+" ,gtk+) ("network-manager" ,network-manager))) (inputs - `(("iso-codes" ,iso-codes) + `(("gcr" ,gcr) + ("iso-codes" ,iso-codes) ("libgudev" ,libgudev) ("libnotify" ,libnotify) ("libsecret" ,libsecret) -- cgit v1.2.3 From 817b3fd1d57f51db04b608769beffa1b4d7cf72b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 21:21:06 +0100 Subject: gnu: libdazzle: Update to 3.30.2. * gnu/packages/gnome.scm (libdazzle): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c584edc245..bc59c58d4f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7903,7 +7903,7 @@ (define-public ghex (define-public libdazzle (package (name "libdazzle") - (version "3.28.5") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libdazzle/" @@ -7911,7 +7911,7 @@ (define-public libdazzle "libdazzle-" version ".tar.xz")) (sha256 (base32 - "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg")))) + "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From d0b19e445cd542b8336e47801c6aacd9361ed5a7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 22:32:10 +0100 Subject: gnu: libgdata: Update to 0.17.9. * gnu/packages/gnome.scm (libgdata): Update to 0.17.9. [inputs]: Move glib, json-glib, and libsoup from here... [propagated-inputs]: ...to here. * gnu/packages/patches/libgdata-fix-tests.patch: Remove file. * gnu/packages/patches/libgdata-glib-duplicate-tests.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Remove patches. --- gnu/local.mk | 2 - gnu/packages/gnome.scm | 17 +- gnu/packages/patches/libgdata-fix-tests.patch | 325 --------------------- .../patches/libgdata-glib-duplicate-tests.patch | 16 - 4 files changed, 8 insertions(+), 352 deletions(-) delete mode 100644 gnu/packages/patches/libgdata-fix-tests.patch delete mode 100644 gnu/packages/patches/libgdata-glib-duplicate-tests.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 12a64b23f9..2051df8d85 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -997,8 +997,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgpg-error-gawk-compat.patch \ %D%/packages/patches/libgit2-avoid-python.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ - %D%/packages/patches/libgdata-fix-tests.patch \ - %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc59c58d4f..221c79e6a9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -357,10 +357,12 @@ (define-public dia formats like PNG, SVG, PDF and EPS.") (license license:gpl2+)))) +;; This is the unstable release, but it is required for the current stable +;; release of gvfs (1.38.1). (define-public libgdata (package (name "libgdata") - (version "0.16.1") + (version "0.17.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -368,10 +370,7 @@ (define-public libgdata name "-" version ".tar.xz")) (sha256 (base32 - "09q8h1129xjpw33rvzz7856drygxwlm0s64z9cm0vbmjxiqy0h47")) - (patches - (search-patches "libgdata-fix-tests.patch" - "libgdata-glib-duplicate-tests.patch")))) + "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45")))) (build-system gnu-build-system) (arguments '(#:phases @@ -391,14 +390,14 @@ (define-public libgdata ("uhttpmock" ,uhttpmock))) (inputs `(("cyrus-sasl" ,cyrus-sasl) - ("glib" ,glib) - ("glib-networking" ,glib-networking) - ("json-glib" ,json-glib) - ("libsoup" ,libsoup))) + ("glib-networking" ,glib-networking))) (propagated-inputs `(("gcr" ,gcr) + ("glib" ,glib) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("json-glib" ,json-glib) ("liboauth" ,liboauth) + ("libsoup" ,libsoup) ("libxml2" ,libxml2))) (home-page "https://wiki.gnome.org/Projects/libgdata") (synopsis "Library for accessing online service APIs") diff --git a/gnu/packages/patches/libgdata-fix-tests.patch b/gnu/packages/patches/libgdata-fix-tests.patch deleted file mode 100644 index dc86b3ab5a..0000000000 --- a/gnu/packages/patches/libgdata-fix-tests.patch +++ /dev/null @@ -1,325 +0,0 @@ -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 deleted file mode 100644 index d5d8d064de..0000000000 --- a/gnu/packages/patches/libgdata-glib-duplicate-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -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, -- cgit v1.2.3 From e762d943e5eebcc57b3f86ed117cd5ba203e54f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:33:01 +0100 Subject: gnu: gvfs: Update to 1.38.1. * gnu/packages/gnome.scm (gvfs): Update to 1.38.1. [build-system]: Use meson-build-system. [arguments]: Remove custom phases; add configure flags to build without systemd; set glib-or-gtk? flag; enable tests; add sub-directory to RUNPATH. [native-inputs]: Remove autoconf, automake, and libtool. [inputs]: Add elogind, gnome-online-accounts, libgdata, libnfs, and openssh. --- gnu/packages/gnome.scm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 221c79e6a9..cdf361e5fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -81,6 +81,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages enchant) #:use-module (gnu packages flex) #:use-module (gnu packages fonts) + #:use-module (gnu packages file-systems) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages game-development) @@ -4161,7 +4162,7 @@ (define-public libgudev (define-public gvfs (package (name "gvfs") - (version "1.36.2") + (version "1.38.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4169,21 +4170,20 @@ (define-public gvfs name "-" version ".tar.xz")) (sha256 (base32 - "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4")))) - (build-system gnu-build-system) + "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd")))) + (build-system meson-build-system) (arguments - '(#:tests? #f ; XXX: requiring `pidof' - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-broken-autogen-script - (lambda _ (delete-file "autogen.sh") #t))))) + '(#:glib-or-gtk? #t + #:configure-flags + (list "-Dsystemduserunitdir=no" + "-Dtmpfilesdir=no" + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib/gvfs")))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. - ("autoconf" ,autoconf) - ("automake" ,automake) ("gettext" ,gettext-minimal) ("gtk-doc" ,gtk-doc) - ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs @@ -4191,23 +4191,28 @@ (define-public gvfs ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("dbus" ,dbus) + ("elogind" ,elogind) ("fuse" ,fuse) ("gcr" ,gcr) ("glib" ,glib) + ("gnome-online-accounts" ,gnome-online-accounts) ("libarchive" ,libarchive) ("libbluray" ,libbluray) ("libcap" ,libcap) ("libcdio-paranoia" ,libcdio-paranoia) ("libgcrypt" ,libgcrypt) + ("libgdata" ,libgdata) ("libgphoto2" ,libgphoto2) ("libgudev" ,libgudev) ("libimobiledevice" ,libimobiledevice) ("libmtp" ,libmtp) + ("libnfs" ,libnfs) ("libsecret" ,libsecret) ("libsmbclient" ,samba) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("nettle" ,nettle) ; XXX: required by libarchive.pc + ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) (home-page "https://wiki.gnome.org/gvfs/") -- cgit v1.2.3 From ec66ebd4cd97f05d3f968062557ed92b2f4e1c4b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 11:05:26 +0100 Subject: gnu: nautilus: Update to 3.30.4. * gnu/packages/gnome.scm (nautilus): Update to 3.30.4. [inputs]: Add libseccomp. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cdf361e5fc..84c3615974 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6238,7 +6238,7 @@ (define-public tracker (define-public nautilus (package (name "nautilus") - (version "3.28.1") + (version "3.30.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6246,7 +6246,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w")))) + "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -6267,6 +6267,7 @@ (define-public nautilus ("exempi" ,exempi) ("gnome-desktop" ,gnome-desktop) ("gnome-autoar" ,gnome-autoar) + ("libseccomp" ,libseccomp) ("libselinux" ,libselinux) ("nettle" ,nettle) ; XXX required by libarchive.pc via gnome-autoar ("tracker" ,tracker) -- cgit v1.2.3 From bf6cb316864d975fad392b771c7ffe2056d5f0c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 12:22:34 +0100 Subject: gnu: gnome-tweak-tool: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-tweak-tool): Deprecate and rename... (gnome-tweaks): ...to this. Update to 3.30.1. [build-system]: Use meson-build-system. [arguments]: Adjust configure flags; pass glib-or-gtk? flag; remove custom phases that are now provided by the meson-build-system; add phases "wrap" and "wrap-gi-typelib". [native-inputs]: Remove meson-for-build and ninja. [home-page]: Update. [description]: Use "Tweaks" instead of "Tweak Tool". * gnu/packages/patches/gnome-tweak-tool-search-paths.patch: Rename file... * gnu/packages/patches/gnome-tweaks-search-paths.patch: ...to this. * gnu/local.mk (dist_patch_DATA): Update patch file name. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 84c3615974..47100579b8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6792,7 +6792,7 @@ (define-public gnome-dictionary (define-public gnome-tweaks (package (name "gnome-tweaks") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweaks/" @@ -6802,7 +6802,7 @@ (define-public gnome-tweaks (list (search-patch "gnome-tweaks-search-paths.patch"))) (sha256 (base32 - "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp")))) + "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From a68544a81dafb7e1b5bb1ce90d9200fb5a883551 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:39:55 +0100 Subject: gnu: colord: Update to 1.4.3. * gnu/packages/gnome.scm (colord): Update to 1.4.3. [build-system]: Use meson-build-system. [arguments]: Add glib-or-gtk? flag; update configure flags; remove phase "patch-/bin/true"; add phase "patch-build-system". [native-inputs]: Add glib:bin and gtk-doc. [inputs]: Add gusb and python-wrapper. --- gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 47100579b8..87e997c630 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2992,7 +2992,7 @@ (define-public gnome-terminal (define-public colord (package (name "colord") - (version "1.1.8") + (version "1.4.3") (source (origin (method url-fetch) @@ -3000,38 +3000,42 @@ (define-public colord name "-" version ".tar.xz")) (sha256 (base32 - "01w97rgzk4qi6fp03scq5jyw0ayx11b479p7dkm2r77k84b9agph")))) - (build-system glib-or-gtk-build-system) + "1xwxahg9mgmapc16xkb4kgmc40zpadrwav33xqmn6cgaw6g6d3ls")))) + (build-system meson-build-system) (arguments - '(;; The tests want to run valgrind. Punt for now. + '(;; FIXME: One test fails: + ;; /colord/icc-store (in lib/colord/colord-self-test-private): + ;; Incorrect content type for /tmp/colord-vkve/already-exists.icc, got + ;; application/x-zerosize #:tests? #f - #:configure-flags (list "--localstatedir=/var" - ;; GUSB not packaged yet. - "--disable-gusb" + #:glib-or-gtk? #t + #:configure-flags (list "-Dlocalstatedir=/var" ;; No dep on systemd. - "--disable-systemd-login" + "-Dsystemd=false" ;; Wants to install to global completion dir; ;; punt. - "--disable-bash-completion" + "-Dbash_completion=false" ;; colord-gtk not packaged yet. - "--disable-session-example" - "--with-daemon-user=colord" - "--enable-sane" - (string-append "--with-udevrulesdir=" - (assoc-ref %outputs "out") - "/lib/udev/rules.d")) + "-Dsession_example=false" + "-Ddaemon_user=colord" + "-Dsane=true" + ;; Requires spotread + "-Dargyllcms_sensor=false" + ;; TODO: Requires docbook2x + "-Dman=false") #:phases (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/true - (lambda _ - (substitute* "configure" - (("/bin/true") (which "true"))) - (substitute* "src/Makefile.in" - (("if test -w \\$\\(DESTDIR\\)\\$\\(prefix\\)/;") - "if test -w $(DESTDIR)$(localstatedir);"))))))) + (add-before 'configure 'patch-build-system + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "rules/meson.build" + (("udev.get_pkgconfig_variable\\('udevdir'\\)") + (string-append "'" (assoc-ref outputs "out") "/lib/udev'"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) + ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("libtool" ,libtool) ("intltool" ,intltool))) (propagated-inputs @@ -3041,10 +3045,12 @@ (define-public colord ("lcms" ,lcms))) (inputs `(("dbus-glib" ,dbus-glib) + ("gusb" ,gusb) ("libgudev" ,libgudev) ("libusb" ,libusb) ("sqlite" ,sqlite) ("polkit" ,polkit) + ("python" ,python-wrapper) ("sane-backends" ,sane-backends))) (home-page "https://www.freedesktop.org/software/colord/") (synopsis "Color management service") -- cgit v1.2.3 From ec7d4bc7ac1e812508cbcb15bf93bb0e5cf101b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:42:02 +0100 Subject: gnu: eog: Update to 3.28.4. * gnu/packages/gnome.scm (eog): Update to 3.28.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 87e997c630..6cb78ad55d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4037,7 +4037,7 @@ (define-public rhythmbox (define-public eog (package (name "eog") - (version "3.28.2") + (version "3.28.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4045,7 +4045,7 @@ (define-public eog name "-" version ".tar.xz")) (sha256 (base32 - "1gasrfqi7qrzdq1idh29r0n6ikkqjb6pbp7a8k5krfz5hkhyfin0")))) + "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 8748e29c563d9315ce34579b0a2ae26d739a5f21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:42:31 +0100 Subject: gnu: epiphany: Update to 3.30.2. * gnu/packages/gnome.scm (epiphany): Update to 3.30.2. [inputs]: Add libdazzle. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6cb78ad55d..699026386b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4385,7 +4385,7 @@ (define-public eolie (define-public epiphany (package (name "epiphany") - (version "3.28.3.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -4393,7 +4393,7 @@ (define-public epiphany "epiphany-" version ".tar.xz")) (sha256 (base32 - "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9")))) + "0141bb37nd8wc743g4wy491crjh6ig76ack07aj2ba4z3gjz2zlc")))) (build-system meson-build-system) (arguments @@ -4427,6 +4427,7 @@ (define-public epiphany ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("json-glib" ,json-glib) ("iso-codes" ,iso-codes) + ("libdazzle" ,libdazzle) ("libnotify" ,libnotify) ("libsecret" ,libsecret) ("libxslt" ,libxslt) -- cgit v1.2.3 From 9d029b7fc948208812be989457b28955246cbf7e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:43:01 +0100 Subject: gnu: yelp: Update to 3.30.0. * gnu/packages/gnome.scm (yelp): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 699026386b..0c10de7c18 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4527,7 +4527,7 @@ (define-public yelp-xsl (define-public yelp (package (name "yelp") - (version "3.28.1") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4535,7 +4535,7 @@ (define-public yelp name "-" version ".tar.xz")) (sha256 (base32 - "033w5qnhm495pnvscnb3k2dagzgq4fsnzcrh0k2rgr10mw2mv2p8")))) + "060a902j15k76fyhk8xfl38ipvrrcc0qd7nm2mcck4ifb45b0zv4")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- cgit v1.2.3 From 9583e8a5c13dca13b1425c5e833ba1ba3d7a177e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:45:06 +0100 Subject: gnu: yelp-xsl: Update to 3.30.1. * gnu/packages/gnome.scm (yelp-xsl): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0c10de7c18..d697bda1f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4503,7 +4503,7 @@ (define-public d-feet (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4511,7 +4511,7 @@ (define-public yelp-xsl name "-" version ".tar.xz")) (sha256 (base32 - "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc")))) + "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 45caa055407b72d413d8b434c15006473fdd04ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 21:10:12 +0100 Subject: gnu: libgnome-games-support: Update to 1.4.2. * gnu/packages/gnome.scm (libgnome-games-support): Update to 1.4.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d697bda1f2..d6cf0e13d5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3668,7 +3668,7 @@ (define-public gom (define-public libgnome-games-support (package (name "libgnome-games-support") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3676,7 +3676,7 @@ (define-public libgnome-games-support name "-" version ".tar.xz")) (sha256 (base32 - "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1")))) + "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From b468eedcb8da62587e33e5e3671dc4bd34cfaf34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 23:11:43 +0100 Subject: gnu: evolution-data-server: Update to 3.30.2. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.30.2. [arguments]: Enable tests; add phase to disable failing tests; update phase "patch-paths". [inputs]: Add libcanberra. --- gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6cf0e13d5..8a30795bdd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5128,7 +5128,7 @@ (define-public gnome-online-accounts (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.28.3") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5136,17 +5136,14 @@ (define-public evolution-data-server name "-" version ".tar.xz")) (sha256 (base32 - "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3")))) + "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv")))) (outputs '("out" "libedataserverui")) (build-system cmake-build-system) (arguments - '(;; XXX FIXME: 11/85 tests are failing. - #:tests? #f - #:configure-flags - (let* ((lib (string-append (assoc-ref %outputs "out") - "/lib")) - (runpaths (map (lambda (s) (string-append - lib "/evolution-data-server/" s)) + '(#:configure-flags + (let* ((lib (string-append (assoc-ref %outputs "out") "/lib")) + (runpaths (map (lambda (s) + (string-append lib "/evolution-data-server/" s)) '("addressbook-backends" "calendar-backends" "camel-providers" "credential-modules" "registry-modules")))) @@ -5167,9 +5164,25 @@ (define-public evolution-data-server "-DENABLE_INTROSPECTION=ON")) ;required for Vala bindings #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; tests/book-migration/test-migration.c:160:test_fetch_contacts: + ;; assertion failed (g_slist_length (contacts) == 20): (0 == 20) + (delete-file-recursively "tests/book-migration") + (substitute* "tests/CMakeLists.txt" + (("add_subdirectory\\(book-migration\\)") "")) + ;; tests/libedata-cal/test-cal-meta-backend.c:1328:test_get_attachment_uris: + ;; assertion failed (uris->data == expected_uri): + ;; ("" == "file:///tests/libedata-cal/components/event-1.ics") + (substitute* "tests/libedata-cal/CMakeLists.txt" + (("test-cal-meta-backend") "")) + #t)) (add-after 'unpack 'patch-paths (lambda _ - (substitute* "tests/test-server-utils/e-test-server-utils.c" + (substitute* '("tests/test-server-utils/e-test-server-utils.c" + "tests/libedata-book/data-test-utils.c" + "tests/libedata-book/test-book-cache-utils.c" + "tests/libedata-cal/test-cal-cache-utils.c") (("/bin/rm") (which "rm"))) #t)) (add-before 'configure 'dont-override-rpath @@ -5221,6 +5234,7 @@ (define-public evolution-data-server ("gcr" ,gcr) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("json-glib" ,json-glib) + ("libcanberra" ,libcanberra) ("libgweather" ,libgweather) ("mit-krb5" ,mit-krb5) ("openldap" ,openldap) -- cgit v1.2.3 From b63c06f1d712b2cbd336a07621e9d28bdf803620 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 May 2019 14:13:35 +0200 Subject: gnu: evolution-data-server: Do not split outputs. A binary in $out/libexec depends on libedataserverui libraries, so the split would require mutually recursive output dependencies. * gnu/packages/gnome.scm (evolution-data-server)[outputs]: Remove field. [arguments]: Remove "split" phase. (gnome-calendar, gnome-todo, evolution)[inputs]: Adjust. --- gnu/packages/gnome.scm | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8a30795bdd..8dc60daa92 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5137,7 +5137,6 @@ (define-public evolution-data-server (sha256 (base32 "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv")))) - (outputs '("out" "libedataserverui")) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -5191,28 +5190,7 @@ (define-public evolution-data-server ;; CMakeLists.txt hard-codes runpath to just the libdir. ;; Remove it so the configure flag is respected. (("SET\\(CMAKE_INSTALL_RPATH .*") "")) - #t)) - (add-after 'install 'split - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libedsui (assoc-ref outputs "libedataserverui"))) - (for-each (lambda (file) - (mkdir-p (dirname (string-append libedsui file))) - (rename-file (string-append out file) - (string-append libedsui file))) - '("/lib/pkgconfig/libedataserverui-1.2.pc" - "/lib/libedataserverui-1.2.so" - "/lib/libedataserverui-1.2.so.2" - "/lib/libedataserverui-1.2.so.2.0.0" - "/lib/girepository-1.0/EDataServerUI-1.2.typelib" - "/include/evolution-data-server/libedataserverui" - "/share/gir-1.0/EDataServerUI-1.2.gir" - "/share/vala/vapi/libedataserverui-1.2.vapi" - "/share/vala/vapi/libedataserverui-1.2.deps")) - (substitute* (string-append libedsui "/lib/pkgconfig/" - "libedataserverui-1.2.pc") - ((out) libedsui)) - #t)))))) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) @@ -6708,7 +6686,7 @@ (define-public gnome-calendar ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("libdazzle" ,libdazzle) - ("libedataserverui" ,evolution-data-server "libedataserverui") + ("libedataserverui" ,evolution-data-server) ("libgweather" ,libgweather) ("geoclue" ,geoclue))) (home-page "https://wiki.gnome.org/Apps/Calendar") @@ -6756,7 +6734,7 @@ (define-public gnome-todo (inputs `(("rest" ,rest) ; For Todoist plugin ("json-glib" ,json-glib) ; For Todoist plugin - ("libedataserverui" ,evolution-data-server "libedataserverui") + ("libedataserverui" ,evolution-data-server) ("libical" ,libical) ("libpeas" ,libpeas) ("python-pygobject" ,python-pygobject) @@ -8005,7 +7983,7 @@ (define-public evolution ("gtkspell3" ,gtkspell3) ("highlight" ,highlight) ("libcanberra" ,libcanberra) - ("libedataserverui" ,evolution-data-server "libedataserverui") + ("libedataserverui" ,evolution-data-server) ("libgweather" ,libgweather) ("libnotify" ,libnotify) ("libsoup" ,libsoup) -- cgit v1.2.3 From 9b848f0364d296339fbd13e4de104f4eb9fa6970 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 23:13:26 +0100 Subject: gnu: gnome-online-accounts: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8dc60daa92..a68ddc0757 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5075,7 +5075,7 @@ (define-public mutter (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5083,7 +5083,7 @@ (define-public gnome-online-accounts name "-" version ".tar.xz")) (sha256 (base32 - "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47")))) + "1hyg9g7l4ypnirx2j7ms2vr8711x90aybpq3s3wa20ma8a4xin97")))) (outputs '("out" "lib")) (build-system glib-or-gtk-build-system) (arguments -- cgit v1.2.3 From e402eae6d4593a72ff90e77422c9e9f333144c1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jan 2019 13:52:21 +0100 Subject: gnu: mutter: Update to 3.30.2. * gnu/packages/gnome.scm (mutter): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a68ddc0757..a243cf1f60 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4971,7 +4971,7 @@ (define-public zenity (define-public mutter (package (name "mutter") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4979,7 +4979,7 @@ (define-public mutter name "-" version ".tar.xz")) (sha256 (base32 - "0ighs1zvlssgq16v1h3vg280za7y448snq65gc5m1zmqqawqkymg")))) + "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z")))) ;; 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 -- cgit v1.2.3 From bd0dc2df04a1550f41d3d5c7cc2c26ad12468b36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jan 2019 13:52:33 +0100 Subject: gnu: gnome-shell: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-shell): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a243cf1f60..a126596a09 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5917,7 +5917,7 @@ (define-public gnome-control-center (define-public gnome-shell (package (name "gnome-shell") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5925,7 +5925,7 @@ (define-public gnome-shell name "-" version ".tar.xz")) (sha256 (base32 - "1b9n89ij2g5nqaqp7a13jnqcd8qa2v9p55rbi71al3xvqk091ri7")) + "0kacd4w9lc5finsvs170i7827qkxwd1ddj0g2giizwffpjdjqqr2")) (patches (search-patches "gnome-shell-theme.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From b3640e79f648992fe3c58bacd931bdfbad444c1a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 13:56:09 +0200 Subject: gnu: yelp-xsl: Update to 3.32.1. * gnu/packages/gnome.scm (yelp-xsl): Update to 3.32.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a126596a09..e7d7e913b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4503,7 +4503,7 @@ (define-public d-feet (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.30.1") + (version "3.32.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4511,7 +4511,7 @@ (define-public yelp-xsl name "-" version ".tar.xz")) (sha256 (base32 - "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw")))) + "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 2d6872f6afc6dd023b676327867e2dba237b5062 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:42:33 +0200 Subject: gnu: vala: Update to 0.44.5. * gnu/packages/gnome.scm (vala): Update to 0.44.5. [native-inputs]: Remove superfluous GREP and SED. --- gnu/packages/gnome.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e7d7e913b4..5537ca6951 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2250,7 +2250,7 @@ (define-public seahorse (define-public vala (package (name "vala") - (version "0.42.3") + (version "0.44.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2258,7 +2258,7 @@ (define-public vala name "-" version ".tar.xz")) (sha256 (base32 - "0zaq9009wqk5aah131m426a2ia0scwpjpl4npf8p7p43wv8kvisz")))) + "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv")))) (build-system gnu-build-system) (arguments '(#:phases @@ -2277,8 +2277,6 @@ (define-public vala ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) - ("grep" ,grep) - ("sed" ,sed) ("dbus" ,dbus) ; for dbus tests ("gobject-introspection" ,gobject-introspection))) ; for gir tests (inputs -- cgit v1.2.3 From 8bdacad26b1209dd4d95f5ca093a9178feb12f5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:45:14 +0200 Subject: gnu: libcroco: Update to 0.6.13. * gnu/packages/patches/libcroco-CVE-2017-7960.patch, gnu/packages/patches/libcroco-CVE-2017-7961.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (libcroco): Update to 0.6.13. [source](patches): Remove. --- gnu/local.mk | 2 - gnu/packages/gnome.scm | 7 +-- gnu/packages/patches/libcroco-CVE-2017-7960.patch | 66 ----------------------- gnu/packages/patches/libcroco-CVE-2017-7961.patch | 50 ----------------- 4 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 gnu/packages/patches/libcroco-CVE-2017-7960.patch delete mode 100644 gnu/packages/patches/libcroco-CVE-2017-7961.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 2051df8d85..d375b8cd1d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -989,8 +989,6 @@ dist_patch_DATA = \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ - %D%/packages/patches/libcroco-CVE-2017-7960.patch \ - %D%/packages/patches/libcroco-CVE-2017-7961.patch \ %D%/packages/patches/libdrm-symbol-check.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5537ca6951..f8a6a774da 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1256,18 +1256,15 @@ (define-public glade3 (define-public libcroco (package (name "libcroco") - (version "0.6.12") + (version "0.6.13") (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 - "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x")))) + "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/libcroco-CVE-2017-7960.patch b/gnu/packages/patches/libcroco-CVE-2017-7960.patch deleted file mode 100644 index 0319c7389f..0000000000 --- a/gnu/packages/patches/libcroco-CVE-2017-7960.patch +++ /dev/null @@ -1,66 +0,0 @@ -Fix CVE-2017-7960: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7960 - -Patch copied from upstream source repository: - -https://git.gnome.org/browse/libcroco/commit/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 - -From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 16 Apr 2017 13:13:43 +0200 -Subject: input: check end of input before reading a byte - -When reading bytes we weren't check that the index wasn't -out of bound and this could produce an invalid read which -could deal to a security bug. ---- - src/cr-input.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/cr-input.c b/src/cr-input.c -index 49000b1..3b63a88 100644 ---- a/src/cr-input.c -+++ b/src/cr-input.c -@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) - *we should free buf here because it's own by CRInput. - *(see the last parameter of cr_input_new_from_buf(). - */ -- buf = NULL ; -+ buf = NULL; - } - - cleanup: -@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) - enum CRStatus - cr_input_read_byte (CRInput * a_this, guchar * a_byte) - { -+ gulong nb_bytes_left = 0; -+ - g_return_val_if_fail (a_this && PRIVATE (a_this) - && a_byte, CR_BAD_PARAM_ERROR); - -@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) - if (PRIVATE (a_this)->end_of_input == TRUE) - return CR_END_OF_INPUT_ERROR; - -+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); -+ -+ if (nb_bytes_left < 1) { -+ return CR_END_OF_INPUT_ERROR; -+ } -+ - *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; - - if (PRIVATE (a_this)->nb_bytes - -@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char) - if (*a_char == '\n') { - PRIVATE (a_this)->end_of_line = TRUE; - } -- - } - - return status; --- -cgit v0.12 - diff --git a/gnu/packages/patches/libcroco-CVE-2017-7961.patch b/gnu/packages/patches/libcroco-CVE-2017-7961.patch deleted file mode 100644 index 675dbe4f08..0000000000 --- a/gnu/packages/patches/libcroco-CVE-2017-7961.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix CVE-2017-7961: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7961 - -Patch copied from upstream source repository: - -https://git.gnome.org/browse/libcroco/commit/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 - -From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 16 Apr 2017 13:56:09 +0200 -Subject: tknzr: support only max long rgb values - -This fixes a possible out of bound when reading rgbs which -are longer than the support MAXLONG ---- - src/cr-tknzr.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c -index 1a7cfeb..1548c35 100644 ---- a/src/cr-tknzr.c -+++ b/src/cr-tknzr.c -@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - red = num->val; - cr_num_destroy (num); - num = NULL; -@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - PEEK_BYTE (a_this, 1, &next_bytes[0]); - if (next_bytes[0] == '%') { - SKIP_CHARS (a_this, 1); --- -cgit v0.12 - -- cgit v1.2.3 From 29a4fe8b59003ee28df0e902525ef5de1b505fea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:09:16 +0200 Subject: gnu: vte-ng: Remove GCC7 input. * gnu/packages/gnome.scm (vte-ng)[native-inputs]: Remove GCC-7. [arguments]: Adjust accordingly. --- gnu/packages/gnome.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b7152a3aff..ad6a70848e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -85,7 +85,6 @@ (define-module (gnu packages gnome) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages game-development) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -2339,7 +2338,6 @@ (define-public vte-ng (native-inputs `(("gtk-doc" ,gtk-doc) ("gperf" ,gperf) - ("gcc" ,gcc-7) ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) @@ -2348,9 +2346,6 @@ (define-public vte-ng `(#:phases (modify-phases %standard-phases (replace 'bootstrap (lambda _ - ;; Work around GCC7 problem: . - (for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) - (setenv "NOCONFIGURE" "true") (invoke "sh" "autogen.sh")))))) (synopsis "Enhanced VTE terminal widget") -- cgit v1.2.3 From 554e234ebb5e2adc1b21e518a07a66ce2c723782 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:23:06 +0200 Subject: gnu: libgnomecanvasmm: Remove GCC5 workaround. * gnu/packages/gnome.scm (libgnomecanvasmm)[arguments]: Remove. --- gnu/packages/gnome.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ad6a70848e..d3a348ba89 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1820,8 +1820,6 @@ (define-public libgnomecanvasmm (base32 "0679hcnpam2gkag2i63sm0wdm35gwvzafnz1354mg6j5gzwpfrcr")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("CXXFLAGS=-std=c++11"))) ; required by gtkmm (propagated-inputs `(("libgnomecanvas" ,libgnomecanvas))) (native-inputs `(("gtkmm-2" ,gtkmm-2) -- cgit v1.2.3 From 0d75c64d7844bf35b4e1cd09bcc50b2a1005c191 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:19:46 +0200 Subject: gnu: glib-networking: Update to 2.60.3. * gnu/packages/gnome.scm (glib-networking): Update to 2.60.3. [source](patches): Remove. [arguments]<#:phases>: Remove. * gnu/packages/patches/glib-networking-connection.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 14 ++---- .../patches/glib-networking-connection.patch | 51 ---------------------- 3 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 gnu/packages/patches/glib-networking-connection.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index b0d51406d9..bac1a92741 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -846,7 +846,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/glib-tests-timer.patch \ - %D%/packages/patches/glib-networking-connection.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ %D%/packages/patches/glibc-CVE-2016-3075.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d3a348ba89..ecf39334e5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2595,7 +2595,7 @@ (define-public python2-rsvg (define-public glib-networking (package (name "glib-networking") - (version "2.58.0") + (version "2.60.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glib-networking/" @@ -2603,18 +2603,10 @@ (define-public glib-networking name "-" version ".tar.xz")) (sha256 (base32 - "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx")) - (patches (search-patches "glib-networking-connection.patch")))) + "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Dlibproxy_support=false") - #:phases (modify-phases %standard-phases - (add-before 'check 'disable-TLSv1.3 - (lambda _ - ;; XXX: One test fails when TLS 1.3 is enabled, fixed in 2.60.0: - ;; . - (setenv "G_TLS_GNUTLS_PRIORITY" "NORMAL:-VERS-TLS1.3") - #t))))) + `(#:configure-flags '("-Dlibproxy_support=false"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) diff --git a/gnu/packages/patches/glib-networking-connection.patch b/gnu/packages/patches/glib-networking-connection.patch deleted file mode 100644 index f64b090ae5..0000000000 --- a/gnu/packages/patches/glib-networking-connection.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://gitlab.gnome.org/GNOME/glib-networking/issues/4 -https://gitlab.gnome.org/GNOME/glib-networking/commit/55daf3e5fd4bc9e4ebad1a9eab93f852dcbf527e.patch -This ultimately rejected work-around should be removed with the next -release, as the bug has supposedly been fixed for real. - - -From 55daf3e5fd4bc9e4ebad1a9eab93f852dcbf527e Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Thu, 19 Jul 2018 11:16:35 -0500 -Subject: [PATCH] Fix intermittent failures in missing client private key test - -Because our APIs do nice things like encapsulating the TLS connection -establishment, we have our test server writing to the client after -establishing the TCP connection, because the TLS connection is -established. It's fine in theory, but results in some weirdness like the -server seeing its write having completed successfully before TLS -connection establishment. Normally that's what happens and this test -passes (server sees no error), but sometimes the server sees that the -client has already failed and the test fails. - -This is unfortunate, and tricky to fix properly, so let's just remove -the bad check. The point of the test is to ensure that the TLS -connection is not established, and the client-side check is going to -have to be sufficient, because rewriting the test to wait for the TLS -connection to be established on the server side is quite tricky: my -naive attempt resulted in both sides waiting forever on the other. - -P.S. At no point in this test does the server ever examine the client -certificate. That's not quite what I expected when I added the test, but -it's fine. - -Fixes #4 ---- - tls/tests/connection.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tls/tests/connection.c b/tls/tests/connection.c -index 94645c3..390275d 100644 ---- a/tls/tests/connection.c -+++ b/tls/tests/connection.c -@@ -1125,7 +1125,6 @@ test_client_auth_fail_missing_client_private_key (TestConnection *test, - g_main_loop_run (test->loop); - - g_assert_error (test->read_error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED); -- g_assert_no_error (test->server_error); - } - - static void --- -2.18.1 - -- cgit v1.2.3 From d7b63ba92d55549006f6aa7f78adc4c37d98fc41 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:00:45 +0200 Subject: gnu: itstool: Update to 2.0.6. * gnu/packages/glib.scm (itstool): Update to 2.0.6. [inputs]: Change PYTHON2-LIBXML and PYTHON-2 to PYTHON-LIBXML and PYTHON. * gnu/packages/gnome.scm (totem)[inputs]: Change PYTHON-2 to PYTHON. --- gnu/packages/glib.scm | 8 ++++---- gnu/packages/gnome.scm | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index eae8297531..2f8b2bda5e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -451,19 +451,19 @@ (define intltool (define itstool (package (name "itstool") - (version "2.0.2") + (version "2.0.6") (source (origin (method url-fetch) (uri (string-append "http://files.itstool.org/itstool/itstool-" version ".tar.bz2")) (sha256 (base32 - "0fh34wi52i0qikgvlmrcpf1vx6gc1xqdad4539l4d9hikfsrz45z")))) + "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2")))) (build-system gnu-build-system) (inputs `(("libxml2" ,libxml2) - ("python2-libxml2" ,python2-libxml2) - ("python-2" ,python-2))) + ("python-libxml2" ,python-libxml2) + ("python" ,python))) (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ecf39334e5..8d4143e1da 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3871,9 +3871,7 @@ (define-public totem ("gst-plugins-good" ,gst-plugins-good) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("adwaita-icon-theme" ,adwaita-icon-theme) - ;; XXX We use python-2 because libxml2 because itstool (which needs - ;; libxml) currently uses python-2. - ("python" ,python-2) + ("python" ,python) ("python-pygobject" ,python2-pygobject) ;; XXX TODO pylint needed for python support ("totem-pl-parser" ,totem-pl-parser) -- cgit v1.2.3 From 4b8f131345132c3d563374f132c2552f387c991a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 16:51:22 +0200 Subject: gnu: glib-networking: Remove unused input. This is a follow-up to commit 0d75c64d7844bf35b4e1cd09bcc50b2a1005c191. * gnu/packages/gnome.scm (glib-networking)[inputs]: Remove P11-KIT. --- gnu/packages/gnome.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 92f5abc292..aa9731b0fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2613,8 +2613,7 @@ (define-public glib-networking (inputs `(("glib" ,glib) ("gnutls" ,gnutls) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("p11-kit" ,p11-kit))) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (home-page "https://www.gnome.org") (synopsis "Network-related GIO modules") (description -- cgit v1.2.3 From 03ecf85a761fce24e5c164b501f1f0823ba54342 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 16:51:57 +0200 Subject: gnu: gcr: Fix build with recent Glib. * gnu/packages/gnome.scm (gcr)[source](patches): New field. --- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aa9731b0fc..ab32cd642b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -601,7 +601,20 @@ (define-public gcr name "-" version ".tar.xz")) (sha256 (base32 - "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m")))) + "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m")) + (patches + (list + ;; This patch solves an ordering issue that showed up when + ;; running the test suite against newer Glib 2.60. See + ;; . + (origin + (method url-fetch) + (uri (string-append "https://gitlab.gnome.org/GNOME/gcr/commit/" + "45d637578d7643ff96c0183ac267497a0b4c6344.diff")) + (file-name "gcr-hashtable-ordering.patch") + (sha256 + (base32 + "1vsqiys8fsm1f1vvds783wwf7zwi5v282rhsai8jrsm6x7h79gbi"))))))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 07ace64143c7fddf4c54b56b6807559296ab44ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 17:37:54 +0200 Subject: gnu: gnome-calculator: Update to 3.32.2. * gnu/packages/gnome.scm (gnome-calculator): Update to 3.32.2. [inputs]: Change GTKSOURCEVIEW-3 to GTKSOURCEVIEW. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab32cd642b..5e90557b89 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7163,7 +7163,7 @@ (define-public libunique (define-public gnome-calculator (package (name "gnome-calculator") - (version "3.30.1") + (version "3.32.2") (source (origin (method url-fetch) @@ -7172,7 +7172,7 @@ (define-public gnome-calculator name "-" version ".tar.xz")) (sha256 (base32 - "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc")))) + "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) (native-inputs @@ -7184,7 +7184,7 @@ (define-public gnome-calculator ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) - ("gtksourceview" ,gtksourceview-3) + ("gtksourceview" ,gtksourceview) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("mpc" ,mpc) -- cgit v1.2.3 From 838a52a5fd148c899f5d254147f9407aa7e179cd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 19:45:47 +0200 Subject: gnu: vte: Update to 0.56.3. * gnu/packages/gnome.scm (vte): Update to 0.56.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5e90557b89..aeeff5b92a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2302,7 +2302,7 @@ (define-public vala (define-public vte (package (name "vte") - (version "0.54.2") + (version "0.56.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2310,7 +2310,7 @@ (define-public vte name "-" version ".tar.xz")) (sha256 (base32 - "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj")))) + "0j166gic5znssdb9r45qazq4kb4v9fial82czand5wa8i2yd988p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 70f2b0f97d9bda374bf4a6deddfde2ea3e38d016 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 19:50:28 +0200 Subject: gnu: libgnomekbd: Update to 3.26.1. * gnu/packages/gnome.scm (libgnomekbd): Update to 3.26.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aeeff5b92a..9c9f69258a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7094,7 +7094,7 @@ (define-public gfbgraph (define-public libgnomekbd (package (name "libgnomekbd") - (version "3.26.0") + (version "3.26.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7102,7 +7102,7 @@ (define-public libgnomekbd name "-" version ".tar.xz")) (sha256 (base32 - "0xc8jrc44x2h24v28wv36k70k7bwxy6p2vsvxvvia1n3ay642fza")))) + "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 7555d539245ff3456848c02d61f9e601ee5af463 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 20:07:12 +0200 Subject: gnu: gnome-online-accounts: Fix cyclic reference in outputs. This exploits a new feature of 'gobject-introspection-absolute-shlibs.patch'. * gnu/packages/gnome.scm (gnome-online-accounts)[arguments]: Set the "outputs" variable before building. --- gnu/packages/gnome.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9c9f69258a..4c7847ba94 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5089,6 +5089,9 @@ (define-public gnome-online-accounts (("@libdir@") (string-append lib "/lib")) (("@includedir@") (string-append lib "/include")) (("@datadir@") (string-append lib "/share"))) + ;; Make sure gobject-introspection knows about the output + ;; too (see ). + (setenv "outputs" "out lib") #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. -- cgit v1.2.3 From 8cae550021279668296e5462868a2c8a59d18c0b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 18:53:23 +0200 Subject: gnu: gexiv2: Enable tests on all platforms. * gnu/packages/gnome.scm (gexiv2)[arguments]: Remove. --- gnu/packages/gnome.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4c7847ba94..4d7f956162 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4629,14 +4629,6 @@ (define-public gexiv2 (base32 "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx")))) (build-system meson-build-system) - (arguments - ;; On 32-bit platforms, the test fails with a rounding error: - ;; . Just skip it for - ;; now. - (if (and (not (%current-target-system)) - (member (%current-system) '("i686-linux" "armhf-linux"))) - '(#:tests? #f) - '())) (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From d4ae2d15eff3a8ada5028c942c3be3831d54a00a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 23 Jun 2019 22:10:50 -0400 Subject: gnu: baobab: Update to 3.30.0. * gnu/packages/gnome.scm (baobab): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4d7f956162..e9a0166e96 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6273,7 +6273,7 @@ (define-public nautilus (define-public baobab (package (name "baobab") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append @@ -6282,7 +6282,7 @@ (define-public baobab name "-" version ".tar.xz")) (sha256 (base32 - "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk")))) + "0kx721s1hhw1g0nvbqhb93g8iq6f852imyhfhl02zcqy4ipx0kay")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) -- cgit v1.2.3 From f37dfe1ec3887315f3debf60ca51321f948be81a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 26 Jun 2019 11:48:35 -0400 Subject: gnu: epiphany: Update to 3.30.4. * gnu/packages/gnome.scm (epiphany): Update to 3.30.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e9a0166e96..f5b56fdbc8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4375,7 +4375,7 @@ (define-public eolie (define-public epiphany (package (name "epiphany") - (version "3.30.2") + (version "3.30.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -4383,7 +4383,7 @@ (define-public epiphany "epiphany-" version ".tar.xz")) (sha256 (base32 - "0141bb37nd8wc743g4wy491crjh6ig76ack07aj2ba4z3gjz2zlc")))) + "0nk0krzrfck6hhfs52f4sjmj93yjyvabm72bq8i8f9l1pass5vgd")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From 976e7801ac6f3b4701fcde327f79627ec34f8319 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:48:21 -0400 Subject: gnu: file-roller: Update to 3.30.1. * gnu/packages/gnome.scm (file-roller): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f5b56fdbc8..99b29fb09f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4696,7 +4696,7 @@ (define-public shotwell (define-public file-roller (package (name "file-roller") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4704,7 +4704,7 @@ (define-public file-roller name "-" version ".tar.xz")) (sha256 (base32 - "15pn2m80x45bzibig4zrqybnbr0n1f9wpqx7f2p6difldns3jwf1")))) + "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1")))) (build-system meson-build-system) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database -- cgit v1.2.3 From 42f95e3476d061d17982594f74488c7cd8199c62 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:49:47 -0400 Subject: gnu: gedit: Update to 3.30.2. * gnu/packages/gnome.scm (gedit): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 99b29fb09f..03d3d888f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4866,7 +4866,7 @@ (define-public gjs (define-public gedit (package (name "gedit") - (version "3.28.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4874,7 +4874,7 @@ (define-public gedit name "-" version ".tar.xz")) (sha256 (base32 - "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i")))) + "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases -- cgit v1.2.3 From 235743a62725a93121962d3cc3400863161913a6 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:52:55 -0400 Subject: gnu: zenity: Update to 3.30.0. * gnu/packages/gnome.scm (zenity): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 03d3d888f2..ed27c4f70b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4926,7 +4926,7 @@ (define-public gedit (define-public zenity (package (name "zenity") - (version "3.28.1") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4934,7 +4934,7 @@ (define-public zenity name "-" version ".tar.xz")) (sha256 (base32 - "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv")))) + "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 29b85910f668d14b72b92874c47fdcf26e54a135 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:58:57 -0400 Subject: gnu: gnome-backgrounds: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-backgrounds): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ed27c4f70b..eb251498e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6309,7 +6309,7 @@ (define-public baobab (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -6318,7 +6318,7 @@ (define-public gnome-backgrounds name "-" version ".tar.xz")) (sha256 (base32 - "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj")))) + "1179jrl16bp9gqabqhw7nnfp8qzf5y1vf9fi45bni6rfmwm3mrpc")))) (build-system meson-build-system) (native-inputs `(("intltool" ,intltool))) -- cgit v1.2.3 From 982c0b368daa2443de6fb642d73469d6a6ca468a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:01:12 -0400 Subject: gnu: gnome-control-center: Update to 3.30.3. * gnu/packages/gnome.scm (gnome-control-center): Update to 3.30.3. [source](patches): New field. [arguments]: Adjust "patch-paths" phase. [inputs]: Add libsecret and udisks. * gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 11 +- ...ontrol-center-use-udisks-to-get-disk-size.patch | 221 +++++++++++++++++++++ 3 files changed, 230 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 0a34b917ce..123ff115a6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -889,6 +889,7 @@ dist_patch_DATA = \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ + %D%/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eb251498e9..ea854ff38a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5809,7 +5809,7 @@ (define-public gnome-bluetooth (define-public gnome-control-center (package (name "gnome-control-center") - (version "3.28.2") + (version "3.30.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5817,7 +5817,10 @@ (define-public gnome-control-center name "-" version ".tar.xz")) (sha256 (base32 - "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz")))) + "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r")) + (patches + (search-patches + "gnome-control-center-use-udisks-to-get-disk-size.patch")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -5834,7 +5837,7 @@ (define-public gnome-control-center (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) - (substitute* "panels/datetime/test-endianess.c" + (substitute* "tests/datetime/test-endianess.c" (("/usr/share/locale") (string-append libc "/share/locale"))) (substitute* "panels/region/cc-region-panel.c" @@ -5877,6 +5880,7 @@ (define-public gnome-control-center ("libgudev" ,libgudev) ("libgtop" ,libgtop) ("libpwquality" ,libpwquality) + ("libsecret" ,libsecret) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("libwacom" ,libwacom) @@ -5888,6 +5892,7 @@ (define-public gnome-control-center ("pulseaudio" ,pulseaudio) ("smbclient" ,samba) ("tzdata" ,tzdata) + ("udisks" ,udisks) ("upower" ,upower))) (synopsis "Utilities to configure the GNOME desktop") (home-page "https://www.gnome.org/") diff --git a/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch b/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch new file mode 100644 index 0000000000..823684b2e9 --- /dev/null +++ b/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch @@ -0,0 +1,221 @@ +This patch is derived from upstream commit 2520aea6 and fixes upstream issues +285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387, +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302. + +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + +@@ -81,9 +82,7 @@ typedef struct + + GCancellable *cancellable; + +- /* Free space */ +- GList *primary_mounts; +- guint64 total_bytes; ++ UDisksClient *client; + + GraphicsData *graphics_data; + } CcInfoOverviewPanelPrivate; +@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel + CcInfoOverviewPanelPrivate *priv; + }; + +-static void get_primary_disc_info_start (CcInfoOverviewPanel *self); +- + typedef struct + { + char *major; +@@ -486,111 +483,51 @@ get_os_type (void) + } + + static void +-query_done (GFile *file, +- GAsyncResult *res, +- CcInfoOverviewPanel *self) ++get_primary_disc_info (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv; +- g_autoptr(GFileInfo) info = NULL; +- g_autoptr(GError) error = NULL; +- +- info = g_file_query_filesystem_info_finish (file, res, &error); +- if (info != NULL) +- { +- priv = cc_info_overview_panel_get_instance_private (self); +- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); +- } +- else +- { +- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) +- return; +- else +- { +- g_autofree char *path = NULL; +- path = g_file_get_path (file); +- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message); +- } +- } ++ GDBusObjectManager *manager; ++ g_autolist(GDBusObject) objects = NULL; ++ GList *l; ++ guint64 total_size; + +- /* And onto the next element */ +- get_primary_disc_info_start (self); +-} +- +-static void +-get_primary_disc_info_start (CcInfoOverviewPanel *self) +-{ +- GUnixMountEntry *mount; +- g_autoptr(GFile) file = NULL; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ priv = cc_info_overview_panel_get_instance_private (self); ++ total_size = 0; + +- if (priv->primary_mounts == NULL) ++ if (!priv->client) + { +- g_autofree char *size = NULL; +- +- size = g_format_size (priv->total_bytes); +- gtk_label_set_text (GTK_LABEL (priv->disk_label), size); +- ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); + return; + } + +- mount = priv->primary_mounts->data; +- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount); +- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount)); +- g_unix_mount_free (mount); +- +- g_file_query_filesystem_info_async (file, +- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, +- 0, +- priv->cancellable, +- (GAsyncReadyCallback) query_done, +- self); +-} +- +-static void +-get_primary_disc_info (CcInfoOverviewPanel *self) +-{ +- GList *points; +- GList *p; +- GHashTable *hash; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); +- +- hash = g_hash_table_new (g_str_hash, g_str_equal); +- points = g_unix_mount_points_get (NULL); +- +- /* If we do not have /etc/fstab around, try /etc/mtab */ +- if (points == NULL) +- points = g_unix_mounts_get (NULL); ++ manager = udisks_client_get_object_manager (priv->client); ++ objects = g_dbus_object_manager_get_objects (manager); + +- for (p = points; p != NULL; p = p->next) ++ for (l = objects; l != NULL; l = l->next) + { +- GUnixMountEntry *mount = p->data; +- const char *mount_path; +- const char *device_path; +- +- mount_path = g_unix_mount_get_mount_path (mount); +- device_path = g_unix_mount_get_device_path (mount); +- +- /* Do not count multiple mounts with same device_path, because it is +- * probably something like btrfs subvolume. Use only the first one in +- * order to count the real size. */ +- if (gsd_should_ignore_unix_mount (mount) || +- gsd_is_removable_mount (mount) || +- g_str_has_prefix (mount_path, "/media/") || +- g_str_has_prefix (mount_path, g_get_home_dir ()) || +- g_hash_table_lookup (hash, device_path) != NULL) ++ UDisksDrive *drive; ++ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data)); ++ ++ /* Skip removable devices */ ++ if (drive == NULL || ++ udisks_drive_get_removable (drive) || ++ udisks_drive_get_ejectable (drive)) + { +- g_unix_mount_free (mount); + continue; + } + +- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount); +- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); ++ total_size += udisks_drive_get_size (drive); + } +- g_list_free (points); +- g_hash_table_destroy (hash); + +- priv->cancellable = g_cancellable_new (); +- get_primary_disc_info_start (self); ++ if (total_size > 0) ++ { ++ g_autofree gchar *size = g_format_size (total_size); ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), size); ++ } ++ else ++ { ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); ++ } + } + + static char * +@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object) + g_clear_object (&priv->cancellable); + } + +- if (priv->primary_mounts) +- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free); ++ g_clear_object (&priv->client); + + g_free (priv->gnome_version); + g_free (priv->gnome_date); +@@ -895,6 +831,7 @@ static void + cc_info_overview_panel_init (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ g_autoptr(GError) error = NULL; + + gtk_widget_init_template (GTK_WIDGET (self)); + +@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) + else + gtk_widget_destroy (priv->updates_button); + ++ priv->client = udisks_client_new_sync (NULL, &error); ++ ++ if (error != NULL) ++ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.", ++ error->message); ++ + info_overview_panel_setup_overview (self); + info_overview_panel_setup_virt (self); + } +diff --git a/panels/info/meson.build b/panels/info/meson.build +index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644 +--- a/panels/info/meson.build ++++ b/panels/info/meson.build +@@ -61,6 +61,7 @@ sources += gnome.compile_resources( + + deps = common_deps + [ + polkit_gobject_dep, ++ dependency('udisks2', version: '>= 2.1.8'), + dependency('libgtop-2.0') + ] + -- cgit v1.2.3 From d29298ef5b79c024819569fac0297265b3e31382 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:02:28 -0400 Subject: gnu: gnome-online-accounts: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ea854ff38a..955ccbd757 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5056,7 +5056,7 @@ (define-public mutter (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.30.0") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5064,7 +5064,7 @@ (define-public gnome-online-accounts name "-" version ".tar.xz")) (sha256 (base32 - "1hyg9g7l4ypnirx2j7ms2vr8711x90aybpq3s3wa20ma8a4xin97")))) + "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5")))) (outputs '("out" "lib")) (build-system glib-or-gtk-build-system) (arguments -- cgit v1.2.3 From da886d6fce0510a7e404b02a11e7645ee82afc3d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:03:52 -0400 Subject: gnu: gnome-session: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-session): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 955ccbd757..a6a4bada10 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4732,7 +4732,7 @@ (define-public file-roller (define-public gnome-session (package (name "gnome-session") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4740,7 +4740,7 @@ (define-public gnome-session name "-" version ".tar.xz")) (sha256 (base32 - "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq")))) + "0fbpq103md4g9gi67rxnwvha21629nxx7qazddy6q6494sbqbzpa")))) (arguments '(#:glib-or-gtk? #t #:phases -- cgit v1.2.3 From 90fdc80f776a84da4a210e3cafc049c0e1bf19b1 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:06:12 -0400 Subject: gnu: gnome-settings-daemon: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a6a4bada10..f99d5ab2c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3238,7 +3238,7 @@ (define-public libgweather (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.30.1.2") + (version "3.30.2") (source (origin (method url-fetch) @@ -3247,7 +3247,7 @@ (define-public gnome-settings-daemon name "-" version ".tar.xz")) (sha256 (base32 - "079dh609rvpwfyzg4m898q8km9g7x04hg18rwwb1izj1dr7zdp2w")))) + "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 5088834271a2899cd7d1a86983fbefa1b3ceb3aa Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:07:31 -0400 Subject: gnu: gnome-terminal: Update to 3.30.3. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.30.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f99d5ab2c6..8090bcd6cf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2934,7 +2934,7 @@ (define-public gnome-sudoku (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.30.2") + (version "3.30.3") (source (origin (method url-fetch) @@ -2943,7 +2943,7 @@ (define-public gnome-terminal name "-" version ".tar.xz")) (sha256 (base32 - "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb")))) + "0bar8qazk39acsif31h8i408nl82mzdcdg6p7ymak4l9pxyscxf8")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 1f8b5515edbc2077387cf59d355adb9ab6d797cf Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:18:04 -0400 Subject: gnu: gucharmap: Update to 12.0.1. * gnu/packages/gnome.scm (gucharmap): Update to 12.0.1. [native-inputs]: Update unicode-files. --- gnu/packages/gnome.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8090bcd6cf..0c6942c23d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7230,20 +7230,20 @@ (define-public xpad (define-public gucharmap (let ((unicode-files '(("Blocks.txt" - "19zf2kd198mcv1paa194c1zf36hay1irbxssi35yi2pd8ad69qas") + "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1") ("DerivedAge.txt" - "1h9p1g0wnh686l6cqar7cmky465vwc6vjzzn1s7v0i9zcjaqkr4h") + "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6") ("NamesList.txt" - "0gvpcyq852rnlqmx4y5i1by7bavvcw6rj40i54w48yc7xr3zmgd1") + "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61") ("Scripts.txt" - "0b9prz2hs6w61afqaplcxnv115f8yk4d5hn9dc5hks8nqpj28bnh") + "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx") ("UnicodeData.txt" - "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj") + "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap") ("Unihan.zip" - "199kz6laypkvc0ykms6d7bkb571jmpds39sv2p7kd5jjm1ij08q1")))) + "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf")))) (package (name "gucharmap") - (version "10.0.4") + (version "12.0.1") (source (origin (method url-fetch) @@ -7252,7 +7252,7 @@ (define-public gucharmap name "-" version ".tar.xz")) (sha256 (base32 - "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv")))) + "0m915hm2b2d6r3vs1l80rqpssvg78pv8j6nv54yg62kzknnqmpir")))) (build-system glib-or-gtk-build-system) (arguments `(#:modules ((ice-9 match) @@ -7284,7 +7284,7 @@ (define-public gucharmap ,(origin (method url-fetch) (uri (string-append - "http://www.unicode.org/Public/10.0.0/ucd/" + "http://www.unicode.org/Public/12.0.0/ucd/" file)) (sha256 (base32 hash)))))) unicode-files) -- cgit v1.2.3 From 12fe48467395671cb0acaed36ac208ea73d49a19 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:36:40 -0400 Subject: gnu: gvfs: Update to 1.40.1. * gnu/packages/gnome.scm (gvfs): Update to 1.40.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0c6942c23d..d6d07e041a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4158,7 +4158,7 @@ (define-public libgudev (define-public gvfs (package (name "gvfs") - (version "1.38.1") + (version "1.40.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4166,7 +4166,7 @@ (define-public gvfs name "-" version ".tar.xz")) (sha256 (base32 - "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd")))) + "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From c71bb3f29dadf9b748e4c98d430a437274741739 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:38:15 -0400 Subject: gnu: nautilus: Update to 3.30.5. * gnu/packages/gnome.scm (nautilus): Update to 3.30.5. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6d07e041a..85c4cc7625 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6226,7 +6226,7 @@ (define-public tracker (define-public nautilus (package (name "nautilus") - (version "3.30.4") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6234,7 +6234,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1")))) + "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 18138ab939090f11d70220e830e06101d7f6acf3 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:39:42 -0400 Subject: gnu: shared-mime-info: Update to 1.10. * gnu/packages/gnome.scm (shared-mime-info): Update to 1.10. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 85c4cc7625..25e3ee0e5a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -977,14 +977,14 @@ (define-public tango-icon-theme (define-public shared-mime-info (package (name "shared-mime-info") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/~hadess/" "shared-mime-info-" version ".tar.xz")) (sha256 (base32 - "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw")))) + "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6")))) (build-system gnu-build-system) (arguments ;; The build system appears not to be parallel-safe. -- cgit v1.2.3 From 77425f04f246426421d79b1928dd7484ee811390 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:46:22 -0400 Subject: gnu: totem: Update to 3.30.0. * gnu/packages/gnome.scm (totem): Update to 3.30.0. --- gnu/packages/gnome.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 25e3ee0e5a..f51f534748 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3305,7 +3305,7 @@ (define-public gnome-settings-daemon (define-public totem-pl-parser (package (name "totem-pl-parser") - (version "3.26.1") + (version "3.26.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/totem-pl-parser/" @@ -3313,7 +3313,7 @@ (define-public totem-pl-parser "totem-pl-parser-" version ".tar.xz")) (sha256 (base32 - "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka")))) + "13a45py2j1r9967zgww8kd24bn2fhycd4m3kzr90sxx9l2w03z8f")))) (build-system meson-build-system) (arguments ;; FIXME: Tests require gvfs. @@ -3835,7 +3835,7 @@ (define-public grilo-plugins (define-public totem (package (name "totem") - (version "3.26.2") + (version "3.30.0") (source (origin (method url-fetch) @@ -3844,7 +3844,7 @@ (define-public totem name "-" version ".tar.xz")) (sha256 (base32 - "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g")) + "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0")) (patches (search-patches "totem-meson-easy-codec.patch" "totem-meson-compat.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From bea6b829b89718f789d41c99301e7ce44dd21cf5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:23:47 -0400 Subject: gnu: gcr: Update to 3.28.1. * gnu/packages/gnome.scm (gcr): Update to 3.28.1. [native-inputs]: Add vala. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f51f534748..2d6b78c907 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -593,7 +593,7 @@ (define-public gnome-disk-utility (define-public gcr (package (name "gcr") - (version "3.28.0") + (version "3.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -601,7 +601,7 @@ (define-public gcr name "-" version ".tar.xz")) (sha256 (base32 - "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m")) + "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m")) (patches (list ;; This patch solves an ordering issue that showed up when @@ -643,6 +643,7 @@ (define-public gcr ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("libxml2" ,libxml2) + ("vala" ,vala) ("xsltproc" ,libxslt))) ;; mentioned in gck.pc, gcr.pc and gcr-ui.pc (propagated-inputs -- cgit v1.2.3 From 9d4d439b0a455e205da75515852a4147fe378d63 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:30:52 -0400 Subject: gnu: gnome-tweaks: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-tweaks): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2d6b78c907..a20db29e2a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6781,7 +6781,7 @@ (define-public gnome-dictionary (define-public gnome-tweaks (package (name "gnome-tweaks") - (version "3.30.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweaks/" @@ -6791,7 +6791,7 @@ (define-public gnome-tweaks (list (search-patch "gnome-tweaks-search-paths.patch"))) (sha256 (base32 - "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa")))) + "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From d054fbf57dacdf9bd177bb920d7f4c941dc1f9e9 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:35:02 -0400 Subject: gnu: gjs: Update to 1.56.2. * gnu/packages/gnome.scm (gjs): Update to 1.56.2. [arguments]: Adjust pre-check phase. [propagated-inputs]: Replace mozjs-52 with mozjs-60. --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a20db29e2a..3ddca75f81 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4812,7 +4812,7 @@ (define-public gnome-session (define-public gjs (package (name "gjs") - (version "1.52.3") + (version "1.56.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4820,7 +4820,7 @@ (define-public gjs name "-" version ".tar.xz")) (sha256 (base32 - "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff")))) + "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac")))) (build-system gnu-build-system) (arguments '(#:phases @@ -4840,6 +4840,9 @@ (define-public gjs (substitute* "installed-tests/js/testLocale.js" ((".*toBeDefined.*") "") ((".*expect\\(datestr\\).*") "")) + (substitute* "installed-tests/scripts/testCommandLine.sh" + (("Valentín") "") + (("☭") "")) #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources @@ -4853,7 +4856,7 @@ (define-public gjs ;; These are all in the Requires.private field of gjs-1.0.pc. `(("cairo" ,cairo) ("gobject-introspection" ,gobject-introspection) - ("mozjs" ,mozjs-52))) + ("mozjs" ,mozjs-60))) (inputs `(("gtk+" ,gtk+) ("readline" ,readline))) -- cgit v1.2.3 From f828d05b28ed79c63c0eb521350506ad3b42cbf8 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 6 Jul 2019 05:15:16 -0400 Subject: gnu: Add amtk. * gnu/packages/gnome.scm (amtk): New variable. --- gnu/packages/gnome.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3ddca75f81..92ba991fc2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3375,6 +3375,37 @@ (define-public aisleriot which are easy to play with the aid of a mouse.") (license license:gpl3+))) +(define-public amtk + (package + (name "amtk") + (version "5.0.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1zriix7bdwcg0868mfc7jy6zbwjwdmjwbh0ah6dbddrhiabrda8j")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--enable-gtk-doc"))) + (native-inputs + `(("gobject-introspection" ,gobject-introspection) + ("glib:bin" ,glib "bin") ; for glib-mkenums + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("gtk+" ,gtk+))) + (home-page "https://wiki.gnome.org/Projects/Amtk") + (synopsis "Actions, Menus and Toolbars Kit for GTK+ applications") + (description + "Amtk is the acronym for @acronym{Amtk, Actions Menus and Toolbars Kit}. +It is a basic GtkUIManager replacement based on GAction. It is suitable for +both a traditional UI or a modern UI with a GtkHeaderBar.") + (license license:lgpl2.1+))) + (define-public devhelp (package (name "devhelp") -- cgit v1.2.3 From 11d28bd9f654f292b61c876e093e62a5ea242660 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:36:55 -0400 Subject: gnu: devhelp: Update to 3.30.1. * gnu/packages/gnome.scm (devhelp): Update to 3.30.1. [build-system]: Use meson-build-system. [native-inputs]: Add gobject-introspection, glib:bin and gtk+:bin. [inputs]: Add amtk. --- gnu/packages/gnome.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 92ba991fc2..f9727ac477 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3409,7 +3409,7 @@ (define-public amtk (define-public devhelp (package (name "devhelp") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3417,14 +3417,18 @@ (define-public devhelp name "-" version ".tar.xz")) (sha256 (base32 - "08a8xizjqz68k30zd37r7g516azhan9bbrjsvv10hjd5dg3f476s")))) - (build-system glib-or-gtk-build-system) + "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a")))) + (build-system meson-build-system) (native-inputs `(("intltool" ,intltool) ("itstool" ,itstool) + ("gobject-introspection" ,gobject-introspection) + ("glib:bin" ,glib "bin") ; for glib-mkmenus + ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("pkg-config" ,pkg-config))) (inputs - `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + `(("amtk" ,amtk) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Devhelp") (synopsis "API documentation browser for GNOME") -- cgit v1.2.3 From 7734b4a2d9b0f5f63396bff2eb3d6598800eda5b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:40:38 -0400 Subject: gnu: gdm: Update to 3.30.3. * gnu/packages/gnome.scm (gdm): Update to 3.30.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f9727ac477..d13ab8ea43 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5599,7 +5599,7 @@ (define-public libxml++-2 (define-public gdm (package (name "gdm") - (version "3.30.2") + (version "3.30.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5607,7 +5607,7 @@ (define-public gdm name "-" version ".tar.xz")) (sha256 (base32 - "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y")))) + "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From b1a8b40818ed100a395b0e244457d2c6a6257912 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 6 Jul 2019 06:35:48 -0400 Subject: gnu: gexiv2: Update to 0.12.0. * gnu/packages/gnome.scm (gexiv2): Update to 0.12.0. [native-inputs]: Add gcr and vala. --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d13ab8ea43..04cd56f0d0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4655,7 +4655,7 @@ (define-public libgee (define-public gexiv2 (package (name "gexiv2") - (version "0.10.10") + (version "0.12.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4663,11 +4663,13 @@ (define-public gexiv2 name "-" version ".tar.xz")) (sha256 (base32 - "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx")))) + "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq")))) (build-system meson-build-system) (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) + `(("gcr" ,gcr) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (propagated-inputs ;; Listed in "Requires" section of gexiv2.pc `(("exiv2" ,exiv2))) -- cgit v1.2.3 From 3b79afa6a83a2d68109afb8f85ab82596a531b3d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:42:15 -0400 Subject: gnu: shotwell: Update to 0.30.4. * gnu/packages/gnome.scm (shotwell): Update to 0.30.4. [build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add desktop-file-utils. Remove itstool duplicate. Order inputs alphabetically. --- gnu/packages/gnome.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 04cd56f0d0..9ccdcbd83c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4687,7 +4687,7 @@ (define-public gexiv2 (define-public shotwell (package (name "shotwell") - (version "0.28.4") + (version "0.30.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4695,16 +4695,18 @@ (define-public shotwell name "-" version ".tar.xz")) (sha256 (base32 - "03k7n2kmzqn11kf3733w7m6xjh2b5q9xr84za2hli11fjymzaxm9")))) - (build-system glib-or-gtk-build-system) + "1yiz3j0y2yg6985y3alb3hpkfbv68n8ibys5gpwcjdhmhf3czg5p")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t)) (propagated-inputs `(("dconf" ,dconf))) (native-inputs - `(("pkg-config" ,pkg-config) - ("itstool" ,itstool) + `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("gettext" ,gettext-minimal) ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("itstool" ,itstool) + ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs `(("glib:bin" ,glib "bin") -- cgit v1.2.3 From 00b14dbb09f5ba8f6057b8f98041ead17ddd1809 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:53:48 -0400 Subject: gnu: cheese: Update to 3.30.0. * gnu/packages/gnome.scm (cheese): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ccdcbd83c..95b472a7b1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7718,7 +7718,7 @@ (define-public gnome-video-effects (define-public cheese (package (name "cheese") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7726,7 +7726,7 @@ (define-public cheese version ".tar.xz")) (sha256 (base32 - "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw")))) + "0zz2bgjaf2lsmfs3zn24925vbjb0rycr39i288brlbzixrpcyljr")))) (arguments ;; Tests require GDK. `(#:tests? #f -- cgit v1.2.3 From 676e7cb4fa054d7a2a21967dd4bf399bef04d7d3 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:55:38 -0400 Subject: gnu: gnome-screenshot: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-screenshot): Update to 3.30.0. [home-page]: Update URI. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 95b472a7b1..16b048b552 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6385,7 +6385,7 @@ (define-public gnome-backgrounds (define-public gnome-screenshot (package (name "gnome-screenshot") - (version "3.26.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -6394,7 +6394,7 @@ (define-public gnome-screenshot name "-" version ".tar.xz")) (sha256 (base32 - "1fy8fjl29i3xhj8caik03d3za06x96xgkk8r4fwz88iqbmci3g0v")))) + "06dx3svxq6sar4913mrz5lzb7hmc66wck138vmyxj8x8iv1iw0w8")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. @@ -6408,7 +6408,7 @@ (define-public gnome-screenshot ("libcanberra" ,libcanberra) ("libx11" ,libx11) ("libxext" ,libxext))) - (home-page "https://git.gnome.org/browse/gnome-screenshot") + (home-page "https://gitlab.gnome.org/GNOME/gnome-screenshot") (synopsis "Take pictures of your screen") (description "GNOME Screenshot is a utility used for taking screenshots of the entire -- cgit v1.2.3 From ef9b7d4c9fa25e57035f1a825db26a9ddb37ce16 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:58:08 -0400 Subject: gnu: orca: Update to 3.30.2. * gnu/packages/gnome.scm (orca): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 16b048b552..62c7937360 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7461,7 +7461,7 @@ (define-public python-pyatspi (define-public orca (package (name "orca") - (version "3.28.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append @@ -7470,7 +7470,7 @@ (define-public orca name "-" version ".tar.xz")) (sha256 (base32 - "04l5ccn7wf175gyq3blfpx0yh70ny06n161297jwc9idf951852g")))) + "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases -- cgit v1.2.3 From 2aabc647f2691cc10f93456b3379d57ac669204f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:00:08 -0400 Subject: gnu: gnome-shell-extensions: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-shell-extensions): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 62c7937360..101c5c009a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6882,7 +6882,7 @@ (define-public gnome-tweak-tool (define-public gnome-shell-extensions (package (name "gnome-shell-extensions") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6890,7 +6890,7 @@ (define-public gnome-shell-extensions name "-" version ".tar.xz")) (sha256 (base32 - "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9")))) + "1grxn4f5x754r172wmnf0h0xpy69afmj359zsj1rwgqlzw4i4c5p")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dextension_set=all"))) -- cgit v1.2.3 From 496d7ccd4d65599020f77d97c8930eecf597e26b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:03:08 -0400 Subject: gnu: gnome-calendar: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-calendar): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 101c5c009a..d1b8cdce58 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6693,7 +6693,7 @@ (define-public gnome-clocks (define-public gnome-calendar (package (name "gnome-calendar") - (version "3.28.2") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6701,7 +6701,7 @@ (define-public gnome-calendar name "-" version ".tar.xz")) (sha256 (base32 - "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw")))) + "1avi7a29y8d8kzwslp51nwy6s692alms7917454j0xpfc6hnw62s")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 757f863bd28cc4dd21372f7e087757bd25601d3c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:05:23 -0400 Subject: gnu: gnome-clocks: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-clocks): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d1b8cdce58..c7f0046109 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6655,7 +6655,7 @@ (define-public libzapojit (define-public gnome-clocks (package (name "gnome-clocks") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6663,7 +6663,7 @@ (define-public gnome-clocks name "-" version ".tar.xz")) (sha256 (base32 - "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl")))) + "009fr6zwv37wryi0c0syi4i7pxpdbn3gliws68l99cjsbn2qd6pc")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) -- cgit v1.2.3 From bc09c416317f08f8ef388ddee89f2ea38736960f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:06:47 -0400 Subject: gnu: dconf-editor: Update to 3.30.2. * gnu/packages/gnome.scm (dconf-editor): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c7f0046109..f242e7181f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6419,7 +6419,7 @@ (define-public gnome-screenshot (define-public dconf-editor (package (name "dconf-editor") - (version "3.28.0") + (version "3.30.2") (source (origin (method url-fetch) @@ -6428,7 +6428,7 @@ (define-public dconf-editor name "-" version ".tar.xz")) (sha256 (base32 - "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5")))) + "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. -- cgit v1.2.3 From 794ce8eaf72537d05a3ca460b9c189e96e683001 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:09:33 -0400 Subject: gnu: libgweather: Update to 3.28.3. * gnu/packages/gnome.scm (libgweather): Update to 3.28.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f242e7181f..ae5b85d9d0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3197,7 +3197,7 @@ (define-public upower (define-public libgweather (package (name "libgweather") - (version "3.28.2") + (version "3.28.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3205,7 +3205,7 @@ (define-public libgweather name "-" version ".tar.xz")) (sha256 (base32 - "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708")))) + "1xz60h59zgyk61y2wwzm0xlqav72i668g7v0x7rh9idz240hxls5")))) (build-system meson-build-system) (arguments `(#:tests? #f ; one of two tests requires network access -- cgit v1.2.3 From d619686250d8bb15bf67031f8ac80f9cfb400a26 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 14 Jul 2019 23:47:44 -0400 Subject: gnu: evolution-data-server: Fix locale handling. * gnu/packages/gnome.scm (evolution-data-server)[arguments]: Add a phase that patches the source code to fix a locale handling issue. --- gnu/packages/gnome.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ae5b85d9d0..f42b5064c9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5211,6 +5211,22 @@ (define-public evolution-data-server "tests/libedata-cal/test-cal-cache-utils.c") (("/bin/rm") (which "rm"))) #t)) + ;; This phase fixes locale canonicalization when using newer + ;; versions of ICU. The bug has been fixed upstream, and + ;; should appear starting in version 3.33.5. + ;; . + (add-after 'unpack 'patch-locale-canonicalization + (lambda _ + (substitute* "src/libedataserver/e-collator.c" + (("len = uloc_canonicalize \\(posix_locale,.*" x) + ((lambda (xs) (string-join xs "\n" 'suffix)) + (list + "if (posix_locale && (" + " g_ascii_strcasecmp(posix_locale, \"C\") == 0 ||" + " g_ascii_strcasecmp(posix_locale, \"POSIX\") == 0))" + " posix_locale = \"en_US_POSIX\";" + x)))) + #t)) (add-before 'configure 'dont-override-rpath (lambda _ (substitute* "CMakeLists.txt" -- cgit v1.2.3 From 5229bea128bc225583198d76678d758eafb83023 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 28 Jun 2019 09:52:22 -0400 Subject: gnu: evolution: Update to 3.30.5. * gnu/packages/gnome.scm (evolution): Update to 3.30.5. [arguments]: Add "patch-ui-module-dir", "glib-or-gtk-compile-schemas" and "glib-or-gtk-wrap" phases. --- gnu/packages/gnome.scm | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f42b5064c9..3b5deb2a82 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8016,7 +8016,7 @@ (define-public libdazzle (define-public evolution (package (name "evolution") - (version "3.28.1") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evolution/" @@ -8024,13 +8024,34 @@ (define-public evolution "evolution-" version ".tar.xz")) (sha256 (base32 - "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l")))) + "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:imported-modules (,@%cmake-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:configure-flags (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged - "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release + "-DENABLE_LIBCRYPTUI=OFF") ; libcryptui hasn't seen a release ; in four years and cannot be built. + #:phases + (modify-phases %standard-phases + ;; The build system attempts to install user interface modules to the + ;; output directory of the "evolution-data-server" package. This + ;; change redirects that change. + (add-after 'unpack 'patch-ui-module-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/modules/alarm-notify/CMakeLists.txt" + (("\\$\\{edsuimoduledir\\}") + (string-append (assoc-ref outputs "out") + "/lib/evolution-data-server/ui-modules"))) + #t)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 68c3ca933d1621586b9e73944b194e5304130198 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 28 Jun 2019 08:33:25 -0400 Subject: gnu: evolution-data-server: Update to 3.30.5. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.30.5. [arguments]: Remove "-std=gnu++11" configure flag. Disable more failing tests. --- gnu/packages/gnome.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3b5deb2a82..b0bbc12cdf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5155,7 +5155,7 @@ (define-public gnome-online-accounts (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.30.2") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5163,7 +5163,7 @@ (define-public evolution-data-server name "-" version ".tar.xz")) (sha256 (base32 - "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv")))) + "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli")))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -5177,13 +5177,11 @@ (define-public evolution-data-server "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication "-DENABLE_VALA_BINDINGS=ON" - ;; FIXME: Building against ICU 60 requires C++11 or higher. Remove - ;; "-std=gnu++11" when our default compiler is >= GCC6. ;; FIXME: Temporarily use "-DU_USING_ICU_NAMESPACE=1" until ;; evolution-data-server has been updated to qualify ICU types ;; explicitly, as required by ICU 61 and later. See: ;; - "-DCMAKE_CXX_FLAGS=-std=gnu++11 -DU_USING_ICU_NAMESPACE=1" + "-DU_USING_ICU_NAMESPACE=1" (string-append "-DCMAKE_INSTALL_RPATH=" lib ";" (string-append lib "/evolution-data-server;") (string-join runpaths ";")) -- cgit v1.2.3 From 3d0b40ad7c369534f7f4c0c148b5b3b3ddc73542 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 19:09:15 +0200 Subject: gnu: evolution-data-server: Remove obsolete workaround. * gnu/packages/gnome.scm (evolution-data-server)[arguments]: Do not pass "-DU_USING_ICU_NAMESPACE" in <#:configure-flags>. --- gnu/packages/gnome.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b0bbc12cdf..dc36d052c5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5177,11 +5177,6 @@ (define-public evolution-data-server "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication "-DENABLE_VALA_BINDINGS=ON" - ;; FIXME: Temporarily use "-DU_USING_ICU_NAMESPACE=1" until - ;; evolution-data-server has been updated to qualify ICU types - ;; explicitly, as required by ICU 61 and later. See: - ;; - "-DU_USING_ICU_NAMESPACE=1" (string-append "-DCMAKE_INSTALL_RPATH=" lib ";" (string-append lib "/evolution-data-server;") (string-join runpaths ";")) -- cgit v1.2.3 From 0de9a1be04a2f93bcdf81bdb0f6c2dca12225974 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Jul 2019 15:58:34 +0200 Subject: gnu: gnome-control-center: Shorten patch file name. * gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch: Rename to... * gnu/packages/patches/gnome-control-center-udisks.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (gnome-control-center)[source]: Likewise. --- gnu/local.mk | 2 +- gnu/packages/gnome.scm | 3 +- .../patches/gnome-control-center-udisks.patch | 221 +++++++++++++++++++++ ...ontrol-center-use-udisks-to-get-disk-size.patch | 221 --------------------- 4 files changed, 223 insertions(+), 224 deletions(-) create mode 100644 gnu/packages/patches/gnome-control-center-udisks.patch delete mode 100644 gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index c41836ad3c..49c3826685 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -889,7 +889,7 @@ dist_patch_DATA = \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ - %D%/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch \ + %D%/packages/patches/gnome-control-center-udisks.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 46dd268f8f..beaba3b4c5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5941,8 +5941,7 @@ (define-public gnome-control-center (base32 "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r")) (patches - (search-patches - "gnome-control-center-use-udisks-to-get-disk-size.patch")))) + (search-patches "gnome-control-center-udisks.patch")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/gnome-control-center-udisks.patch b/gnu/packages/patches/gnome-control-center-udisks.patch new file mode 100644 index 0000000000..823684b2e9 --- /dev/null +++ b/gnu/packages/patches/gnome-control-center-udisks.patch @@ -0,0 +1,221 @@ +This patch is derived from upstream commit 2520aea6 and fixes upstream issues +285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387, +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302. + +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + +@@ -81,9 +82,7 @@ typedef struct + + GCancellable *cancellable; + +- /* Free space */ +- GList *primary_mounts; +- guint64 total_bytes; ++ UDisksClient *client; + + GraphicsData *graphics_data; + } CcInfoOverviewPanelPrivate; +@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel + CcInfoOverviewPanelPrivate *priv; + }; + +-static void get_primary_disc_info_start (CcInfoOverviewPanel *self); +- + typedef struct + { + char *major; +@@ -486,111 +483,51 @@ get_os_type (void) + } + + static void +-query_done (GFile *file, +- GAsyncResult *res, +- CcInfoOverviewPanel *self) ++get_primary_disc_info (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv; +- g_autoptr(GFileInfo) info = NULL; +- g_autoptr(GError) error = NULL; +- +- info = g_file_query_filesystem_info_finish (file, res, &error); +- if (info != NULL) +- { +- priv = cc_info_overview_panel_get_instance_private (self); +- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); +- } +- else +- { +- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) +- return; +- else +- { +- g_autofree char *path = NULL; +- path = g_file_get_path (file); +- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message); +- } +- } ++ GDBusObjectManager *manager; ++ g_autolist(GDBusObject) objects = NULL; ++ GList *l; ++ guint64 total_size; + +- /* And onto the next element */ +- get_primary_disc_info_start (self); +-} +- +-static void +-get_primary_disc_info_start (CcInfoOverviewPanel *self) +-{ +- GUnixMountEntry *mount; +- g_autoptr(GFile) file = NULL; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ priv = cc_info_overview_panel_get_instance_private (self); ++ total_size = 0; + +- if (priv->primary_mounts == NULL) ++ if (!priv->client) + { +- g_autofree char *size = NULL; +- +- size = g_format_size (priv->total_bytes); +- gtk_label_set_text (GTK_LABEL (priv->disk_label), size); +- ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); + return; + } + +- mount = priv->primary_mounts->data; +- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount); +- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount)); +- g_unix_mount_free (mount); +- +- g_file_query_filesystem_info_async (file, +- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, +- 0, +- priv->cancellable, +- (GAsyncReadyCallback) query_done, +- self); +-} +- +-static void +-get_primary_disc_info (CcInfoOverviewPanel *self) +-{ +- GList *points; +- GList *p; +- GHashTable *hash; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); +- +- hash = g_hash_table_new (g_str_hash, g_str_equal); +- points = g_unix_mount_points_get (NULL); +- +- /* If we do not have /etc/fstab around, try /etc/mtab */ +- if (points == NULL) +- points = g_unix_mounts_get (NULL); ++ manager = udisks_client_get_object_manager (priv->client); ++ objects = g_dbus_object_manager_get_objects (manager); + +- for (p = points; p != NULL; p = p->next) ++ for (l = objects; l != NULL; l = l->next) + { +- GUnixMountEntry *mount = p->data; +- const char *mount_path; +- const char *device_path; +- +- mount_path = g_unix_mount_get_mount_path (mount); +- device_path = g_unix_mount_get_device_path (mount); +- +- /* Do not count multiple mounts with same device_path, because it is +- * probably something like btrfs subvolume. Use only the first one in +- * order to count the real size. */ +- if (gsd_should_ignore_unix_mount (mount) || +- gsd_is_removable_mount (mount) || +- g_str_has_prefix (mount_path, "/media/") || +- g_str_has_prefix (mount_path, g_get_home_dir ()) || +- g_hash_table_lookup (hash, device_path) != NULL) ++ UDisksDrive *drive; ++ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data)); ++ ++ /* Skip removable devices */ ++ if (drive == NULL || ++ udisks_drive_get_removable (drive) || ++ udisks_drive_get_ejectable (drive)) + { +- g_unix_mount_free (mount); + continue; + } + +- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount); +- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); ++ total_size += udisks_drive_get_size (drive); + } +- g_list_free (points); +- g_hash_table_destroy (hash); + +- priv->cancellable = g_cancellable_new (); +- get_primary_disc_info_start (self); ++ if (total_size > 0) ++ { ++ g_autofree gchar *size = g_format_size (total_size); ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), size); ++ } ++ else ++ { ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); ++ } + } + + static char * +@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object) + g_clear_object (&priv->cancellable); + } + +- if (priv->primary_mounts) +- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free); ++ g_clear_object (&priv->client); + + g_free (priv->gnome_version); + g_free (priv->gnome_date); +@@ -895,6 +831,7 @@ static void + cc_info_overview_panel_init (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ g_autoptr(GError) error = NULL; + + gtk_widget_init_template (GTK_WIDGET (self)); + +@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) + else + gtk_widget_destroy (priv->updates_button); + ++ priv->client = udisks_client_new_sync (NULL, &error); ++ ++ if (error != NULL) ++ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.", ++ error->message); ++ + info_overview_panel_setup_overview (self); + info_overview_panel_setup_virt (self); + } +diff --git a/panels/info/meson.build b/panels/info/meson.build +index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644 +--- a/panels/info/meson.build ++++ b/panels/info/meson.build +@@ -61,6 +61,7 @@ sources += gnome.compile_resources( + + deps = common_deps + [ + polkit_gobject_dep, ++ dependency('udisks2', version: '>= 2.1.8'), + dependency('libgtop-2.0') + ] + diff --git a/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch b/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch deleted file mode 100644 index 823684b2e9..0000000000 --- a/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch +++ /dev/null @@ -1,221 +0,0 @@ -This patch is derived from upstream commit 2520aea6 and fixes upstream issues -285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387, -https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and -https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302. - -diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c -index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644 ---- a/panels/info/cc-info-overview-panel.c -+++ b/panels/info/cc-info-overview-panel.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - #include - -@@ -81,9 +82,7 @@ typedef struct - - GCancellable *cancellable; - -- /* Free space */ -- GList *primary_mounts; -- guint64 total_bytes; -+ UDisksClient *client; - - GraphicsData *graphics_data; - } CcInfoOverviewPanelPrivate; -@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel - CcInfoOverviewPanelPrivate *priv; - }; - --static void get_primary_disc_info_start (CcInfoOverviewPanel *self); -- - typedef struct - { - char *major; -@@ -486,111 +483,51 @@ get_os_type (void) - } - - static void --query_done (GFile *file, -- GAsyncResult *res, -- CcInfoOverviewPanel *self) -+get_primary_disc_info (CcInfoOverviewPanel *self) - { - CcInfoOverviewPanelPrivate *priv; -- g_autoptr(GFileInfo) info = NULL; -- g_autoptr(GError) error = NULL; -- -- info = g_file_query_filesystem_info_finish (file, res, &error); -- if (info != NULL) -- { -- priv = cc_info_overview_panel_get_instance_private (self); -- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); -- } -- else -- { -- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -- return; -- else -- { -- g_autofree char *path = NULL; -- path = g_file_get_path (file); -- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message); -- } -- } -+ GDBusObjectManager *manager; -+ g_autolist(GDBusObject) objects = NULL; -+ GList *l; -+ guint64 total_size; - -- /* And onto the next element */ -- get_primary_disc_info_start (self); --} -- --static void --get_primary_disc_info_start (CcInfoOverviewPanel *self) --{ -- GUnixMountEntry *mount; -- g_autoptr(GFile) file = NULL; -- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); -+ priv = cc_info_overview_panel_get_instance_private (self); -+ total_size = 0; - -- if (priv->primary_mounts == NULL) -+ if (!priv->client) - { -- g_autofree char *size = NULL; -- -- size = g_format_size (priv->total_bytes); -- gtk_label_set_text (GTK_LABEL (priv->disk_label), size); -- -+ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); - return; - } - -- mount = priv->primary_mounts->data; -- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount); -- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount)); -- g_unix_mount_free (mount); -- -- g_file_query_filesystem_info_async (file, -- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, -- 0, -- priv->cancellable, -- (GAsyncReadyCallback) query_done, -- self); --} -- --static void --get_primary_disc_info (CcInfoOverviewPanel *self) --{ -- GList *points; -- GList *p; -- GHashTable *hash; -- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); -- -- hash = g_hash_table_new (g_str_hash, g_str_equal); -- points = g_unix_mount_points_get (NULL); -- -- /* If we do not have /etc/fstab around, try /etc/mtab */ -- if (points == NULL) -- points = g_unix_mounts_get (NULL); -+ manager = udisks_client_get_object_manager (priv->client); -+ objects = g_dbus_object_manager_get_objects (manager); - -- for (p = points; p != NULL; p = p->next) -+ for (l = objects; l != NULL; l = l->next) - { -- GUnixMountEntry *mount = p->data; -- const char *mount_path; -- const char *device_path; -- -- mount_path = g_unix_mount_get_mount_path (mount); -- device_path = g_unix_mount_get_device_path (mount); -- -- /* Do not count multiple mounts with same device_path, because it is -- * probably something like btrfs subvolume. Use only the first one in -- * order to count the real size. */ -- if (gsd_should_ignore_unix_mount (mount) || -- gsd_is_removable_mount (mount) || -- g_str_has_prefix (mount_path, "/media/") || -- g_str_has_prefix (mount_path, g_get_home_dir ()) || -- g_hash_table_lookup (hash, device_path) != NULL) -+ UDisksDrive *drive; -+ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data)); -+ -+ /* Skip removable devices */ -+ if (drive == NULL || -+ udisks_drive_get_removable (drive) || -+ udisks_drive_get_ejectable (drive)) - { -- g_unix_mount_free (mount); - continue; - } - -- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount); -- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); -+ total_size += udisks_drive_get_size (drive); - } -- g_list_free (points); -- g_hash_table_destroy (hash); - -- priv->cancellable = g_cancellable_new (); -- get_primary_disc_info_start (self); -+ if (total_size > 0) -+ { -+ g_autofree gchar *size = g_format_size (total_size); -+ gtk_label_set_text (GTK_LABEL (priv->disk_label), size); -+ } -+ else -+ { -+ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); -+ } - } - - static char * -@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object) - g_clear_object (&priv->cancellable); - } - -- if (priv->primary_mounts) -- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free); -+ g_clear_object (&priv->client); - - g_free (priv->gnome_version); - g_free (priv->gnome_date); -@@ -895,6 +831,7 @@ static void - cc_info_overview_panel_init (CcInfoOverviewPanel *self) - { - CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); -+ g_autoptr(GError) error = NULL; - - gtk_widget_init_template (GTK_WIDGET (self)); - -@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) - else - gtk_widget_destroy (priv->updates_button); - -+ priv->client = udisks_client_new_sync (NULL, &error); -+ -+ if (error != NULL) -+ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.", -+ error->message); -+ - info_overview_panel_setup_overview (self); - info_overview_panel_setup_virt (self); - } -diff --git a/panels/info/meson.build b/panels/info/meson.build -index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644 ---- a/panels/info/meson.build -+++ b/panels/info/meson.build -@@ -61,6 +61,7 @@ sources += gnome.compile_resources( - - deps = common_deps + [ - polkit_gobject_dep, -+ dependency('udisks2', version: '>= 2.1.8'), - dependency('libgtop-2.0') - ] - -- cgit v1.2.3 From e1f174ae284d9954840f1723ac012c0d3fbcecb4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 19 Jul 2019 10:36:21 -0400 Subject: gnu: evolution-data-server: Use a proper patch for locales. See . * gnu/packages/patches/evolution-data-server-locales.patch: New file. * gnu/local.mk: Add it. * gnu/packages/gnome.scm (evolution-data-server): Replace the 'patch-locale-canonicalization' phase with the new patch. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 17 +---------- .../patches/evolution-data-server-locales.patch | 33 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 gnu/packages/patches/evolution-data-server-locales.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 528ad703a4..c95a5c8126 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -780,6 +780,7 @@ dist_patch_DATA = \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ + %D%/packages/patches/evolution-data-server-locales.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index beaba3b4c5..9190301ee9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5162,6 +5162,7 @@ (define-public evolution-data-server (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "evolution-data-server-locales.patch")) (sha256 (base32 "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli")))) @@ -5205,22 +5206,6 @@ (define-public evolution-data-server "tests/libedata-cal/test-cal-cache-utils.c") (("/bin/rm") (which "rm"))) #t)) - ;; This phase fixes locale canonicalization when using newer - ;; versions of ICU. The bug has been fixed upstream, and - ;; should appear starting in version 3.33.5. - ;; . - (add-after 'unpack 'patch-locale-canonicalization - (lambda _ - (substitute* "src/libedataserver/e-collator.c" - (("len = uloc_canonicalize \\(posix_locale,.*" x) - ((lambda (xs) (string-join xs "\n" 'suffix)) - (list - "if (posix_locale && (" - " g_ascii_strcasecmp(posix_locale, \"C\") == 0 ||" - " g_ascii_strcasecmp(posix_locale, \"POSIX\") == 0))" - " posix_locale = \"en_US_POSIX\";" - x)))) - #t)) (add-before 'configure 'dont-override-rpath (lambda _ (substitute* "CMakeLists.txt" diff --git a/gnu/packages/patches/evolution-data-server-locales.patch b/gnu/packages/patches/evolution-data-server-locales.patch new file mode 100644 index 0000000000..48baefb0d8 --- /dev/null +++ b/gnu/packages/patches/evolution-data-server-locales.patch @@ -0,0 +1,33 @@ +This patch fixes locale canonicalization when using newer versions of +ICU. It comes from the upstream repo, and should appear starting in +version 3.33.5. + +From fe4ac94ce3c14f200e049a5d102fc0e4b811c71e Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 16 Jul 2019 07:22:07 +0200 +Subject: [PATCH] I#137 - POSIX locale tests fail with ICU 64.x + +Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/137 +--- + src/libedataserver/e-collator.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/libedataserver/e-collator.c b/src/libedataserver/e-collator.c +index 718eac5da..ec2cf7951 100644 +--- a/src/libedataserver/e-collator.c ++++ b/src/libedataserver/e-collator.c +@@ -132,6 +132,11 @@ canonicalize_locale (const gchar *posix_locale, + gint len; + const gchar *collation_type = NULL; + ++ if (posix_locale && ( ++ g_ascii_strcasecmp (posix_locale, "C") == 0 || ++ g_ascii_strcasecmp (posix_locale, "POSIX") == 0)) ++ posix_locale = "en_US_POSIX"; ++ + len = uloc_canonicalize (posix_locale, locale_buffer, LOCALE_BUFFER_LEN, &status); + + if (U_FAILURE (status)) { +-- +2.22.0 + -- cgit v1.2.3 From 1c9b99234c8322467ca22be70a94aa1678658476 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 19 Jul 2019 12:05:58 -0400 Subject: gnu: gnome-session: Do not patch in absolute paths. This is no longer needed as upstream is now using absolute paths. * gnu/packages/gnome.scm (gnome-session): Remove phase that patches absolute paths into the session desktop entry files. --- gnu/packages/gnome.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9190301ee9..3ac5025fce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4806,14 +4806,6 @@ (define-public gnome-session (out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/gnome-session") `("PATH" ":" prefix (,(string-append glib "/bin")))) - #t))) - (add-after 'install 'add-absolute-paths-to-desktop-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (substitute* (map (lambda (x) - (string-append out "/share/xsessions/" x)) - '("gnome.desktop" "gnome-xorg.desktop")) - (("gnome-session") (string-append out "/bin/gnome-session"))) #t)))) #:configure-flags -- cgit v1.2.3 From 0a6e9e13c54fb8a4574c9e1eb4e6d243f45b12ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 14:37:58 +0200 Subject: gnu: Remove workarounds for missing libarchive nettle propagation. * gnu/packages/gnome.scm (brasero, libgxps, aisleriot, grilo, grilo-plugins, totem, rhythmbox, gvfs, d-feet, gnome-session, gnome-autoar, tracker, nautilus)[inputs]: Remove NETTLE. * gnu/packages/linux.scm (singularity)[inputs]: Likewise. * gnu/packages/mate.scm (atril)[inputs]: Likewise. * gnu/packages/package-management.scm (rpm, libostree, flatpak)[inputs]: Likewise. --- gnu/packages/gnome.scm | 22 +++------------------- gnu/packages/linux.scm | 2 -- gnu/packages/mate.scm | 2 -- gnu/packages/package-management.scm | 4 ---- 4 files changed, 3 insertions(+), 27 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e8c26f5370..e2ecc1bb6a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -223,7 +223,6 @@ (define-public brasero ("libnotify" ,libnotify) ("libsm" ,libsm) ("libxml2" ,libxml2) - ("nettle" ,nettle) ("totem-pl-parser" ,totem-pl-parser))) (home-page "https://projects.gnome.org/brasero/") (synopsis "CD/DVD burning tool for Gnome") @@ -428,8 +427,7 @@ (define-public libgxps `(("gtk+" ,gtk+) ("libjpeg" ,libjpeg-turbo) ("lcms" ,lcms) - ("libtiff" ,libtiff) - ("nettle" ,nettle))) + ("libtiff" ,libtiff))) (propagated-inputs ;; In Requires of libgxps.pc. `(("cairo" ,cairo) @@ -818,10 +816,6 @@ (define-public evince ("libcanberra" ,libcanberra) ("libsecret" ,libsecret) - ;; XXX: 'libarchive.pc' adds '-lnettle' so Nettle should really be - ;; propagated from there. - ("nettle" ,nettle) - ;; For tests. ("dogtail" ,python2-dogtail))) (native-inputs @@ -3332,8 +3326,7 @@ (define-public totem-pl-parser ("libgcrypt" ,libgcrypt) ("libxml2" ,libxml2))) (inputs - `(("nettle" ,nettle) - ("libsoup" ,libsoup))) + `(("libsoup" ,libsoup))) (home-page "https://projects.gnome.org/totem") (synopsis "Library to parse and save media playlists for GNOME") (description "Totem-pl-parser is a GObjects-based library to parse and save @@ -3788,7 +3781,6 @@ (define-public grilo ("libxml2" ,libxml2) ("liboauth" ,liboauth) ("libsoup" ,libsoup) - ("nettle" ,nettle) ("totem-pl-parser" ,totem-pl-parser))) (arguments `(#:phases @@ -3837,7 +3829,6 @@ (define-public grilo-plugins ("pkg-config" ,pkg-config))) (inputs `(("grilo" ,grilo) - ("nettle" ,nettle) ; XXX: required by libgrlpls-0.3.la ("glib" ,glib) ("libxml2" ,libxml2) ("sqlite" ,sqlite) @@ -3926,7 +3917,6 @@ (define-public totem ("totem-pl-parser" ,totem-pl-parser) ("grilo" ,grilo) ("grilo-plugins" ,grilo-plugins) - ("nettle" ,nettle) ("vala" ,vala))) (arguments `(#:glib-or-gtk? #t @@ -4028,7 +4018,6 @@ (define-public rhythmbox ("python-pygobject" ,python2-pygobject) ("vala" ,vala) ("gmime" ,gmime) - ("nettle" ,nettle) ("adwaita-icon-theme" ,adwaita-icon-theme) ("grilo" ,grilo) ("grilo-plugins" ,grilo-plugins) @@ -4244,7 +4233,6 @@ (define-public gvfs ("libsmbclient" ,samba) ("libsoup" ,libsoup) ("libxml2" ,libxml2) - ("nettle" ,nettle) ; XXX: required by libarchive.pc ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) @@ -4760,7 +4748,6 @@ (define-public file-roller ("json-glib" ,json-glib) ("libarchive" ,libarchive) ("libnotify" ,libnotify) - ("nettle" ,nettle) ("itstool" ,itstool) ("libxml2" ,libxml2))) (synopsis "Graphical archive manager for GNOME") @@ -6217,8 +6204,7 @@ (define-public gnome-autoar (propagated-inputs `(("libarchive" ,libarchive))) ; XXX document why (inputs - `(("gtk+" ,gtk+) - ("nettle" ,nettle))) ; XXX: required by libarchive.pc + `(("gtk+" ,gtk+))) (synopsis "Archives integration support for GNOME") (home-page "https://git.gnome.org/browse/gnome-autoar/") (description @@ -6286,7 +6272,6 @@ (define-public tracker ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("sqlite" ,sqlite) - ("nettle" ,nettle) ; XXX why is this needed? ("python" ,python) ("poppler" ,poppler) ("libgsf" ,libgsf) @@ -6355,7 +6340,6 @@ (define-public nautilus ("gnome-autoar" ,gnome-autoar) ("libseccomp" ,libseccomp) ("libselinux" ,libselinux) - ("nettle" ,nettle) ; XXX required by libarchive.pc via gnome-autoar ("tracker" ,tracker) ;; XXX: gtk+ is required by libnautilus-extension.pc ;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8b7a31d110..998f197304 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -90,7 +90,6 @@ (define-module (gnu packages linux) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) - #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) #:use-module (gnu packages nss) @@ -3182,7 +3181,6 @@ (define-public singularity (inputs `(("libarchive" ,libarchive) ("python" ,python-wrapper) - ("nettle" ,nettle) ("zlib" ,zlib) ("squashfs-tools" ,squashfs-tools))) (home-page "https://singularity.lbl.gov/") diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 9e9fda0929..ba90ccec73 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -56,7 +56,6 @@ (define-module (gnu packages mate) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages messaging) - #:use-module (gnu packages nettle) #:use-module (gnu packages nss) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pdf) @@ -819,7 +818,6 @@ (define-public atril ("libgnome-keyring" ,libgnome-keyring) ("libarchive" ,libarchive) ("marco" ,marco) - ("nettle" ,nettle) ("openjpeg" ,openjpeg-1) ("pango" ,pango) ;;("texlive" ,texlive) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b641340a1a..84bb3542f1 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -58,7 +58,6 @@ (define-module (gnu packages package-management) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) - #:use-module (gnu packages nettle) #:use-module (gnu packages nss) #:use-module (gnu packages patchutils) #:use-module (gnu packages perl) @@ -542,7 +541,6 @@ (define-public rpm ("nss" ,nss) ("nspr" ,nspr) ("libarchive" ,libarchive) - ("nettle" ,nettle) ;XXX: actually a dependency of libarchive ("file" ,file) ("bzip2" ,bzip2) ("zlib" ,zlib) @@ -1012,7 +1010,6 @@ (define-public libostree ("gpgme" ,gpgme) ("libarchive" ,libarchive) ("libsoup" ,libsoup) - ("nettle" ,nettle) ; required by 'libarchive.la' ("util-linux" ,util-linux))) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgrades") @@ -1071,7 +1068,6 @@ (define-public flatpak ("libsoup" ,libsoup) ("libxau" ,libxau) ("libxml2" ,libxml2) - ("nettle" ,nettle) ("util-linux" ,util-linux))) (home-page "https://flatpak.org") (synopsis "System for building, distributing, and running sandboxed desktop -- cgit v1.2.3 From a830d14d4be2f81192e49a91a21a15121808e0a8 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 14 Aug 2019 19:23:02 +0200 Subject: gnu: Add libgit2-glib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libgit2-glib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da6cbf2a05..d5e46e09c1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8283,3 +8283,35 @@ (define-public libhandy (description "The aim of the handy library is to help with developing user intefaces for mobile devices using GTK+.") (license license:lgpl2.1+))) + +(define-public libgit2-glib + (package + (name "libgit2-glib") + (version "0.28.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7")))) + (build-system meson-build-system) + (native-inputs + `(("glib:bin" ,glib "bin") ;; For glib-mkenums + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("libssh2" ,libssh2) + ("pkg-config" ,pkg-config) + ("python-pygobject" ,python-pygobject) + ("python-wrapper" ,python-wrapper) + ("vala" ,vala))) + (inputs + `(("glib" ,glib) + ("libgit2" ,libgit2))) + (synopsis "GLib wrapper around the libgit2 Git access library") + (description "libgit2-glib is a GLib wrapper library around the libgit2 Git +access library. It only implements the core plumbing functions, not really the +higher level porcelain stuff.") + (home-page "https://wiki.gnome.org/Projects/Libgit2-glib") + (license license:gpl2+))) -- cgit v1.2.3 From 64c70430ec80c93faff6139fdb9d3de92704b81e Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 19 Jul 2019 16:15:09 -0400 Subject: gnu: gnome-control-center: Fix info-overview panel issues. GNOME Control Center should now display the correct GNOME version and graphics information in the "Details > About" panel. * gnu/packages/gnome.scm (gnome-control-center)[arguments]: Add configure flag. Adjust 'patch-paths' phase accordingly. [inputs]: Add gnome-session. --- gnu/packages/gnome.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d5e46e09c1..bfc055eed4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5967,7 +5967,10 @@ (define-public gnome-control-center (arguments '(#:glib-or-gtk? #t #:configure-flags - (list "-Dcheese=false") + (list "-Dcheese=false" + (string-append "-Dgnome_session_libexecdir=" + (assoc-ref %build-inputs "gnome-session") + "/libexec")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths @@ -5975,7 +5978,8 @@ (define-public gnome-control-center (let ((libc (assoc-ref inputs "libc")) (tzdata (assoc-ref inputs "tzdata")) (libgnomekbd (assoc-ref inputs "libgnomekbd")) - (nm-applet (assoc-ref inputs "network-manager-applet"))) + (nm-applet (assoc-ref inputs "network-manager-applet")) + (gnome-desktop (assoc-ref inputs "gnome-desktop"))) (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) @@ -5995,6 +5999,10 @@ (define-public gnome-control-center (substitute* '("panels/user-accounts/run-passwd.c") (("/usr/bin/passwd") "/run/setuid-programs/passwd")) + (substitute* "panels/info/cc-info-overview-panel.c" + (("DATADIR \"/gnome/gnome-version.xml\"") + (string-append "\"" gnome-desktop + "/share/gnome/gnome-version.xml\""))) #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. @@ -6014,6 +6022,7 @@ (define-public gnome-control-center ("gnome-desktop" ,gnome-desktop) ("gnome-online-accounts" ,gnome-online-accounts) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("gnome-session" ,gnome-session) ("gnome-settings-daemon" ,gnome-settings-daemon) ("grilo" ,grilo) ("ibus" ,ibus) -- cgit v1.2.3 From 64fa66ba3d7a5c186dffca983634d177aeb949cf Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 20 Aug 2019 11:23:02 +0200 Subject: gnu: libdazzle: Update to 3.33.90. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libdazzle): Update to 3.33.90. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bfc055eed4..6ef6fdfc42 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8051,7 +8051,7 @@ (define-public ghex (define-public libdazzle (package (name "libdazzle") - (version "3.28.5") + (version "3.33.90") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libdazzle/" @@ -8059,17 +8059,11 @@ (define-public libdazzle "libdazzle-" version ".tar.xz")) (sha256 (base32 - "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg")))) + "189m7q88d1a7bq0yyal9f3yhm9kz46lb61379nn4wsnnhpa1d0qs")))) (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-test - (lambda _ - ;; Disable failing test. - (substitute* "tests/meson.build" - (("test\\('test-application") "#")) - #t)) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. -- cgit v1.2.3 From fa8ef3ed70a81771e888d6e7cdcc6612fadbdbda Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 02:44:25 +0200 Subject: gnu: eolie: Update to 0.9.63. * gnu/packages/gnome.scm (eolie): Update to 0.9.63. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6ef6fdfc42..ab2c819db4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4312,15 +4312,15 @@ (define-public simple-scan (define-public eolie (package (name "eolie") - (version "0.9.62") + (version "0.9.63") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/eolie/" - "uploads/bb4aad19272cc636bd17f2f6602127fe/" + "uploads/d42b466752729a0d3fa828a721e25043/" "eolie-" version ".tar.xz")) (sha256 (base32 - "06v76hg87fnhw45dil5vvl20myvaa38n1jqsl0lmkkq6af4mk8wx")))) + "11pp8g0w22h1q0bbj9517l5838gcymvvp8fp9kh6h2dmgir2ssih")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From d41ee146ce8ef77b36b37354f47c7e9aa470e3c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 03:24:42 +0200 Subject: gnu: libhandy: Update to 0.0.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libhandy): Update to 0.0.11. [arguments]: Remove ‘disable-broken-test’ phase. [native-inputs]: Add hicolor-icon-theme. --- gnu/packages/gnome.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab2c819db4..a30fc8460c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8242,7 +8242,7 @@ (define-public terminator (define-public libhandy (package (name "libhandy") - (version "0.0.10") + (version "0.0.11") (source (origin (method git-fetch) @@ -8251,7 +8251,7 @@ (define-public libhandy (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1702hbdqhfpgw0c4vj2ag08vgl83byiryrbngbq11b9azmj3jhzs")))) + (base32 "0622zp5wrvn5bvgardijxd11y76g1i54fs32y03dw9nrar7i6vb0")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -8259,12 +8259,6 @@ (define-public libhandy "-Dgtk_doc=true") #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-broken-test - (lambda _ - ;; This test fails for unknown reasons - (substitute* "tests/meson.build" - (("'test-dialog',") "")) - #t)) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. @@ -8280,7 +8274,10 @@ (define-public libhandy ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server) + + ;; Test suite dependencies. + ("hicolor-icon-theme" ,hicolor-icon-theme))) (home-page "https://source.puri.sm/Librem5/libhandy") (synopsis "Library full of GTK+ widgets for mobile phones") (description "The aim of the handy library is to help with developing user -- cgit v1.2.3 From 5f39050b1eb74d371bd1ddabeb40d4339cc35158 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 2 Sep 2019 15:15:31 +0200 Subject: gnu: libxklavier: Update to 5.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libxklavier): Update to 5.4. [source] Switch to git source. [arguments] Add no-configure phase. Disable xmodmap in #:configure-flags. [inputs] Add which, intltool, gtk-doc, which, automake, autoconf and libtool. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a30fc8460c..efe5206e53 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2537,24 +2537,40 @@ (define-public json-glib (define-public libxklavier (package (name "libxklavier") - (version "5.3") + (version "5.4") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - version "/" name "-" version ".tar.xz")) + ;; Note: There's no tarball at ftp.gnome.org for this version. + (method git-fetch) + (uri (git-reference + (url "https://anongit.freedesktop.org/git/libxklavier") + (commit (string-append "libxklavier-" version)))) (sha256 (base32 - "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b")))) + "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:configure-flags + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'no-configure + (lambda* _ + (setenv "NOCONFIGURE" "1") + #t))) + #:configure-flags (list (string-append "--with-xkb-base=" (assoc-ref %build-inputs "xkeyboard-config") - "/share/X11/xkb")))) + "/share/X11/xkb") + "--disable-xmodmap-support"))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("which" ,which) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (propagated-inputs ;; Required by libxklavier.pc. `(("glib" ,glib) -- cgit v1.2.3 From fb8fe1e8d98f94812b54537649ee3b08fd2d6dae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Sep 2019 02:05:48 +0200 Subject: gnu: glib-networking: Don't use NAME in source URI. * gnu/packages/gnome.scm (glib-networking)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index efe5206e53..9ee652c304 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2629,7 +2629,7 @@ (define-public glib-networking (method url-fetch) (uri (string-append "mirror://gnome/sources/glib-networking/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "glib-networking-" version ".tar.xz")) (sha256 (base32 "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx")) -- cgit v1.2.3 From 0ada4e298762526b9de7fa96429e70c2ba792db6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Sep 2019 01:51:11 +0200 Subject: gnu: libsecret: Don't use NAME in source URI. * gnu/packages/gnome.scm (libsecret)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ee652c304..dbc3ed6793 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2813,7 +2813,7 @@ (define-public libsecret (uri (string-append "mirror://gnome/sources/libsecret/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libsecret-" version ".tar.xz")) (sha256 (base32 "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv")))) -- cgit v1.2.3 From b243d2f7d3f76073dd3631c85b91e7e589a02774 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Sep 2019 01:50:58 +0200 Subject: gnu: libsecret: Update to 0.19.1. * gnu/packages/gnome.scm (libsecret): Update to 0.19.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dbc3ed6793..a572075ea0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2807,7 +2807,7 @@ (define-public libsoup (define-public libsecret (package (name "libsecret") - (version "0.18.8") + (version "0.19.1") (source (origin (method url-fetch) (uri (string-append @@ -2816,7 +2816,7 @@ (define-public libsecret "libsecret-" version ".tar.xz")) (sha256 (base32 - "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv")))) + "0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 36ed9b4678ee9366b4ec40501928ccbb149c6db7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Sep 2019 00:39:35 +0200 Subject: gnu: aisleriot: Update to 3.22.9. * gnu/packages/gnome.scm (aisleriot): Update to 3.22.9. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a572075ea0..d40919693a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3360,7 +3360,7 @@ (define-public totem-pl-parser (define-public aisleriot (package (name "aisleriot") - (version "3.22.8") + (version "3.22.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/aisleriot/" @@ -3368,7 +3368,7 @@ (define-public aisleriot "aisleriot-" version ".tar.xz")) (sha256 (base32 - "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815")))) + "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 1d68eb321ffee0ca6c450f785cc17a735493df0d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Sep 2019 23:50:27 +0200 Subject: gnu: gvfs: Don't use NAME in source URI. * gnu/packages/gnome.scm (gvfs)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d40919693a..4d7ed45f77 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4182,9 +4182,9 @@ (define-public gvfs (version "1.36.2") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/gvfs/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "gvfs-" version ".tar.xz")) (sha256 (base32 "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4")))) -- cgit v1.2.3 From b5b0fd23548ac06e5c5ce3f890218579605ef024 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Sep 2019 00:08:37 +0200 Subject: gnu: tracker: Don't use NAME in source URI. * gnu/packages/gnome.scm (tracker)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4d7ed45f77..f002ff17b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6299,9 +6299,9 @@ (define-public tracker (version "2.0.4") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/tracker/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "tracker-" version ".tar.xz")) (sha256 (base32 "1mfc5lv820kr7ssi7hldn25gmshh65k19kh478qjsnb64sshsbyf")))) -- cgit v1.2.3 From c1b79b36524d38b80f7ed7e139a231dbb928833f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Sep 2019 00:11:24 +0200 Subject: gnu: libsoup: Don't use NAME in source URI. * gnu/packages/gnome.scm (libsoup)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f002ff17b7..562f2981e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2701,7 +2701,7 @@ (define-public libsoup (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libsoup-" version ".tar.xz")) (sha256 (base32 "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx")))) -- cgit v1.2.3 From aa51d92cdb68a825e6d18d0c340f9b9d160866cd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 9 Sep 2019 11:05:57 +0900 Subject: gnu: workrave: Update to version 1.10.34. * gnu/packages/gnome.scm (workrave): Update version and hash strings. [inputs]: Remove python-cheetah. [native-inputs]: Add boost, python-3 and python-jinja2; remove the "bin" output of glib. --- gnu/packages/gnome.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 562f2981e9..60e39bee32 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Jonathan Frederickson +;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,6 +66,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages calendar) #:use-module (gnu packages cdrom) @@ -7992,7 +7994,7 @@ (define-public soundconverter (define-public workrave (package (name "workrave") - (version "1.10.23") + (version "1.10.34") (source (origin (method git-fetch) @@ -8003,7 +8005,7 @@ (define-public workrave version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1qhlwfhwk5agv4904d6bsf83k9k89q7bms6agg967vsca4905vcw")))) + (base32 "0czwhr7nw523753ajcjjfwrf91mq8pmzr19gp0srqsvb1dsn1zcf")))) (build-system glib-or-gtk-build-system) (propagated-inputs `(("glib" ,glib) ("gtk+" ,gtk+) @@ -8014,9 +8016,8 @@ (define-public workrave ("libxtst" ,libxtst) ("dconf" ,dconf) ("libice" ,libice))) - (inputs `(("libsm" ,libsm) - ("python-cheetah" ,python2-cheetah))) - (native-inputs `(("glib" ,glib "bin") + (inputs `(("libsm" ,libsm))) + (native-inputs `(("boost" ,boost) ("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext) ("autoconf" ,autoconf) @@ -8026,7 +8027,8 @@ (define-public workrave ("intltool" ,intltool) ("libxscrnsaver" ,libxscrnsaver) ("gobject-introspection" ,gobject-introspection) - ("python2" ,python-2))) + ("python3" ,python-3) + ("python-jinja2" ,python-jinja2))) (synopsis "Tool to help prevent repetitive strain injury (RSI)") (description "Workrave is a program that assists in the recovery and prevention of -- cgit v1.2.3 From d1c9684753ff3a6adf1bb9ab397a73a5c23010c1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 10 Sep 2019 21:10:03 +0900 Subject: gnu: workrave: Correct the types of inputs used. * gnu/packages/gnome.scm (workrave)[propagated-inputs]: Move them all to... [inputs]: ...here. [native-inputs]: Move libxscrnsaver to the 'inputs' field. --- gnu/packages/gnome.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 60e39bee32..8341bd6802 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8007,16 +8007,17 @@ (define-public workrave (sha256 (base32 "0czwhr7nw523753ajcjjfwrf91mq8pmzr19gp0srqsvb1dsn1zcf")))) (build-system glib-or-gtk-build-system) - (propagated-inputs `(("glib" ,glib) - ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf) - ("gtkmm" ,gtkmm) - ("glibmm" ,glibmm) - ("libx11" ,libx11) - ("libxtst" ,libxtst) - ("dconf" ,dconf) - ("libice" ,libice))) - (inputs `(("libsm" ,libsm))) + (inputs `(("glib" ,glib) + ("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtkmm" ,gtkmm) + ("glibmm" ,glibmm) + ("libx11" ,libx11) + ("libxtst" ,libxtst) + ("dconf" ,dconf) + ("libice" ,libice) + ("libsm" ,libsm) + ("libxscrnsaver" ,libxscrnsaver))) (native-inputs `(("boost" ,boost) ("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext) @@ -8025,7 +8026,6 @@ (define-public workrave ("automake" ,automake) ("libtool" ,libtool) ("intltool" ,intltool) - ("libxscrnsaver" ,libxscrnsaver) ("gobject-introspection" ,gobject-introspection) ("python3" ,python-3) ("python-jinja2" ,python-jinja2))) -- cgit v1.2.3 From 237d4cf73c0a4b7b25653c01a6003e1db3da1716 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Sep 2019 01:30:13 +0200 Subject: gnu: gfbgraph: Don't use NAME in source URI. * gnu/packages/gnome.scm (gfbgraph)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8341bd6802..5dc18b3bb5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7231,9 +7231,9 @@ (define-public gfbgraph (source (origin (method url-fetch) (uri (string-append - "mirror://gnome/sources/" name "/" + "mirror://gnome/sources/gfbgraph/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "gfbgraph-" version ".tar.xz")) (sha256 (base32 "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs")))) -- cgit v1.2.3 From ad6e168b3f29576d92b00725dedbb38cd5f05e46 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Fri, 6 Sep 2019 06:35:34 -0400 Subject: gnu: evolution: Wrap with required path variables. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/gnome.scm (evolution)[arguments]: Add a ‘wrap-program’ phase. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/gnome.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5dc18b3bb5..f2edf92bd1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Jonathan Frederickson ;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2019 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -8122,11 +8123,21 @@ (define-public evolution (build-system cmake-build-system) (arguments `(#:configure-flags - (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged - "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release - ; in four years and cannot be built. + (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged + "-DENABLE_LIBCRYPTUI=OFF") ; libcryptui hasn't seen a release + ; in four years and cannot be built + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/evolution") + `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS"))) + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append out "/share/glib-2.0/schemas"))))) + #t))))) (native-inputs - `(("glib" ,glib "bin") ; glib-mkenums + `(("glib" ,glib "bin") ; glib-mkenums ("pkg-config" ,pkg-config) ("intltool" ,intltool) ("itstool" ,itstool))) @@ -8134,6 +8145,7 @@ (define-public evolution `(("enchant" ,enchant) ("evolution-data-server" ,evolution-data-server) ; must be the same version ("gcr" ,gcr) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gnome-autoar" ,gnome-autoar) ("gnome-desktop" ,gnome-desktop) ("gtkspell3" ,gtkspell3) -- cgit v1.2.3 From 59487fc29ae4119bdf5d270f29176cbf4b300012 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Sep 2019 23:28:58 +0200 Subject: gnu: libgtop: Don't use NAME in source URI. * gnu/packages/gnome.scm (libgtop)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f2edf92bd1..0cac850eb4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5915,9 +5915,9 @@ (define-public libgtop (version "2.38.0") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/libgtop/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libgtop-" version ".tar.xz")) (sha256 (base32 "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g")))) -- cgit v1.2.3 From 015fc036116d2275a92cccd6e878d625d8903330 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Sep 2019 23:29:08 +0200 Subject: gnu: libgtop: Update to 2.40.0. * gnu/packages/gnome.scm (libgtop): Update to 2.40.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0cac850eb4..31ff2ab972 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5912,7 +5912,7 @@ (define-public gdm (define-public libgtop (package (name "libgtop") - (version "2.38.0") + (version "2.40.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libgtop/" @@ -5920,7 +5920,7 @@ (define-public libgtop "libgtop-" version ".tar.xz")) (sha256 (base32 - "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g")))) + "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq")))) (build-system gnu-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 3a2efbc8670f72a524cc7290e11559cdb42852a4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 20 Sep 2019 12:21:19 +0200 Subject: gnu: python-libxml2, itstool: Provide crash-free variants. Fixes . * gnu/packages/patches/python-libxml2-utf8.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/xml.scm (python-libxml2/fixed): New variable. * gnu/packages/glib.scm (itstool/fixed): New variable. * gnu/packages/gnome.scm (gnumeric)[native-inputs]: Use ITSTOOL/FIXED instead of ITSTOOL. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 11 +++++++ gnu/packages/gnome.scm | 2 +- gnu/packages/patches/python-libxml2-utf8.patch | 40 ++++++++++++++++++++++++++ gnu/packages/xml.scm | 15 +++++++++- 5 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-libxml2-utf8.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 63d55c5018..5705494090 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1252,6 +1252,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ + %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ad000ad838..a2f0f2fd8e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -65,6 +65,7 @@ (define-module (gnu packages glib) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (srfi srfi-1) ;; Export variables up-front to allow circular dependency with the 'xorg' ;; module. @@ -495,6 +496,16 @@ (define itstool translated.") (license license:gpl3+))) +(define-public itstool/fixed + ;; This variant fixes a python-libxml2 crash when processing UTF-8 + ;; sequences: . Since the issue is quite rare, + ;; create this variant here to avoid a full rebuild. + (package/inherit + itstool + (inputs + `(("python-libxml2" ,python-libxml2/fixed) + ,@(alist-delete "python-libxml2" (package-inputs itstool)))))) + (define dbus-glib (package (name "dbus-glib") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 520d04d75f..03550b6fa8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2167,7 +2167,7 @@ (define-public gnumeric `(("bison" ,bison) ("docbook-xml" ,docbook-xml) ("intltool" ,intltool) - ("itstool" ,itstool) + ("itstool" ,itstool/fixed) ;see ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (home-page "http://www.gnumeric.org") diff --git a/gnu/packages/patches/python-libxml2-utf8.patch b/gnu/packages/patches/python-libxml2-utf8.patch new file mode 100644 index 0000000000..e39672faa1 --- /dev/null +++ b/gnu/packages/patches/python-libxml2-utf8.patch @@ -0,0 +1,40 @@ +This patch fixes a crash in the libxml2 bindings for Python 3.x +that 'itstool' stumbles upon when processing UTF-8 data: + + https://issues.guix.gnu.org/issue/37468 + +Patch by Jan Matejek +from . + +--- libxml2-2.9.5.orig/python/libxml.c ++++ libxml2-2.9.5/python/libxml.c +@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + PyObject *message; + PyObject *result; + char str[1000]; ++ unsigned char *ptr = (unsigned char *)str; + + #ifdef DEBUG_ERROR + printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); +@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + str[999] = 0; + va_end(ap); + ++#if PY_MAJOR_VERSION >= 3 ++ /* Ensure the error string doesn't start at UTF8 continuation. */ ++ while (*ptr && (*ptr & 0xc0) == 0x80) ++ ptr++; ++#endif ++ + list = PyTuple_New(2); + PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); + Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); +- message = libxml_charPtrConstWrap(str); ++ message = libxml_charPtrConstWrap(ptr); + PyTuple_SetItem(list, 1, message); + result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); ++ /* Forget any errors caused in the error handler. */ ++ PyErr_Clear(); + Py_XDECREF(list); + Py_XDECREF(result); + } diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 78b9b713e5..b8f3774039 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Sou Bunnbu @@ -164,6 +164,7 @@ (define-public libxml2 (license license:x11))) (define-public python-libxml2 + ;; TODO: Merge with 'python-libxml2/fixed' on the next rebuild cycle. (package/inherit libxml2 (name "python-libxml2") (build-system python-build-system) @@ -191,6 +192,18 @@ (define-public python-libxml2 (inputs `(("libxml2" ,libxml2))) (synopsis "Python bindings for the libxml2 library"))) +(define-public python-libxml2/fixed + ;; This variant fixes a crash when processing UTF-8 sequences: + ;; + ;; TODO: Merge with 'python-libxml2' on the next rebuild cycle. + (package/inherit + python-libxml2 + (version (string-append (package-version python-libxml2) "-1")) + (source (origin + (inherit (package-source libxml2)) + (patches (cons (search-patch "python-libxml2-utf8.patch") + (origin-patches (package-source libxml2)))))))) + (define-public python2-libxml2 (package-with-python2 python-libxml2)) -- cgit v1.2.3 From 10097e585e27c79349a39ab4743885e86a8b7797 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Sep 2019 18:57:49 +0200 Subject: gnu: libgnomekbd: Update to 3.26.1. * gnu/packages/gnome.scm (libgnomekbd): Update to 3.26.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 31ff2ab972..65ec9cdb74 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7261,7 +7261,7 @@ (define-public gfbgraph (define-public libgnomekbd (package (name "libgnomekbd") - (version "3.26.0") + (version "3.26.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7269,7 +7269,7 @@ (define-public libgnomekbd name "-" version ".tar.xz")) (sha256 (base32 - "0xc8jrc44x2h24v28wv36k70k7bwxy6p2vsvxvvia1n3ay642fza")))) + "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From d47fa82dfcbd201c889d9057916d2f539cb1b864 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Sep 2019 18:57:53 +0200 Subject: gnu: libgnomekbd: Don't use NAME in source URI. * gnu/packages/gnome.scm (libgnomekbd)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 65ec9cdb74..34a0c43b50 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7264,9 +7264,9 @@ (define-public libgnomekbd (version "3.26.1") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/libgnomekbd/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libgnomekbd-" version ".tar.xz")) (sha256 (base32 "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp")))) -- cgit v1.2.3 From 689b44bc3fe50de86c8c8b8c2ac503b2e82d7975 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Sep 2019 16:40:45 +0200 Subject: gnu: WebKitGTK: Update to 2.26.1. * gnu/packages/webkit.scm (webkitgtk-2.24): Rename to ... (webkitgtk-2.26): ... this. Update to 2.26.1. [inputs]: Add BUBBLEWRAP, LIBSECCOMP, LIBWPE, WPEBACKEND-FDO, and XDG-DBUS-PROXY. * gnu/packages/gnome.scm (eolie, epiphany)[inputs]: Adjust for changed variable name. * gnu/packages/web-browsers.scm (next-gtk-webkit)[inputs]: Likewise. --- gnu/packages/gnome.scm | 4 ++-- gnu/packages/web-browsers.scm | 2 +- gnu/packages/webkit.scm | 15 +++++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 34a0c43b50..baebeec1c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4386,7 +4386,7 @@ (define-public eolie ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk-2.24))) + ("webkitgtk" ,webkitgtk-2.26))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") (description @@ -4445,7 +4445,7 @@ (define-public epiphany ("libxslt" ,libxslt) ("nettle" ,nettle) ; for hogweed ("sqlite" ,sqlite) - ("webkitgtk" ,webkitgtk-2.24))) + ("webkitgtk" ,webkitgtk-2.26))) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index dd19b5fc6b..46b5ea7327 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -398,7 +398,7 @@ (define next-gtk-webkit (inputs `(("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk-2.24))) + ("webkitgtk" ,webkitgtk-2.26))) (native-inputs `(("gcc-7" ,gcc-7) ; needed because webkitgtk-2.24 and above are compiled with gcc-7 ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 1eb8ae699d..4864495adf 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -48,6 +48,7 @@ (define-module (gnu packages webkit) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libreoffice) + #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -55,6 +56,7 @@ (define-module (gnu packages webkit) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages virtualization) #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) @@ -225,22 +227,27 @@ (define-public webkitgtk ;; newer version of GCC than our default compiler, and this causes problems ;; when linked with C++ libraries built using our default compiler. For now, ;; we use this newer webkitgtk only for selected packages, e.g. epiphany. -(define-public webkitgtk-2.24 +(define-public webkitgtk-2.26 (package/inherit webkitgtk (name "webkitgtk") - (version "2.24.4") + (version "2.26.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46")))) + "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb")))) (native-inputs `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) (inputs - `(("openjpeg" ,openjpeg) + `(("bubblewrap" ,bubblewrap) + ("libseccomp" ,libseccomp) + ("libwpe" ,libwpe) + ("openjpeg" ,openjpeg) + ("wpebackend-fdo" ,wpebackend-fdo) + ("xdg-dbus-proxy" ,xdg-dbus-proxy) ,@(package-inputs webkitgtk))) (arguments (substitute-keyword-arguments (package-arguments webkitgtk) -- cgit v1.2.3 From 4c6d15cfb94698e2a642a0184276e19a24422734 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 28 Sep 2019 15:26:01 +0200 Subject: gnu: libgnome-games-support: Update to 1.4.4. * gnu/packages/gnome.scm (libgnome-games-support): Update to 1.4.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index baebeec1c6..dd97df225a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3682,7 +3682,7 @@ (define-public gom (define-public libgnome-games-support (package (name "libgnome-games-support") - (version "1.4.1") + (version "1.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3690,7 +3690,7 @@ (define-public libgnome-games-support name "-" version ".tar.xz")) (sha256 (base32 - "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1")))) + "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 2d8dca9d36295eb0eb06f3ea2808464e6841a703 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 28 Sep 2019 15:26:10 +0200 Subject: gnu: libgnome-games-support: Don't use NAME in source URI. * gnu/packages/gnome.scm (libgnome-games-support)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dd97df225a..a88b4d019d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3685,9 +3685,9 @@ (define-public libgnome-games-support (version "1.4.4") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/libgnome-games-support/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libgnome-games-support-" version ".tar.xz")) (sha256 (base32 "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq")))) -- cgit v1.2.3 From f99bc1af54816ebcec1efc3be6b104e010840f50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 28 Sep 2019 17:15:20 +0200 Subject: gnu: gthumb: Update to 3.8.1. * gnu/packages/gnome.scm (gthumb): Update to 3.8.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a88b4d019d..cda5dfcdd3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8172,7 +8172,7 @@ (define-public evolution (define-public gthumb (package (name "gthumb") - (version "3.8.0") + (version "3.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gthumb/" @@ -8180,7 +8180,7 @@ (define-public gthumb "gthumb-" version ".tar.xz")) (sha256 (base32 - "1l2s1facq1r6yvqjqc34aqfzlvb3nhkhn79xisxbbdlgrrxdq52f")))) + "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From d485cdc040e5c600c1bf12f0689a77d0cc0d7333 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 28 Sep 2019 22:25:20 +0200 Subject: gnu: geocode-glib: Don't use NAME in source URI. * gnu/packages/gnome.scm (geocode-glib)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cda5dfcdd3..b6e5b3cc8f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3129,7 +3129,7 @@ (define-public geocode-glib (method url-fetch) (uri (string-append "mirror://gnome/sources/geocode-glib/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "geocode-glib-" version ".tar.xz")) (sha256 (base32 "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a")))) -- cgit v1.2.3 From 5754f0cfb58f64592a6fad3fa74e7354cf187caf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 28 Sep 2019 22:25:49 +0200 Subject: gnu: cogl: Don't use NAME in source URI. * gnu/packages/gnome.scm (cogl)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b6e5b3cc8f..38339feef0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3431,9 +3431,9 @@ (define-public cogl (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/cogl/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "cogl-" version ".tar.xz")) (sha256 (base32 "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr")))) -- cgit v1.2.3 From 84a1b00700288d263112bf169216e086a8200861 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 28 Sep 2019 22:26:06 +0200 Subject: gnu: libgee: Don't use NAME in source URI. * gnu/packages/gnome.scm (libgee)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 38339feef0..f98e06118d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4607,9 +4607,9 @@ (define-public libgee (version "0.20.1") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/libgee/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libgee-" version ".tar.xz")) (sha256 (base32 "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v")))) -- cgit v1.2.3 From 65de725f9740b52de528df2fb5ed47ad592528eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Sep 2019 17:11:50 +0200 Subject: gnu: geocode-glib: Update to 3.26.1. * gnu/packages/gnome.scm (geocode-glib): Update to 3.26.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f98e06118d..c7e1a6927f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3124,7 +3124,7 @@ (define-public geoclue (define-public geocode-glib (package (name "geocode-glib") - (version "3.26.0") + (version "3.26.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/geocode-glib/" @@ -3132,7 +3132,7 @@ (define-public geocode-glib "geocode-glib-" version ".tar.xz")) (sha256 (base32 - "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a")))) + "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From 54c69ae123e2965245992cd4d04d2d9aa4aa24a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Sep 2019 17:32:58 +0200 Subject: gnu: cogl: Update to 1.22.4. * gnu/packages/gnome.scm (cogl): Update to 1.22.4. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c7e1a6927f..1471884568 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3427,7 +3427,7 @@ (define-public devhelp (define-public cogl (package (name "cogl") - (version "1.22.2") + (version "1.22.4") (source (origin (method url-fetch) @@ -3435,8 +3435,7 @@ (define-public cogl (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 - "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr")))) + (base32 "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj")))) ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; cogl, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) -- cgit v1.2.3 From 4c2c5ae64146369f765761a6332c932b985adec9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Sep 2019 17:33:00 +0200 Subject: gnu: libgee: Update to 0.20.2. * gnu/packages/gnome.scm (libgee): Update to 0.20.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1471884568..0a5f0c84a0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4603,7 +4603,7 @@ (define-public yelp-tools (define-public libgee (package (name "libgee") - (version "0.20.1") + (version "0.20.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libgee/" @@ -4611,7 +4611,7 @@ (define-public libgee "libgee-" version ".tar.xz")) (sha256 (base32 - "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v")))) + "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 86f2124b0f015e99416e5e6efc15f0ef790eb366 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 2 Oct 2019 12:03:03 +0200 Subject: gnu: dconf-editor: Fix build failure. Fixes . Reported by Jack Hill . * gnu/packages/gnome.scm (dconf-editor)[arguments]: New field. --- gnu/packages/gnome.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a5c0ffbf77..d8b73e25d9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6548,6 +6548,17 @@ (define-public dconf-editor (base32 "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia")))) (build-system meson-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-glib-minimum-version + (lambda _ + ;; Change the minimum required GLib version so that + ;; 'valac' is passed '--target-glib 2.60.0'; failing to + ;; do that, it complains that "55" is not an even + ;; number. See . + (substitute* "editor/meson.build" + (("2\\.55\\.1") "2.60.0")) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache -- cgit v1.2.3