From: 宋文武 <iyzsong@gmail.com>
To: guix-devel@gnu.org
Cc: 宋文武 <iyzsong@gmail.com>
Subject: [PATCH 2/2] gnu: gtk+: Enable SVG support.
Date: Mon, 14 Mar 2016 20:38:13 +0800 [thread overview]
Message-ID: <1457959093-5504-2-git-send-email-iyzsong@gmail.com> (raw)
In-Reply-To: <1457959093-5504-1-git-send-email-iyzsong@gmail.com>
* gnu/packages/gtk.scm (gtk+, gtk+-2)[propagated-inputs]: Use 'gtk-pixbuf+svg'
instead of 'gtk-pixbuf'.
(gtk+)[arguments]: Remove 'wrap-gtk-encode-symbolic-svg' phase.
---
gnu/packages/gtk.scm | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 79983d2..0798062 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -557,7 +557,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)
@@ -617,7 +617,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)
@@ -661,18 +661,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")
--
2.6.3
next prev parent reply other threads:[~2016-03-14 12:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-14 12:38 [PATCH 1/2] gnu: Add gdk-pixbuf+svg 宋文武
2016-03-14 12:38 ` 宋文武 [this message]
2016-03-14 12:56 ` [PATCH 2/2] gnu: gtk+: Enable SVG support 宋文武
2016-03-14 20:01 ` Jookia
2016-03-15 16:09 ` Ludovic Courtès
2016-03-16 1:04 ` Jookia
2016-03-16 4:02 ` 宋文武
2016-03-14 15:51 ` Jan Nieuwenhuizen
2016-03-14 20:38 ` [PATCH 1/2] gnu: Add gdk-pixbuf+svg Andreas Enge
2016-03-15 9:31 ` 宋文武
2016-03-15 19:13 ` Andreas Enge
2016-03-15 2:00 ` libtool archives introduce unwanted inputs to build 宋文武
2016-03-15 16:14 ` Ludovic Courtès
2016-03-16 1:09 ` Jookia
2016-03-17 21:48 ` Ludovic Courtès
2016-03-15 16:11 ` [PATCH 1/2] gnu: Add gdk-pixbuf+svg Ludovic Courtès
2016-03-16 1:10 ` 宋文武
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457959093-5504-2-git-send-email-iyzsong@gmail.com \
--to=iyzsong@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.