From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?B?5a6L5paH5q2m?= Subject: Re: [PATCH] gnu: Add adwaita-icon-theme. Date: Tue, 19 May 2015 16:51:42 +0800 Message-ID: <87r3qdvtk1.fsf@gmail.com> References: <1431427501-25929-1-git-send-email-iyzsong@gmail.com> <87mw19y2iy.fsf@gnu.org> <87vbfxqnou.fsf@gmail.com> <87fv70x660.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YudEv-0003Ha-HG for guix-devel@gnu.org; Tue, 19 May 2015 04:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YudEu-0007t2-Ia for guix-devel@gnu.org; Tue, 19 May 2015 04:51:05 -0400 In-Reply-To: <87fv70x660.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Here are updated patches: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-gtk-Add-SVG-support-to-gtk-encode-symbolic-svg.patch >From ff7e16bc8b7e803d49d5ee880f31f3f4e1660d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Tue, 19 May 2015 16:32:09 +0800 Subject: [PATCH 1/2] gnu: gtk+: Add SVG support to 'gtk-encode-symbolic-svg'. * gnu/packages/gtk.scm (gtk+)[inputs]: Add librsvg. [arguments]: Add 'wrap-gtk-encode-symbolic-svg' phase. --- gnu/packages/gtk.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8a5a309..2166aeb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -501,7 +501,8 @@ application suites.") ("libxdamage" ,libxdamage) ("pango" ,pango))) (inputs - `(("libxml2" ,libxml2) + `(("librsvg" ,librsvg) ;for gtk-encode-symbolic-svg + ("libxml2" ,libxml2) ("cups" ,cups))) ;for printing support (native-inputs `(("perl" ,perl) @@ -533,7 +534,16 @@ application suites.") "demos/gtk-demo/Makefile.in") (("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache")) #t) - %standard-phases))))) + (alist-cons-after + 'install 'wrap-gtk-encode-symbolic-svg + (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)))))) ;;; ;;; Guile bindings. -- 2.2.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-adwaita-icon-theme.patch >From f9aa59c1aca6e30f217d7d2e1c8ae5c6774b66c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Tue, 12 May 2015 18:42:37 +0800 Subject: [PATCH 2/2] gnu: Add adwaita-icon-theme. * gnu/packages/gnome.scm (adwaita-icon-theme): New variable. --- gnu/packages/gnome.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8adcbdd..2213e47 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -393,6 +393,20 @@ update-desktop-database: updates the database containing a cache of MIME types "Icons for the GNOME desktop.") (license license:lgpl3))) ; or Creative Commons BY-SA 3.0 +;; gnome-icon-theme was renamed to adwaita-icon-theme after version 3.12.0. +(define-public adwaita-icon-theme + (package (inherit gnome-icon-theme) + (name "adwaita-icon-theme") + (version "3.16.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1cbfdypxfg74krqrklh4za64jhvskbp206l14fs739cw14xsvj53")))))) + (define-public shared-mime-info (package (name "shared-mime-info") -- 2.2.1 --=-=-=--