gnu: guile-rsvg: Update to commit 05c6a2fd.

* gnu/packages/gtk.scm (guile-rsvg): Update to commit 05c6a2fd.
[source](url): Change to gitlab.com.
(snippet): Use @GUILE_EFFECTIVE_VERSION@ instead of "2.0".
* gnu/packages/patches/guile-rsvg-pkgconfig.patch: Use
"$GUILE_EFFECTIVE_VERSION" instead of "2.0".

gnu/packages/gtk.scm

@@ -813,43 +813,49 @@ exceptions, macros, and a dynamic programming environment.")
     (license license:lgpl3+)))
 
 (define-public guile-rsvg
-  (package
+  ;; Use a recent snapshot that supports Guile 2.2 and beyond.
-    (name "guile-rsvg")
+  (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678")
-    (version "2.18.1")
+        (revision "0"))
-    (source (origin
+    (package
-              (method url-fetch)
+      (name "guile-rsvg")
-              (uri (string-append "http://wingolog.org/pub/guile-rsvg/"
+      (version (string-append "2.18.1-" revision "."
-                                  name "-" version ".tar.gz"))
+                              (string-take commit 7)))
-              (sha256
+      (source (origin
-               (base32
+                (method url-fetch)
-                "136f236iw3yrrz6pkkp1ma9c5mrs5icqha6pnawinqpk892r3jh7"))
+                (uri (string-append "https://gitlab.com/wingo/guile-rsvg/"
-              (patches (search-patches "guile-rsvg-pkgconfig.patch"))
+                                    "repository/archive.tar.gz?ref="
-              (modules '((guix build utils)))
+                                    commit))
-              (snippet
+                (sha256
-               '(substitute* (find-files "." "Makefile\\.am")
+                 (base32
-                  (("/share/guile/site")
+                  "0vdzjx8l5nc4y2xjqs0g1rqn1zrwfsm30brh5gz00r1x41a2pvv2"))
-                   "/share/guile/site/2.0")))))
+                (patches (search-patches "guile-rsvg-pkgconfig.patch"))
-    (build-system gnu-build-system)
+                (modules '((guix build utils)))
-    (arguments
+                (snippet
-     `(#:phases (modify-phases %standard-phases
+                 '(substitute* (find-files "." "Makefile\\.am")
-                  (add-before 'configure 'bootstrap
+                    (("/share/guile/site")
-                              (lambda _
+                     "/share/guile/site/@GUILE_EFFECTIVE_VERSION@")))
-                                (zero? (system* "autoreconf" "-vfi")))))))
+                (file-name (string-append name "-" version ".tar.gz"))))
-    (native-inputs `(("pkg-config" ,pkg-config)
+      (build-system gnu-build-system)
-                     ("autoconf" ,autoconf)
+      (arguments
-                     ("automake" ,automake)
+       `(#:phases (modify-phases %standard-phases
-                     ("libtool" ,libtool)
+                    (add-before 'configure 'bootstrap
-                     ("texinfo" ,texinfo)))
+                      (lambda _
-    (inputs `(("guile" ,guile-2.0)
+                        (zero? (system* "autoreconf" "-vfi")))))))
-              ("librsvg" ,librsvg)
+      (native-inputs `(("pkg-config" ,pkg-config)
-              ("guile-lib" ,guile2.0-lib)))          ;for (unit-test)
+                       ("autoconf" ,autoconf)
-    (propagated-inputs `(("guile-cairo" ,guile-cairo)))
+                       ("automake" ,automake)
-    (synopsis "Render SVG images using Cairo from Guile")
+                       ("libtool" ,libtool)
-    (description
+                       ("texinfo" ,texinfo)))
-     "Guile-RSVG wraps the RSVG library for Guile, allowing you to render SVG
+      (inputs `(("guile" ,guile-2.0)
+                ("librsvg" ,librsvg)
+                ("guile-lib" ,guile2.0-lib)))        ;for (unit-test)
+      (propagated-inputs `(("guile-cairo" ,guile-cairo)))
+      (synopsis "Render SVG images using Cairo from Guile")
+      (description
+       "Guile-RSVG wraps the RSVG library for Guile, allowing you to render SVG
 images onto Cairo surfaces.")
-    (home-page "http://wingolog.org/projects/guile-rsvg/")
+      (home-page "http://wingolog.org/projects/guile-rsvg/")
-    (license license:lgpl2.1+)))
+      (license license:lgpl2.1+))))
 
 (define-public guile-present
   (package

gnu/packages/patches/guile-rsvg-pkgconfig.patch

@@ -9,7 +9,7 @@ and LDFLAGS for Guile would not be captured.
  
 +dnl The above macro fails to set the 'GUILE_CFLAGS' and 'GUILE_LIBS'
 +dnl substitution variables, hence this line.
-+PKG_CHECK_MODULES(GUILE, guile-2.0)
++PKG_CHECK_MODULES(GUILE, guile-$GUILE_EFFECTIVE_VERSION)
 +
  PKG_CHECK_MODULES(GUILE_CAIRO, guile-cairo >= 1.4.0)
  AC_SUBST(GUILE_CAIRO_LIBS)