me
/
guix
Archived
1
0
Fork 0
Code

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

This reverts commit 0fd8013fca.
master
Leo Famulari 2017-07-01 16:02:45 -04:00
parent 5e1f9b3042
commit 6b820ef15d
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
2 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
gnu/packages/gtk.scm
View File

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

2
gnu/packages/patches/guile-rsvg-pkgconfig.patch
View File

@ -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 The above macro fails to set the 'GUILE_CFLAGS' and 'GUILE_LIBS'
+dnl substitution variables, hence this line. +dnl substitution variables, hence this line.
+PKG_CHECK_MODULES(GUILE, guile-$GUILE_EFFECTIVE_VERSION) +PKG_CHECK_MODULES(GUILE, guile-2.0)
+ +
PKG_CHECK_MODULES(GUILE_CAIRO, guile-cairo >= 1.4.0) PKG_CHECK_MODULES(GUILE_CAIRO, guile-cairo >= 1.4.0)
AC_SUBST(GUILE_CAIRO_LIBS) AC_SUBST(GUILE_CAIRO_LIBS)