From 92434734c515c5b9fdd55d93eba74a56ad3e01d0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 16 Apr 2021 16:51:16 -0400 Subject: gnu: libcroco: Absorb grafted replacement. * gnu/packages/gnome.scm (libcroco)[source]: Use libcroco-CVE-2020-12825.patch. [replacement]: Remove field. (libcroco/fixed): Remove variable. --- gnu/packages/gnome.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 34f5078581..78a473b348 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3221,10 +3221,10 @@ the GNOME desktop environment.") (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "libcroco-CVE-2020-12825.patch")) (sha256 (base32 "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn")))) - (replacement libcroco/fixed) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -3243,21 +3243,6 @@ XML/CSS rendering engine.") ;; LGPLv2.1-only. (license license:lgpl2.1))) -(define libcroco/fixed - (package - (inherit libcroco) - (name "libcroco") - (version "0.6.13") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn")) - (patches (search-patches "libcroco-CVE-2020-12825.patch")))))) - (define-public libgsf (package (name "libgsf") -- cgit v1.2.3 From 0e5c5ec52c42788e02a58154cb7ea3b5c7bad447 Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 19 Apr 2021 01:33:30 -0400 Subject: gnu: libgnome-games-support: Update to 1.7.1. * gnu/packages/gnome.scm (libgnome-games-support): Update to 1.7.1. Signed-off-by: Leo Prikler --- gnu/packages/gnome.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 34f5078581..ccb0814de7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6002,7 +6002,7 @@ queries upon that data.") (define-public libgnome-games-support (package (name "libgnome-games-support") - (version "1.4.4") + (version "1.7.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libgnome-games-support/" @@ -6010,16 +6010,17 @@ queries upon that data.") "libgnome-games-support-" version ".tar.xz")) (sha256 (base32 - "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq")))) - (build-system gnu-build-system) + "11g1r3ppb9v8m3anks9gxf7fv1x38vmjiya3lr7zjjv328pb69d6")))) + (build-system meson-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a writable HOME. - (setenv "HOME" (getcwd)) - #t))))) + '(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a writable HOME. + (setenv "HOME" (getcwd)) + #t))))) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From ab3bf855dbbdd239d89ea54ae08f98bc592c5932 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 19 Apr 2021 12:38:50 +0200 Subject: gnu: libhandy: Update to 1.2.1. * gnu/packages/gnome.scm (libhandy): Update to 1.2.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 ccb0814de7..0f17e92e1d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10971,7 +10971,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") (define-public libhandy (package (name "libhandy") - (version "1.2.0") + (version "1.2.1") (source (origin (method git-fetch) @@ -10980,7 +10980,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1a8wfgm2jd3gcbk1nzhq6f2xq7vkxdc9qky8p9k0za9gqi7xfg4v")))) + (base32 "1mkxvqk8r6kk5my2c7nnb7z0y39grgrl7y41cnq857qs6ljqlrfv")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 72bba784865579171e71cfca13e43dde396321d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Apr 2021 03:31:36 +0200 Subject: gnu: workrave: Update to 1.10.43. * gnu/packages/gnome.scm (workrave): Update to 1.10.43. --- 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 0f17e92e1d..28d928228d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10647,7 +10647,7 @@ configurable file renaming. ") (define-public workrave (package (name "workrave") - (version "1.10.42") + (version "1.10.43") (source (origin (method git-fetch) @@ -10658,7 +10658,7 @@ configurable file renaming. ") version))))) (file-name (git-file-name name version)) (sha256 - (base32 "03i9kk8r1wgrfkkbwikx8wxaw4r4kn62vismr2zdq5g34fkkjh95")))) + (base32 "1baa9qjzd4b3q1zy5vhvyrx0hyz17mk237373ca48647897kw4cr")))) (build-system glib-or-gtk-build-system) (arguments ;; The only tests are maintainer tests (in po/), which fail. -- cgit v1.2.3 From 2fd6484ad3486c3f8387e35d3388e59f4ea5053a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 27 Apr 2021 05:23:31 -0400 Subject: gnu: libsoup: Adjust inputs. * gnu/packages/gnome.scm (libsoup)[inputs]: Add samba and move glib-networking to ... [propagated-inputs]: ... here. Signed-off-by: Leo Prikler --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 28d928228d..d080e53ef0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4927,16 +4927,17 @@ libxml to ease remote use of the RESTful API.") ("gnutls" ,gnutls) ;for 'certtool' ("httpd" ,httpd))) (propagated-inputs - ;; libsoup-2.4.pc refers to all these. + ;; libsoup-2.4.pc refers to all of these (except where otherwise noted) `(("brotli" ,google-brotli) ("glib" ,glib) + ("glib-networking" ,glib-networking) ; for GIO runtime modules ("libpsl" ,libpsl) ("libxml2" ,libxml2) ("sqlite" ,sqlite) ("zlib" ,zlib))) (inputs - `(("glib-networking" ,glib-networking) - ("mit-krb5" ,mit-krb5))) + `(("mit-krb5" ,mit-krb5) + ("ntlm_auth" ,samba))) ; For ntlm_auth support (home-page "https://live.gnome.org/LibSoup/") (synopsis "GLib-based HTTP Library") (description -- cgit v1.2.3 From ee86a035c79b838e3fdabbdb88dc30906a83cc30 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 27 Apr 2021 05:23:32 -0400 Subject: gnu: libsoup: Update home-page. * gnu/packages/gnome.scm (libsoup)[home-page]: Modify. Signed-off-by: Leo Prikler --- 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 d080e53ef0..11e08e15e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4938,7 +4938,7 @@ libxml to ease remote use of the RESTful API.") (inputs `(("mit-krb5" ,mit-krb5) ("ntlm_auth" ,samba))) ; For ntlm_auth support - (home-page "https://live.gnome.org/LibSoup/") + (home-page "https://wiki.gnome.org/Projects/libsoup") (synopsis "GLib-based HTTP Library") (description "LibSoup is an HTTP client/server library for GNOME. It uses GObjects -- cgit v1.2.3 From fd02abd1df691a52dfefe298f4d8fa5994b538fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 1 May 2021 18:06:50 +0200 Subject: gnu: gnome-autoar: Update to 0.3.2. * gnu/packages/gnome.scm (gnome-autoar): Update to 0.3.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 a572ca9aa3..444e743bed 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8692,7 +8692,7 @@ core C library, and bindings for Python (PyGTK).") (define-public gnome-autoar (package (name "gnome-autoar") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8700,7 +8700,7 @@ core C library, and bindings for Python (PyGTK).") name "-" version ".tar.xz")) (sha256 (base32 - "1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f")))) + "0wkwix44yg126xn1v4f2j60bv9yiyadfpzf8ifx0bvd9x5f4v354")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 061823da03add693df9c411fee9ccdcc7291f0ec Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 2 May 2021 08:59:31 -0400 Subject: gnu: gupnp: Add gsettings-desktop-schemas for tests. This fixes the fatal error "Settings schema 'org.gnome.system.proxy' is not installed", which causes build to fail. * gnu/packages/gnome.scm (gupnp)[native-inputs]: Add gsettings-desktop-schemas. --- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 444e743bed..e6c891fa8b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1323,6 +1323,8 @@ a debugging tool, @command{gssdp-device-sniffer}.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ;; For ‘org.gnome.system.proxy’. + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) -- cgit v1.2.3 From 2710df38b0c317bdc69c61c7775d8141eb214dd1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 2 May 2021 17:42:49 +0200 Subject: gnu: gupnp: Move gsettings-desktop-schemas to propagated-inputs. This fixes the following test failure: Bail out! GLib-GIO-FATAL-ERROR: Settings schema 'org.gnome.system.proxy' is not installed --- stderr --- (/tmp/guix-build-gupnp-1.2.4.drv-0/build/tests/gtest/test-context:599): GLib-GIO-ERROR **: 15:37:55.097: Settings schema 'org.gnome.system.proxy' is not installed * gnu/packages/gnome.scm (gupnp)[inputs]: Move gsettings-desktop-schemas to ... [propagated-inputs]: ... here. --- 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 e6c891fa8b..4c803352d7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1323,8 +1323,6 @@ a debugging tool, @command{gssdp-device-sniffer}.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ;; For ‘org.gnome.system.proxy’. - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) @@ -1332,6 +1330,9 @@ a debugging tool, @command{gssdp-device-sniffer}.") `(("gssdp" ,gssdp) ("gtk+" ,gtk+) ("libsoup" ,libsoup))) + (propagated-inputs + `(;; For ‘org.gnome.system.proxy’. + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (synopsis "PnP API for GNOME") (description "This package provides GUPnP, an object-oriented framework for creating UPnP devices and control points, written in C using -- cgit v1.2.3 From 9432c40f8d447b3b86629bcb8a606f7454180c2d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 4 May 2021 15:58:38 +0200 Subject: gnu: libhandy: Update to 1.2.2. * gnu/packages/gnome.scm (libhandy): Update to 1.2.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 4c803352d7..aba12d0575 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10960,7 +10960,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") (define-public libhandy (package (name "libhandy") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) @@ -10969,7 +10969,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1mkxvqk8r6kk5my2c7nnb7z0y39grgrl7y41cnq857qs6ljqlrfv")))) + (base32 "0345x7gif6yjm95y62lww71lj84wfwsr2p32r3iww8shavb8scyk")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 8ff0d32df6fb012db0a32bc253f7bcd63a2113d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 4 May 2021 16:09:03 +0200 Subject: gnu: gthumb: Update to 3.10.3. * gnu/packages/gnome.scm (gthumb): Update to 3.10.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 aba12d0575..265477a54d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10838,7 +10838,7 @@ functionality.") (define-public gthumb (package (name "gthumb") - (version "3.10.2") + (version "3.10.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gthumb/" @@ -10846,7 +10846,7 @@ functionality.") "gthumb-" version ".tar.xz")) (sha256 (base32 - "14sw8d37g1lkp44dwsgyxjjsgh5pnpp4wq00mcy9p3rp30lf9spx")))) + "04n2sgasc03kiczyzkq362pjilj12hq2r5qj07lynqr9rivkzdys")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3