125/130: gnu: gtk: Deprecate gdk-pixbuf+svg in favor of librsvg.

[guix-commits]

apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.

commit da02974a56c0bb00f61baf8109037f65db4c5ace
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Oct 2 21:39:26 2021 -0400

    gnu: gtk: Deprecate gdk-pixbuf+svg in favor of librsvg.
    
    With the addition of a profile hook for computing the gdk-pixbuf loaders 
cache
    file, there is no longer a need for gdk-pixbuf+svg, and librsvg can 
propagate
    gdk-pixbuf without fear, so deprecate the former for the latter.
    
    * gnu/packages/gtk.scm (gdk-pixbuf+svg): Delete package.
    (gtk+-2)[propagated-inputs]: Replace gdk-pixbuf+svg with librsvg.
    (gtk+)[propagated-inputs]: Likewise.
    * gnu/packages/gnome.scm (gdk-pixbuf+svg): Add deprecated package.
---
 gnu/packages/gnome.scm |  3 +++
 gnu/packages/gtk.scm   | 33 ++-------------------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2f5b1ac..5ae789b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3566,6 +3566,9 @@ diagrams.")
     (home-page "https://wiki.gnome.org/LibRsvg";)
     (license license:lgpl2.1+)))
 
+(define-public gdk-pixbuf+svg
+  (deprecated-package "gdk-pixbuf+svg" librsvg))
+
 (define-public libidl
   (package
     (name "libidl")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 406b8b9..67e31d4 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -721,35 +721,6 @@ scaled, composited, modified, saved, or rendered.")
     (home-page "https://wiki.gnome.org/Projects/GdkPixbuf";)
     (license license:lgpl2.1+)))
 
-;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends
-;; on gdk-pixbuf, so this new variable.  Also, librsvg adds 90MiB to the
-;; closure size.
-(define-public gdk-pixbuf+svg
-  (package/inherit gdk-pixbuf
-    (name "gdk-pixbuf+svg")
-    (inputs
-     `(("librsvg" ,librsvg)
-       ,@(package-inputs gdk-pixbuf)))
-    (arguments
-     (substitute-keyword-arguments (package-arguments gdk-pixbuf)
-        ((#:phases phases)
-          `(modify-phases ,phases
-         (add-after 'install 'register-svg-loader
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out     (assoc-ref outputs "out"))
-                    (librsvg (assoc-ref inputs "librsvg"))
-                    (loaders
-                     (append
-                      (find-files out "^libpixbufloader-.*\\.so$")
-                      (find-files librsvg "^libpixbufloader-.*\\.so$")))
-                    (gdk-pixbuf-query-loaders
-                     (string-append out "/bin/gdk-pixbuf-query-loaders")))
-               (apply invoke
-                      gdk-pixbuf-query-loaders
-                      "--update-cache"
-                      loaders))))))))
-    (synopsis "Image loading library, with SVG support")))
-
 ;;; A minimal variant used to prevent a cycle with Inkscape.
 (define-public at-spi2-core-minimal
   (hidden-package
@@ -910,7 +881,7 @@ is part of the GNOME accessibility project.")
        ;; Rust is not supported well on every architecture yet.
        ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-system)
                                                        (%current-system)))
-                          gdk-pixbuf+svg
+                          librsvg
                           gdk-pixbuf))
        ("glib" ,glib)
        ("pango" ,pango)))
@@ -1012,7 +983,7 @@ application suites.")
        ;; SVG support is optional and requires librsvg, which pulls in rust.
        ;; Rust is not supported well on every architecture yet.
        ("gdk-pixbuf" ,(if (target-x86-64?)
-                          gdk-pixbuf+svg
+                          librsvg
                           gdk-pixbuf))
        ("glib" ,glib)
        ("libcloudproviders" ,libcloudproviders-minimal)