apteryx pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 200b65bcac9d2455106296c78d4b3655c23941e3 Author: Maxim Cournoyer <[email protected]> AuthorDate: Sat Oct 2 21:46:20 2021 -0400 Revert commits made to resolve a gdk-pixbuf+svg propagation issue. Fixes <https://issues.guix.gnu.org/50957>. 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 | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ce9e3fc..3065ae8 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Petter <[email protected]> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2018 Alex Vong <[email protected]> -;;; Copyright © 2019, 2021 Maxim Cournoyer <[email protected]> +;;; Copyright © 2019 Maxim Cournoyer <[email protected]> ;;; Copyright © 2019 Giacomo Leidi <[email protected]> ;;; Copyright © 2019, 2020, 2021 Marius Bakke <[email protected]> ;;; Copyright © 2020 Nicolò Balzarotti <[email protected]> @@ -1179,7 +1179,7 @@ Some codes examples can be find at: ("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 4190eb5..af28b54 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3103,7 +3103,7 @@ configuring CUPS.") #t))))) (propagated-inputs `(;; In Requires of libnotify.pc. - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib))) (inputs `(("gtk+" ,gtk+) @@ -3552,7 +3552,6 @@ for dealing with different structured file formats.") `(("bzip2" ,bzip2) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("gdk-pixbuf" ,gdk-pixbuf) ("harfbuzz" ,harfbuzz) ("libcroco" ,libcroco) ("libgsf" ,libgsf) @@ -3560,6 +3559,7 @@ for dealing with different structured file formats.") ("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. @@ -5483,7 +5483,7 @@ service via the system message bus.") ;; 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))) @@ -5745,7 +5745,7 @@ throughout GNOME for API documentation).") ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gdk-pixbuf" ,gdk-pixbuf) ("libx11" ,libx11) ("libxext" ,libxext) ("libxfixes" ,libxfixes) @@ -7429,7 +7429,7 @@ to display dialog boxes from the commandline and shell scripts.") ;; 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) @@ -10607,7 +10607,7 @@ photo-booth-like software, such as 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
