[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/13: gnu: gtk+: Enable SVG support.
From: |
??? |
Subject: |
01/13: gnu: gtk+: Enable SVG support. |
Date: |
Thu, 24 Mar 2016 10:29:29 +0000 |
iyzsong pushed a commit to branch gtk-update
in repository guix.
commit 315705fc14c36dcac9294ca42134eb760840265c
Author: 宋文武 <address@hidden>
Date: Mon Mar 14 20:11:51 2016 +0800
gnu: gtk+: Enable SVG support.
* gnu/packages/gtk.scm (gtk+, gtk+-2)[propagated-inputs]: Use
'gdk-pixbuf+svg'
instead of 'gdk-pixbuf'.
(gtk+): Remove librsvg from inputs. Remove 'wrap-gtk-encode-symbolic-svg'
phase.
---
gnu/packages/gtk.scm | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 3bc4b8d..2ec5704 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -559,7 +559,7 @@ is part of the GNOME accessibility project.")
(outputs '("out" "doc"))
(propagated-inputs
`(("atk" ,atk)
- ("gdk-pixbuf" ,gdk-pixbuf)
+ ("gdk-pixbuf" ,gdk-pixbuf+svg)
("pango" ,pango)))
(inputs
`(("cups" ,cups)
@@ -619,7 +619,7 @@ application suites.")
(propagated-inputs
`(("at-spi2-atk" ,at-spi2-atk)
("atk" ,atk)
- ("gdk-pixbuf" ,gdk-pixbuf)
+ ("gdk-pixbuf" ,gdk-pixbuf+svg)
("libepoxy" ,libepoxy)
("libxcursor" ,libxcursor)
("libxi" ,libxi)
@@ -627,8 +627,7 @@ application suites.")
("libxdamage" ,libxdamage)
("pango" ,pango)))
(inputs
- `(("librsvg" ,librsvg) ;for gtk-encode-symbolic-svg
- ("libxml2" ,libxml2)
+ `(("libxml2" ,libxml2)
;; XXX: colord depends on mozjs (through polkit), which fails on
;; on non-intel systems now.
;;("colord" ,colord)
@@ -663,18 +662,7 @@ application suites.")
(("SUBDIRS = gdk gtk a11y css reftests")
"SUBDIRS = gdk"))
#t)
- (alist-cons-after
- 'install 'wrap-gtk-encode-symbolic-svg
- ;; By using GdkPixbuf, gtk-encode-symbolic-svg needs to know
- ;; librsvg's loaders.cache to handle SVG files.
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (prog (string-append out "/bin/gtk-encode-symbolic-svg"))
- (librsvg (assoc-ref inputs "librsvg"))
- (loaders.cache (find-files librsvg "^loaders\\.cache$")))
- (wrap-program prog
- `("GDK_PIXBUF_MODULE_FILE" = ,loaders.cache))))
- %standard-phases))))
+ %standard-phases)))
(native-search-paths
(list (search-path-specification
(variable "GUIX_GTK3_PATH")
- branch gtk-update updated (bf8a21f -> 381f435), ???, 2016/03/24
- 04/13: gnu: pixman: Update to 0.34.0., ???, 2016/03/24
- 03/13: gnu: gtk+-2: Update to 2.24.30., ???, 2016/03/24
- 07/13: gnu: glib: Update to 2.46.2., ???, 2016/03/24
- 11/13: gnu: dbus: Update to 1.10.8., ???, 2016/03/24
- 13/13: Merge branch 'gtk-update' of ssh://git.sv.gnu.org/srv/git/guix into gtk-update, ???, 2016/03/24
- 10/13: gnu: poppler: Enable GObject introspection., ???, 2016/03/24
- 02/13: gnu: gtk+: Update to 3.18.9., ???, 2016/03/24
- 08/13: gnu: harfbuzz: Update to 1.2.3., ???, 2016/03/24
- 01/13: gnu: gtk+: Enable SVG support.,
??? <=
- 12/13: gnu: poppler: Update to 0.42.0., ???, 2016/03/24
- 09/13: gnu: gobject-introspection: Remove cairo from inputs., ???, 2016/03/24
- 05/13: gnu: cairo: Update to 1.14.6., ???, 2016/03/24
- 06/13: gnu: poppler: Update to 0.41.0., ???, 2016/03/24