[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
41/53: gnu: librsvg: Drop 'loaders.cache' file.
From: |
??? |
Subject: |
41/53: gnu: librsvg: Drop 'loaders.cache' file. |
Date: |
Fri, 29 Apr 2016 09:02:16 +0000 |
iyzsong pushed a commit to branch gnome-updates
in repository guix.
commit 009d3d5a355a7ac98daa9badb704f49cd8e67ae4
Author: 宋文武 <address@hidden>
Date: Thu Apr 28 12:13:26 2016 +0800
gnu: librsvg: Drop 'loaders.cache' file.
This is a followup to 05c4b7e93.
* gnu/packages/gnome.scm (librsvg)[arguments]: Don't install
'loaders.cache' file.
* gnu/packages/gnome.scm (gnome-themes-standard),
gnu/packages/key-mon.scm (keymon),
gnu/packages/music.scm (solfege): Remove wrap phase for SVG support.
---
gnu/packages/gnome.scm | 34 ++++------------------------------
gnu/packages/key-mon.scm | 13 -------------
gnu/packages/music.scm | 12 +++---------
3 files changed, 7 insertions(+), 52 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0cc5ced..2d7c206 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -880,7 +880,7 @@ dealing with different structured file formats.")
(arguments
`(#:phases
(alist-cons-before
- 'configure 'augment-gir-search-path
+ 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "gdk-pixbuf-loader/Makefile.in"
;; By default the gdk-pixbuf loader is installed under
@@ -889,24 +889,10 @@ dealing with different structured file formats.")
(string-append "gdk_pixbuf_moduledir = "
"$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
"loaders\n"))
- ;; Likewise, create a separate 'loaders.cache' file.
+ ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
(("gdk_pixbuf_cache_file = .*$")
- "gdk_pixbuf_cache_file = $(gdk_pixbuf_moduledir).cache\n")))
- (alist-cons-after
- 'install 'generate-full-cache
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((loaders-directory
- (string-append (assoc-ref outputs "out")
- "/lib/gdk-pixbuf-2.0/2.10.0/loaders")))
- (zero?
- (system
- (string-append
- "gdk-pixbuf-query-loaders "
- loaders-directory "/libpixbufloader-svg.so "
- (string-join (find-files (assoc-ref inputs "gdk-pixbuf")
- "libpixbufloader-.*\\.so") " ")
- "> " loaders-directory ".cache")))))
- %standard-phases))))
+ "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")))
+ %standard-phases)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; glib-mkenums, etc.
@@ -1627,18 +1613,6 @@ engineering.")
`(("intltool" ,intltool)
("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
- (arguments
- `(#:phases
- (alist-cons-before
- 'build 'use-full-cache
- ;; Use librsvg's loaders.cache instead of the one provided by
- ;; gdk-pixbuf because the latter does not include support for SVG
- ;; files.
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "GDK_PIXBUF_MODULE_FILE"
- (car (find-files (assoc-ref inputs "librsvg")
- "loaders\\.cache"))))
- %standard-phases)))
(home-page "https://launchpad.net/gnome-themes-standard")
(synopsis "Default GNOME 3 themes")
(description
diff --git a/gnu/packages/key-mon.scm b/gnu/packages/key-mon.scm
index dbfee05..c76360c 100644
--- a/gnu/packages/key-mon.scm
+++ b/gnu/packages/key-mon.scm
@@ -41,25 +41,12 @@
(build-system python-build-system)
(arguments
`(#:python ,python-2 ;uses the Python 2 'print' syntax
- #:phases (modify-phases %standard-phases
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (rsvg (assoc-ref inputs "librsvg"))
- (pixbuf (find-files
- rsvg "^loaders\\.cache$")))
- ;; Allow key-mon to load SVGs.
- (wrap-program (string-append bin "/key-mon")
- `("GDK_PIXBUF_MODULE_FILE" ":"
- prefix ,pixbuf))))))
#:tests? #f)) ;no tests
(native-inputs
`(("python2-setuptools" ,python2-setuptools)))
(inputs
`(("python2-xlib" ,python2-xlib)
("python2-pygtk" ,python2-pygtk)
- ("librsvg" ,librsvg)
("python2-rsvg" ,python2-rsvg)))
(home-page "http://code.google.com/p/key-mon")
(synopsis "Show keyboard and mouse status")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index cea685f..8dd485a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -548,15 +548,11 @@ for path in [path for path in sys.path if 'site-packages'
in path]: site.addsite
(alist-cons-after
'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Make sure 'solfege' runs with the correct PYTHONPATH. We
- ;; also need to modify GDK_PIXBUF_MODULE_FILE for SVG support.
+ ;; Make sure 'solfege' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out"))
- (path (getenv "PYTHONPATH"))
- (rsvg (assoc-ref inputs "librsvg"))
- (pixbuf (find-files rsvg "^loaders\\.cache$")))
+ (path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/solfege")
- `("PYTHONPATH" ":" prefix (,path))
- `("GDK_PIXBUF_MODULE_FILE" ":" prefix ,pixbuf))))
+ `("PYTHONPATH" ":" prefix (,path)))))
%standard-phases)))))))
(inputs
`(("python" ,python-2)
@@ -564,8 +560,6 @@ for path in [path for path in sys.path if 'site-packages'
in path]: site.addsite
("gettext" ,gnu-gettext)
("gtk" ,gtk+)
("lilypond" ,lilypond)
- ("librsvg" ,librsvg) ; needed at runtime for icons
- ("libpng" ,libpng) ; needed at runtime for icons
;; players needed at runtime
("aplay" ,alsa-utils)
("csound" ,csound) ; optional, needed for some exercises
- 11/53: gnu: gtksourceview: Update to 3.20.2., (continued)
- 11/53: gnu: gtksourceview: Update to 3.20.2., ???, 2016/04/29
- 14/53: gnu: vte: Update to 0.44.1., ???, 2016/04/29
- 12/53: gnu: gtkmm: Update to 3.20.1., ???, 2016/04/29
- 13/53: gnu: gnome-desktop: Update to 3.20.1., ???, 2016/04/29
- 30/53: gnu: file-roller: Update to 3.20.1., ???, 2016/04/29
- 16/53: gnu: rest: Update to 0.8.0., ???, 2016/04/29
- 36/53: gnu: gdm: Update to 3.20.1., ???, 2016/04/29
- 33/53: gnu: gnome-online-accounts: Update to 3.20.1., ???, 2016/04/29
- 15/53: gnu: glib-networking: Update to 2.48.1., ???, 2016/04/29
- 20/53: gnu: geocode-glib: Update to 3.20.1., ???, 2016/04/29
- 41/53: gnu: librsvg: Drop 'loaders.cache' file.,
??? <=
- 01/53: Revert "Revert "Merge branch 'gnome-updates'"", ???, 2016/04/29
- 17/53: gnu: libsoup: Update to 2.54.1., ???, 2016/04/29
- 27/53: gnu: yelp-xsl: Update to 3.20.1., ???, 2016/04/29
- 43/53: gnu: libpeas: Add inputs., ???, 2016/04/29
- 18/53: gnu: gnome-sudoku: Update to 3.20.0., ???, 2016/04/29
- 21/53: gnu: gnome-settings-daemon: Update to 3.20.1., ???, 2016/04/29
- 39/53: gnu: baobab: Update to 3.20.1., ???, 2016/04/29
- 28/53: gnu: yelp: Update to 3.20.1., ???, 2016/04/29
- 25/53: gnu: gvfs: Update to 1.28.1., ???, 2016/04/29
- 24/53: gnu: eog: Update to 3.20.1., ???, 2016/04/29