From fb6a1ff921199280e160e20966b665d2302497f1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Mar 2021 17:33:07 -0500 Subject: gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf. Propagating gdk-pixbuf rather than gdk-pixbuf+svg is dangerous as it clashes with GTK+'s own gdk-pixbuf+svg propagation. * gnu/packages/glib.scm (appstream-glib)[propagated-inputs]: Replace gdk-pixbuf by gdk-pixbuf+svg. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9cc2b1b69e..8de6e198be 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2019, 2021 Maxim Cournoyer ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Nicolò Balzarotti @@ -1001,7 +1001,7 @@ (define-public appstream-glib ("pkg-config" ,pkg-config))) (propagated-inputs `(("gcab" ,gcab) ; for .pc file - ("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file + ("gdk-pixbuf" ,gdk-pixbuf+svg) ; for .pc file ("libuuid" ,util-linux "lib"))) ; for .pc file (inputs `(("glib" ,glib) -- cgit v1.2.3 From 13bd2db67c42ce3fed4b60b90e25b2facc476d32 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 27 Apr 2021 05:23:34 -0400 Subject: gnu: python-pygobject: Update to 3.40.1. * gnu/packages/glib.scm (python-pygobject)[version]: Update to 3.40.1. [native-inputs]: Add python-wrapper. --- gnu/packages/glib.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 88b5831a6d..527d049ca0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -790,7 +790,7 @@ (define-public python2-pygobject-2 (define-public python-pygobject (package (name "python-pygobject") - (version "3.34.0") + (version "3.40.1") (source (origin (method url-fetch) @@ -799,7 +799,7 @@ (define-public python-pygobject "/pygobject-" version ".tar.xz")) (sha256 (base32 - "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7")) + "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0")) (modules '((guix build utils))) (snippet '(begin @@ -814,7 +814,8 @@ (define-public python-pygobject (native-inputs `(("glib-bin" ,glib "bin") ("pkg-config" ,pkg-config) - ("python-pytest" ,python-pytest))) + ("python-pytest" ,python-pytest) + ("python-wrapper" ,python-wrapper))) ; For patching shebangs (inputs `(("python" ,python) ("python-pycairo" ,python-pycairo) -- cgit v1.2.3 From f4271bbd79e5a85cdb32f4d79d6bb4d8c4739c69 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 2 Oct 2021 21:46:20 -0400 Subject: Revert commits made to resolve a gdk-pixbuf+svg propagation issue. Fixes . This reverts the following commits: - 42231bc (gnu: cheese: Propagate gdk-pixbuf+svg rather than gdk-pixbuf) - ad6a950 (gnu: mutter: Propagate gdk-pixbuf+svg rather than gdk-pixbuf) - 5e02d1a (gnu: cogl: Propagate gdk-pixbuf+svg rather than gdk-pixbuf) - 5c467b2 (gnu: libgweather: Propagate gdk-pixbuf+svg rather than gdk-pixbuf) - 26487f6 (gnu: librsvg-next: Do not propagate gdk-pixbuf) - d891922 (gnu: librsvg: Do not propagate gdk-pixbuf) - 22476d3 (gnu: libgsf: Do not propagate gdk-pixbuf) - 099ca0e (gnu: libnotify: Propagate gdk-pixbuf+svg rather than gdk-pixbuf) - fb6a1ff (gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf) - 4fb525d (gnu: weasyprint: Propagate gdk-pixbuf+svg rather than gdk-pixbuf) These commits were made to resolve a gdk-pixbuf loaders clash that could occur in a profile when both gdk-pixbuf and gdk-pixbuf+svg were propagated. Unfortunately, librsvg really needs to propagate gdk-pixbuf itself, which would introduce a cycle. Packages such as 'efl' were broken as a result of not propagating gdk-pixbuf. A more definitive fix will be proposed for core-updates, which includes a profile hook to generate the gdk-pixbuf loaders.cache file, as well as a build phase and search path specification, that should resolve the issue for good. --- gnu/packages/glib.scm | 4 ++-- gnu/packages/gnome.scm | 20 ++++++++++---------- gnu/packages/pdf.scm | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 79d2930101..d264d66b92 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2019, 2021 Maxim Cournoyer +;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Nicolò Balzarotti @@ -1087,7 +1087,7 @@ (define-public appstream-glib ("pkg-config" ,pkg-config))) (propagated-inputs `(("gcab" ,gcab) ; for .pc file - ("gdk-pixbuf" ,gdk-pixbuf+svg) ; for .pc file + ("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file ("libuuid" ,util-linux "lib"))) ; for .pc file (inputs `(("glib" ,glib) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4df79bb442..a71e7f86dd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3063,7 +3063,7 @@ (define-public libnotify #t))))) (propagated-inputs `(;; In Requires of libnotify.pc. - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib))) (inputs `(("gtk+" ,gtk+) @@ -3286,11 +3286,11 @@ (define-public libgsf ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("zlib" ,zlib) + `(("zlib" ,zlib) ("bzip2" ,bzip2))) (propagated-inputs - `(("glib" ,glib) + `(("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib) ("libxml2" ,libxml2))) (home-page "https://www.gnome.org/projects/libgsf") (synopsis "GNOME's Structured File Library") @@ -3357,11 +3357,11 @@ (define-public librsvg ("libcroco" ,libcroco) ("bzip2" ,bzip2) ("libgsf" ,libgsf) - ("gdk-pixbuf" ,gdk-pixbuf) ("libxml2" ,libxml2))) (propagated-inputs ;; librsvg-2.0.pc refers to all of that. `(("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib))) (home-page "https://wiki.gnome.org/LibRsvg") (synopsis "Render SVG files using Cairo") @@ -3536,7 +3536,6 @@ (define-public librsvg-next `(("bzip2" ,bzip2) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("gdk-pixbuf" ,gdk-pixbuf) ("harfbuzz" ,harfbuzz) ("libcroco" ,libcroco) ("libgsf" ,libgsf) @@ -3544,6 +3543,7 @@ (define-public librsvg-next ("pango" ,pango))) (propagated-inputs `(("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib))) (synopsis "SVG rendering library") (description "Librsvg is a library to render SVG images to Cairo surfaces. @@ -5446,7 +5446,7 @@ (define-public libgweather ;; gweather-3.0.pc refers to GTK+, GDK-Pixbuf, GLib/GObject, libxml, and ;; libsoup. `(("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gdk-pixbuf" ,gdk-pixbuf) ("libxml2" ,libxml2) ("libsoup" ,libsoup) ("geocode-glib" ,geocode-glib))) @@ -5711,7 +5711,7 @@ (define-public cogl ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gdk-pixbuf" ,gdk-pixbuf) ("libx11" ,libx11) ("libxext" ,libxext) ("libxfixes" ,libxfixes) @@ -7384,7 +7384,7 @@ (define-public mutter ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: ("atk" ,atk) ("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("json-glib" ,json-glib) ("libinput" ,libinput) @@ -10484,7 +10484,7 @@ (define-public cheese ("clutter-gst" ,clutter-gst) ("clutter-gtk" ,clutter-gtk) ("libcanberra" ,libcanberra) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("gstreamer" ,gstreamer))) (inputs diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 78b52a44f8..a5b5442f29 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Timotej Lazar -;;; Copyright © 2020, 2021 Maxim Cournoyer +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -1525,7 +1525,7 @@ (define-public weasyprint ("glib" ,glib) ("pango" ,pango))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf+svg) + `(("gdk-pixbuf" ,gdk-pixbuf) ("python-cairocffi" ,python-cairocffi) ("python-cairosvg" ,python-cairosvg) ("python-cffi" ,python-cffi) -- cgit v1.2.3 From 597ae30dc3de5ebe17301318da8a5abb23c30013 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 9 Oct 2021 00:44:08 -0400 Subject: gnu: dbus-c++: Fix build. * gnu/packages/glib.scm (dbus-c++)[inputs]: Add libunwind. --- gnu/packages/glib.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d264d66b92..1a94113fe7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -47,6 +47,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) + #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages m4) #:use-module (gnu packages nettle) @@ -1007,7 +1008,8 @@ (define-public dbus-c++ (inputs `(("efl" ,efl) ("expat" ,expat) - ("glib" ,glib))) + ("glib" ,glib) + ("libunwind" ,libunwind))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments -- cgit v1.2.3 From a9d27c30dcc7550bdb067a7683b90d16075e53a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Dec 2021 16:06:16 -0500 Subject: gnu: gobject-introspection: Unconditionally use flex and bison. * gnu/packages/glib.scm (gobject-introspection): Delete trailing #t. [native-inputs]: Unconditionally use flex and bison. --- gnu/packages/glib.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1bd1d6c138..4868db832d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -467,8 +467,7 @@ (define gobject-introspection (lambda _ (substitute* "tools/g-ir-tool-template.in" (("#!@PYTHON_CMD@") - (string-append "#!" (which "python3")))) - #t)) + (string-append "#!" (which "python3")))))) #$@(if (%current-target-system) ;; Meson gives python extensions an incorrect name, see ;; . @@ -482,12 +481,8 @@ (define gobject-introspection (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Unconditionally place "flex" and "bison" - ;; in 'native-inputs'. - ,@(if (%current-target-system) - `(("bison" ,bison) - ("flex" ,flex)) - '()))) + ("bison" ,bison) + ("flex" ,flex))) (inputs `(,@(if (%current-target-system) `(("python" ,python)) -- cgit v1.2.3 From 8faa04c316fd2318708f2fcfaeea402615aafef9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Dec 2021 21:20:28 -0500 Subject: gnu: glib: Fix cross-compilation. Fixes . Reported by L p R n d n . Thanks to Maxime Devos for the suggested fix. * gnu/packages/glib.scm (glib)[configure-flags]: Define as a G-expression. (glib-with-documentation)[configure-flags]: Likewise. --- gnu/packages/glib.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 4868db832d..ade4eb32aa 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -212,12 +212,11 @@ (define glib `(,(this-package-native-input "python") ,(this-package-native-input "python-wrapper"))) '())) - #:configure-flags (list "--default-library=both" - "-Dman=false" - "-Dselinux=disabled" - (string-append "--bindir=" - (assoc-ref %outputs "bin") - "/bin")) + #:configure-flags ,#~(list "--default-library=both" + "-Dman=false" + "-Dselinux=disabled" + (string-append "--bindir=" + #$output:bin "/bin")) #:phases (modify-phases %standard-phases ;; Needed to pass the test phase on slower ARM and i686 machines. @@ -365,8 +364,8 @@ (define-public glib-with-documentation (arguments (substitute-keyword-arguments (package-arguments glib) ((#:configure-flags flags ''()) - `(cons "-Dgtk_doc=true" - (delete "-Dman=false" ,flags))) + #~(cons "-Dgtk_doc=true" + (delete "-Dman=false" #$flags))) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'patch-docbook-xml -- cgit v1.2.3 From 946c5e05a490fba408dc2a7efccc4fea80c2b4a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Dec 2021 23:26:35 -0500 Subject: gnu: glibmm: Remove trailing #t. * gnu/packages/glib.scm (glibmm): Remove trailing #t. --- gnu/packages/glib.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ade4eb32aa..b8230eac16 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -760,8 +760,7 @@ (define glibmm (outputs '("out" "doc")) (arguments `(#:configure-flags - (list - "-Dbuild-documentation=true") + (list "-Dbuild-documentation=true") #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests @@ -772,8 +771,7 @@ (define glibmm (("[ \t]*.*giomm_simple.*$") "") ;; This test does a DNS lookup, and then expects to be able ;; to open a TLS session; just skip it. - (("[ \t]*.*giomm_tls_client.*$") "")) - #t)) + (("[ \t]*.*giomm_tls_client.*$") "")))) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -781,8 +779,7 @@ (define glibmm (mkdir-p (string-append doc "/share")) (rename-file (string-append out "/share/doc") - (string-append doc "/share/doc")) - #t)))))) + (string-append doc "/share/doc")))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) -- cgit v1.2.3 From 0c5bfcadfdd5046594d0b1f698bf897a94e0761a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Dec 2021 23:27:15 -0500 Subject: gnu: glibmm-2.64: Fix libsigc++ propagation. Fixes . The package was propagating two variants of libsigc++. * gnu/packages/glib.scm (glibmm-2.64)[propagated-inputs]: Replace existing libsigc++ package instead of prepending an extra one. Reported-by: Leo Famulari --- gnu/packages/glib.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b8230eac16..23a57832a1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -814,7 +814,7 @@ (define-public glibmm-2.64 (base32 "11m37sbx0i18cl17d0fkq0bik4bbzlb5n8kcl651jhci5ipci3sh")))) (propagated-inputs (modify-inputs (package-propagated-inputs glibmm) - (prepend libsigc++-2))))) + (replace "libsigc++" libsigc++-2))))) (define-public python2-pygobject-2 (package -- cgit v1.2.3 From abb5a92cbcab79f700b70908682386cf3b10e7c1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Dec 2021 01:24:20 -0500 Subject: gnu: glibmm: Update to 2.70.0 and apply guix style. * gnu/packages/glib.scm (glibmm): Update to 2.70.0. [native-inputs]: Use new style. --- gnu/packages/glib.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 23a57832a1..a4d7e8667e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -747,7 +747,7 @@ (define-public libsigc++-2 (define glibmm (package (name "glibmm") - (version "2.68.0") + (version "2.70.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glibmm/" @@ -755,7 +755,7 @@ (define glibmm "/glibmm-" version ".tar.xz")) (sha256 (base32 - "0xgkyhb2876mcyyib5rk3ya9aingyj68h02nl22yvkhx35rqbwy1")))) + "085mzpphz71sh5wh71ppikwnxsgn4pk3s4bzz6ingj6wxn5gs240")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments @@ -781,14 +781,14 @@ (define glibmm (string-append out "/share/doc") (string-append doc "/share/doc")))))))) (native-inputs - `(("dot" ,graphviz) - ("doxygen" ,doxygen) - ("glib:bin" ,glib "bin") - ("m4" ,m4) - ("mm-common" ,mm-common) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("xsltproc" ,libxslt))) + (list graphviz + doxygen + `(,glib "bin") + m4 + mm-common + perl + pkg-config + libxslt)) (propagated-inputs (list libsigc++ glib)) (home-page "https://gtkmm.org/") -- cgit v1.2.3 From db912d77a86edd78012bdc92be8fbddb2c1a122b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Dec 2021 01:28:17 -0500 Subject: gnu: glib: Update to 2.70.2. * gnu/packages/glib.scm (glib): Update to 2.70.2. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a4d7e8667e..30e5433776 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -179,7 +179,7 @@ (define dbus (define glib (package (name "glib") - (version "2.70.0") + (version "2.70.2") (source (origin (method url-fetch) @@ -188,7 +188,7 @@ (define glib name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0hh7hk02fkm1bn48k4z8f3kgv9qbni5z22gizd567fn527w7s390")) + (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85")) (patches (search-patches "glib-appinfo-watch.patch" "glib-skip-failing-test.patch")) -- cgit v1.2.3