From 05c4b7e930cd89ca05c2b3a559236c5995f3c07f Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Mon, 14 Mar 2016 20:11:51 +0800
Subject: 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 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 255d885b27..793808f1e7 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")
-- 
cgit 1.4.1


From c9171a3faa58d496a9adaade28f943536b1df68d Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 16 Mar 2016 10:15:12 +0800
Subject: gnu: gtk+-2: Update to 2.24.30.

* gnu/packages/gtk.scm (gtk+-2): Update to 2.24.30.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 793808f1e7..fd5ad8e722 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -545,7 +545,7 @@ is part of the GNOME accessibility project.")
 (define-public gtk+-2
   (package
    (name "gtk+")
-   (version "2.24.28")
+   (version "2.24.30")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -553,7 +553,7 @@ is part of the GNOME accessibility project.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj"))
+              "0l6aqk86aw5w132ygy6hv6nlxvd1h6xg7c85qbm60p6mnv1ww58d"))
             (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
-- 
cgit 1.4.1


From 33f3b97c38f4f4320cdea8385093761aa08da471 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Sun, 21 Feb 2016 09:54:49 +0800
Subject: gnu: cairo: Update to 1.14.6.

* gnu/packages/gtk.scm (cairo): Update to 1.14.6.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index fd5ad8e722..f700f23c27 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -95,14 +95,14 @@ tools have full access to view and control running applications.")
 (define-public cairo
   (package
    (name "cairo")
-   (version "1.14.2")
+   (version "1.14.6")
    (source (origin
             (method url-fetch)
             (uri (string-append "http://cairographics.org/releases/cairo-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "1sycbq0agbwmg1bj9lhkgsf0glmblaf2jrdy9g6vxfxivncxj6f9"))))
+              "0lmjlzmghmr27y615px9hkm552x7ap6pmq9mfbzr6smp8y2b6g31"))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("fontconfig" ,fontconfig)
-- 
cgit 1.4.1


From 1543fe4d1bff21da5978b1cbeea1cc0fe4e4a321 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Sun, 3 Apr 2016 19:13:06 +0800
Subject: gnu: harfbuzz: Update to 1.2.4.

* gnu/packages/gtk.scm (harfbuzz): Update to 1.2.4.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f700f23c27..5e01d8a886 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -147,7 +147,7 @@ affine transformation (scale, rotation, shear, etc.).")
 (define-public harfbuzz
   (package
    (name "harfbuzz")
-   (version "1.0.6")
+   (version "1.2.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://www.freedesktop.org/software/"
@@ -155,7 +155,7 @@ affine transformation (scale, rotation, shear, etc.).")
                                  version ".tar.bz2"))
              (sha256
               (base32
-               "09ivk5m4y09ar4zi9r6db7gp234cy05h0ach7w22g9kqvkxsf5pn"))))
+               "14g4kpph8hgplkm954daxiymxx0vicfq7b7svvdsx54g5bqvv7a4"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "bin")) ; 160K, only hb-view depend on cairo
-- 
cgit 1.4.1


From 8e8454738ba6a353bf29463c52ad140f454de859 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Mon, 4 Apr 2016 13:12:50 +0800
Subject: gnu: gdk-pixbuf: Update to 2.34.0.

* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.34.0.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5e01d8a886..3684c12be1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -387,7 +387,7 @@ highlighting and other features typical of a source code editor.")
 (define-public gdk-pixbuf
   (package
    (name "gdk-pixbuf")
-   (version "2.32.3")
+   (version "2.34.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -395,7 +395,7 @@ highlighting and other features typical of a source code editor.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "0cfh87aqyqbfcwpbv1ihgmgfcn66il5q2n8yjyl8gxkjmkqp2rrb"))))
+              "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags '("--with-x11")
-- 
cgit 1.4.1


From 0fc9213814d42707edf80aa42eda3d7105769bc5 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Mon, 4 Apr 2016 13:58:25 +0800
Subject: gnu: pango: Update to 1.40.0.

* gnu/packages/glib.scm (pango): Update to 1.40.0.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 3684c12be1..439749d9fa 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -185,7 +185,7 @@ affine transformation (scale, rotation, shear, etc.).")
 (define-public pango
   (package
    (name "pango")
-   (version "1.38.1")
+   (version "1.40.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/pango/"
@@ -193,7 +193,7 @@ affine transformation (scale, rotation, shear, etc.).")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "1dsf45m51i4rcyvh5wlxxrjfhvn5b67d5ckjc6vdcxbddjgmc80k"))))
+              "12qwa748wyady16xxdq5rqz9gki1kksj8m5bcv80gjqlydfrh5ys"))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("cairo" ,cairo)
-- 
cgit 1.4.1


From 7e53a19b5a210c3f04757984ddcd4891bba20d1c Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Tue, 5 Apr 2016 16:44:59 +0800
Subject: gnu: atk: Update to 2.20.0.

* gnu/packages/gtk.scm (atk): Update to 2.20.0.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 439749d9fa..e72ba34a6b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -63,7 +63,7 @@
 (define-public atk
   (package
    (name "atk")
-   (version "2.18.0")
+   (version "2.20.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -71,7 +71,7 @@
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "0ay9s137x49f0akx658p7kznz0rdapfrd8ym54q0hlgrggblhv6f"))))
+              "1w1q29yfxcq67j7fyqrfm0l0n1vy4zn539c0sf4ga9d0qkv50fj9"))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
    (arguments
-- 
cgit 1.4.1


From 5c9f085e9848fc379c9ad19c1205718846749202 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Tue, 5 Apr 2016 16:55:33 +0800
Subject: gnu: gtksourceview: Update to 3.20.1.

* gnu/packages/gtk.scm (gtksourceview): Update to 3.20.1.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index e72ba34a6b..42f919ca42 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -339,7 +339,7 @@ printing and other features typical of a source code editor.")
 (define-public gtksourceview
  (package
    (name "gtksourceview")
-   (version "3.18.2")
+   (version "3.20.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -347,7 +347,7 @@ printing and other features typical of a source code editor.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-               "1cmplnqbyd1js5bkpi9cfc3gljilyxg5nngwh4i3mq9r02gmmxv0"))))
+               "0k4cmq94181l39di9z4agampg4za6bvimkvcjm3qlxmsxb09ab9j"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases
-- 
cgit 1.4.1


From ba60784f998d36bd91d94ac57584502dbca11d19 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Tue, 5 Apr 2016 16:56:01 +0800
Subject: gnu: at-spi2-core: Update to 2.20.0.

* gnu/packages/gtk.scm (at-spi2-core): Update to 2.20.0.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 42f919ca42..9d56b30fda 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -465,7 +465,7 @@ in the GNOME project.")
 (define-public at-spi2-core
   (package
    (name "at-spi2-core")
-   (version "2.18.1")
+   (version "2.20.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -473,7 +473,7 @@ in the GNOME project.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "1kq17w4fm51d49vzmglkxqdm6s0yvjvrpgw78r2hajf69jz5bmap"))))
+              "16v09iwnd3895fshsvsci836dar21c8y9w8zn882jn4fq2vrzi6w"))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
    (arguments
-- 
cgit 1.4.1


From 11577957e0ef21694e256fc94ab720e3e58016e6 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Tue, 5 Apr 2016 17:00:59 +0800
Subject: gnu: at-spi2-atk: Update to 2.20.0.

* gnu/packages/gtk.scm (at-spi2-atk): Update to 2.20.0.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9d56b30fda..028f4c9cce 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -510,7 +510,7 @@ is part of the GNOME accessibility project.")
 (define-public at-spi2-atk
   (package
    (name "at-spi2-atk")
-   (version "2.18.1")
+   (version "2.20.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -518,7 +518,7 @@ is part of the GNOME accessibility project.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "0bf1g5cj84rmx7p1q547vwbc0hlpcs2wrxnmv96lckfkhs9mzcf4"))))
+              "1lis9zj4r3d5ff3chs0r93gjkbp0wgflfx35gbax47cgdqmi8jx2"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases
-- 
cgit 1.4.1


From dfa9afe076ac03e3ec9c4d85239a4dd19eebdbd9 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Tue, 5 Apr 2016 17:01:38 +0800
Subject: gnu: gtk+: Update to 3.20.2.

* gnu/packages/gtk.scm (gtk+): Update to 3.20.2.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 028f4c9cce..4965a856fd 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -606,7 +606,7 @@ application suites.")
 (define-public gtk+
   (package (inherit gtk+-2)
    (name "gtk+")
-   (version "3.18.2")
+   (version "3.20.2")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -614,7 +614,7 @@ application suites.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "0lp1hn0qydxx03bianzzr0a4maqzsvylrkzr7c3p0050qihwbgjx"))
+              "1xv97zrngf47hyrxz7rfrdl5xpv4y61rkmipyi300pm5iq3d3c8s"))
             (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"))))
    (propagated-inputs
     `(("at-spi2-atk" ,at-spi2-atk)
-- 
cgit 1.4.1


From 343eb85899583dcb5a7a0e5530c2a71c96f586e5 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 6 Apr 2016 10:17:13 +0800
Subject: gnu: gdk-pixbuf: Fix tests.

* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Add shared-mime-info.
---
 gnu/packages/gtk.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4965a856fd..2b3576d1fd 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -421,7 +421,8 @@ highlighting and other features typical of a source code editor.")
    (inputs
     `(("libjpeg" ,libjpeg)
       ("libtiff" ,libtiff)
-      ("libx11"  ,libx11)))
+      ("libx11"  ,libx11)
+      ("shared-mime-info" ,shared-mime-info))) ; for testing
    (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib "bin")                               ; glib-mkenums, etc.
-- 
cgit 1.4.1


From 8c5531a5b9fdb04f7f250f31acdf1546cf57e756 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 6 Apr 2016 10:20:06 +0800
Subject: gnu: pangomm: Update to 2.40.0.

* gnu/packages/gtk.scm (pangomm): Update to 2.40.0.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2b3576d1fd..dbda1335e9 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -853,7 +853,7 @@ library.")
 (define-public pangomm
   (package
     (name "pangomm")
-    (version "2.38.1")
+    (version "2.40.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -861,7 +861,7 @@ library.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-               "12xwjvqfxhqblcv7641k0l6r8n3qifnrx8w9571izn1nbd81iyzg"))))
+               "03fpqdjp7plybf4zsgszbm8yhgl28vmajzfpmaqcsmyfvjlszl3x"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (propagated-inputs
-- 
cgit 1.4.1


From 400f3db26778231d2441fd162d85a31fea54e626 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 6 Apr 2016 10:20:46 +0800
Subject: gnu: gtkmm: Update to 3.20.0.

* gnu/packages/gtk.scm (gtkmm): Update to 3.20.0.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index dbda1335e9..ccdda3e01d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -902,7 +902,7 @@ toolkit.")
 (define-public gtkmm
   (package
     (name "gtkmm")
-    (version "3.18.0")
+    (version "3.20.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -910,7 +910,7 @@ toolkit.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-               "0sxq700invkjpksn790gbnl8px8751kvgwn39663jx7dv89s37w2"))))
+               "12h2kd22iayvjfhmgjccm33igrbvqdj7hym31fsa1y0dhwzmf8gh"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("glib" ,glib "bin")))      ;for 'glib-compile-resources'
-- 
cgit 1.4.1


From 224276ab44cca8733a1c92e7b06c7cba783a589a Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 6 Apr 2016 19:29:03 +0800
Subject: gnu: gdk-pixbuf: Propagate shared-mime-info.

* gnu/packages/gtk.scm (gdk-pixbuf): Move shared-mime-info to propagated-inputs.
---
 gnu/packages/gtk.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ccdda3e01d..23e015eace 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -415,14 +415,16 @@ highlighting and other features typical of a source code editor.")
              ;; (gdk-pixbuf-error-quark, 0)
              (("pixbuf-jpeg\\$\\(EXEEXT\\) ") ""))
            #t)))))
-   (propagated-inputs ; required by gdk-pixbuf-2.0.pc
-    `(("glib" ,glib)
-      ("libpng" ,libpng)))
+   (propagated-inputs
+    `(;; Required by gdk-pixbuf-2.0.pc
+      ("glib" ,glib)
+      ("libpng" ,libpng)
+      ;; Used for testing and required at runtime.
+      ("shared-mime-info" ,shared-mime-info)))
    (inputs
     `(("libjpeg" ,libjpeg)
       ("libtiff" ,libtiff)
-      ("libx11"  ,libx11)
-      ("shared-mime-info" ,shared-mime-info))) ; for testing
+      ("libx11"  ,libx11)))
    (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib "bin")                               ; glib-mkenums, etc.
-- 
cgit 1.4.1


From dbc3860cebfd52137809e543b08245e878fb636a Mon Sep 17 00:00:00 2001
From: Jookia <166291@gmail.com>
Date: Wed, 6 Apr 2016 21:00:58 +0800
Subject: gnu: gtk+-2: Look in system data dirs for themes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/patches/gtk2-theme-paths.patch: New patch.
* gnu/packages/gtk.scm (gtk+-2)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.

Signed-off-by: 宋文武 <iyzsong@gmail.com>
---
 gnu-system.am                               |  1 +
 gnu/packages/gtk.scm                        |  3 ++-
 gnu/packages/patches/gtk2-theme-paths.patch | 41 +++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/gtk2-theme-paths.patch

(limited to 'gnu/packages/gtk.scm')

diff --git a/gnu-system.am b/gnu-system.am
index 0c24c05d15..02c7374569 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -513,6 +513,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/guile-relocatable.patch			\
   gnu/packages/patches/guile-rsvg-pkgconfig.patch		\
   gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch	\
+  gnu/packages/patches/gtk2-theme-paths.patch			\
   gnu/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch	\
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
   gnu/packages/patches/hop-bigloo-4.0b.patch			\
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 23e015eace..f31a510504 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -557,7 +557,8 @@ is part of the GNOME accessibility project.")
             (sha256
              (base32
               "0l6aqk86aw5w132ygy6hv6nlxvd1h6xg7c85qbm60p6mnv1ww58d"))
-            (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"))))
+            (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"
+                                     "gtk2-theme-paths.patch"))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
    (propagated-inputs
diff --git a/gnu/packages/patches/gtk2-theme-paths.patch b/gnu/packages/patches/gtk2-theme-paths.patch
new file mode 100644
index 0000000000..6c1351e516
--- /dev/null
+++ b/gnu/packages/patches/gtk2-theme-paths.patch
@@ -0,0 +1,41 @@
+From: Jookia <166291@gmail.com>
+Subject: [PATCHv2] gtk: Patch GTK+ to look for themes in profiles.
+To: guix-devel@gnu.org
+Date: Sun, 13 Mar 2016 15:17:37 +1100
+Url: https://lists.gnu.org/archive/html/guix-devel/2016-03/msg00492.html
+
+diff -Naur gtk+-2.24.28.new/gtk/gtkrc.c gtk+-2.24.28/gtk/gtkrc.c
+--- gtk+-2.24.28.new/gtk/gtkrc.c	2016-03-13 10:31:14.413644362 +1100
++++ gtk+-2.24.28/gtk/gtkrc.c	2016-03-13 12:51:34.723398423 +1100
+@@ -808,6 +808,8 @@
+   gchar *path = NULL;
+   const gchar *home_dir;
+   gchar *subpath;
++  const gchar * const *xdg_data_dirs;
++  gint i;
+ 
+   if (type)
+     subpath = g_strconcat ("gtk-2.0-", type,
+@@ -830,6 +832,22 @@
+     }
+ 
+   if (!path)
++    {
++      xdg_data_dirs = g_get_system_data_dirs ();
++      for (i = 0; xdg_data_dirs[i]; i++)
++        {
++          path = g_build_filename (xdg_data_dirs[i], "themes", name, subpath, NULL);
++          if (g_file_test (path, G_FILE_TEST_EXISTS))
++            break;
++          else
++            {
++              g_free (path);
++              path = NULL;
++            }
++        }
++    }
++
++  if (!path)
+     {
+       gchar *theme_dir = gtk_rc_get_theme_dir ();
+       path = g_build_filename (theme_dir, name, subpath, NULL);
-- 
cgit 1.4.1