From 674fca0e41f3d227d436aa26f6c970d44536bc0e Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 14:45:35 +0800
Subject: gnu: gtk+-2: Update to 2.24.27.

* gnu/packages/gtk.scm (gtk+-2): Update to 2.24.27.
---
 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 b3688d5ec1..2ecaeb65e3 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -391,7 +391,7 @@ (define-public at-spi2-atk
 (define-public gtk+-2
   (package
    (name "gtk+")
-   (version "2.24.21")
+   (version "2.24.27")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -399,7 +399,7 @@ (define-public gtk+-2
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "1qyw73pr9ryqhir2h1kbx3vm70km4dg2fxrgkrdlpv0rvlb94bih"))))
+              "1x14rnjvqslpa1q19fp1qalz5sxds72amsgjk8m7769rwk511jr0"))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("atk" ,atk)
-- 
cgit v1.2.3


From dfbce50cdf36db8fe094afc50c3a24ae3a403839 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 15:05:11 +0800
Subject: gnu: gtk+-2: Add more inputs.

* gnu/packages/gtk.scm (gtk+-2)[inputs]: Add cups, libxcomposite,
  libxcursor, libxdamage, libxi, libxinerama and libxrandr.
  [native-inputs]: Add gettext.
  [arguments]: Add #:configure-flags.
---
 gnu/packages/gtk.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2ecaeb65e3..53d4122f7c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
+;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -405,14 +406,25 @@ (define-public gtk+-2
     `(("atk" ,atk)
       ("gdk-pixbuf" ,gdk-pixbuf)
       ("pango" ,pango)))
+   (inputs
+    `(("cups" ,cups)
+      ("libxcomposite" ,libxcomposite)
+      ("libxcursor" ,libxcursor)
+      ("libxdamage" ,libxdamage)
+      ("libxi" ,libxi)
+      ("libxinerama" ,libxinerama)
+      ("libxrandr" ,libxrandr)))
    (native-inputs
     `(("perl" ,perl)
+      ("gettext" ,gnu-gettext)
       ("glib" ,glib "bin")
       ("gobject-introspection" ,gobject-introspection)
       ("pkg-config" ,pkg-config)
       ("python-wrapper" ,python-wrapper)))
    (arguments
     `(#:make-flags '("CC=gcc")
+      #:configure-flags
+      (list "--with-xinput=yes")
       #:phases
       (alist-cons-before
        'configure 'disable-tests
-- 
cgit v1.2.3


From 6b1f238834fd60a487e2465c28f5d333c91c72aa Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 15:09:26 +0800
Subject: gnu: gtk+-2: Move html documentation to 'doc' output.

* gnu/packages/gtk.scm (gtk+-2)[outputs]: New field.
  [arguments]<#:configure-flags>: Add '--with-html-dir'.
---
 gnu/packages/gtk.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 53d4122f7c..4301b56034 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -402,6 +402,7 @@ (define-public gtk+-2
              (base32
               "1x14rnjvqslpa1q19fp1qalz5sxds72amsgjk8m7769rwk511jr0"))))
    (build-system gnu-build-system)
+   (outputs '("out" "doc"))
    (propagated-inputs
     `(("atk" ,atk)
       ("gdk-pixbuf" ,gdk-pixbuf)
@@ -424,7 +425,10 @@ (define-public gtk+-2
    (arguments
     `(#:make-flags '("CC=gcc")
       #:configure-flags
-      (list "--with-xinput=yes")
+      (list "--with-xinput=yes"
+            (string-append "--with-html-dir="
+                           (assoc-ref %outputs "doc")
+                           "/share/gtk-doc/html"))
       #:phases
       (alist-cons-before
        'configure 'disable-tests
-- 
cgit v1.2.3


From 0c75803b7caf9a2b8f4915efcab0ed826510d6af Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 10:24:07 +0800
Subject: gnu: at-spi2-core: Update to 2.16.0.

* gnu/packages/gtk.scm (at-spi2-core): Update to 2.16.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 4301b56034..98e8c47a12 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -333,7 +333,7 @@ (define-public gdk-pixbuf
 (define-public at-spi2-core
   (package
    (name "at-spi2-core")
-   (version "2.10.0")
+   (version "2.16.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -341,7 +341,7 @@ (define-public at-spi2-core
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "1ns44yibdgcwzwri7sr075hfs5rh5lgxkh71247a0822az3mahcn"))))
+              "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw"))))
    (build-system gnu-build-system)
    (inputs `(("dbus" ,dbus)
              ("glib" ,glib)
-- 
cgit v1.2.3


From af1086774504667ece55c4ca1ea29dbaa9447bb9 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 10:31:21 +0800
Subject: gnu: at-spi2-core: Enable tests.

* gnu/packages/gtk.scm (at-spi2-core)[arguments]: Remove #:tests? #f.
  Add #:phases.
---
 gnu/packages/gtk.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 98e8c47a12..f7303600b7 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -343,6 +343,13 @@ (define-public at-spi2-core
              (base32
               "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw"))))
    (build-system gnu-build-system)
+   (arguments
+    '(#:phases
+      (modify-phases %standard-phases
+        (replace check
+                 ;; Run test-suite under a dbus session.
+                 (lambda _
+                   (zero? (system* "dbus-launch" "make" "check")))))))
    (inputs `(("dbus" ,dbus)
              ("glib" ,glib)
              ("libxi" ,libxi)
@@ -350,9 +357,6 @@ (define-public at-spi2-core
    (native-inputs
      `(("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
-   (arguments
-    `(#:tests? #f)) ; FIXME: dbind/dbtest fails; one should disable tests in
-                    ; a more fine-grained way.
    (synopsis "Assistive Technology Service Provider Interface, core components")
    (description
     "The Assistive Technology Service Provider Interface, core components,
-- 
cgit v1.2.3


From c6a552daea6eae8f6cc47696cc407ba5c2b5d4da Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 10:39:02 +0800
Subject: gnu: at-spi2-core: Propagate inputs dbus and glib.

* gnu/packages/gtk.scm (at-spi2-core): Move dbus and glib to
  'propagated-inputs'.
---
 gnu/packages/gtk.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f7303600b7..bfc898935e 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -350,10 +350,13 @@ (define-public at-spi2-core
                  ;; Run test-suite under a dbus session.
                  (lambda _
                    (zero? (system* "dbus-launch" "make" "check")))))))
-   (inputs `(("dbus" ,dbus)
-             ("glib" ,glib)
-             ("libxi" ,libxi)
-             ("libxtst" ,libxtst)))
+   (propagated-inputs
+    ;; atspi-2.pc refers to all these.
+    `(("dbus" ,dbus)
+      ("glib" ,glib)))
+   (inputs
+    `(("libxi" ,libxi)
+      ("libxtst" ,libxtst)))
    (native-inputs
      `(("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From 50cc7f41b9620d37552b0a777d8a7e8500d06418 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 10:44:05 +0800
Subject: gnu: at-spi2-core: Enable GObject introspection.

* gnu/packages/gtk.scm (at-spi2-core)[arguments]: Add #:make-flags.
  [native-inputs]: Add gobject-introspection.
---
 gnu/packages/gtk.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bfc898935e..338bf64db7 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -344,7 +344,8 @@ (define-public at-spi2-core
               "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw"))))
    (build-system gnu-build-system)
    (arguments
-    '(#:phases
+    '(#:make-flags '("CC=gcc") ; for g-ir-scanner
+      #:phases
       (modify-phases %standard-phases
         (replace check
                  ;; Run test-suite under a dbus session.
@@ -358,8 +359,9 @@ (define-public at-spi2-core
     `(("libxi" ,libxi)
       ("libxtst" ,libxtst)))
    (native-inputs
-     `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
+    `(("gobject-introspection" ,gobject-introspection)
+      ("intltool" ,intltool)
+      ("pkg-config" ,pkg-config)))
    (synopsis "Assistive Technology Service Provider Interface, core components")
    (description
     "The Assistive Technology Service Provider Interface, core components,
-- 
cgit v1.2.3


From 20342b7e7ede8a4c09144296895219547addba63 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 11:03:07 +0800
Subject: gnu: atk: Update to 2.16.0.

* gnu/packages/gtk.scm (atk): Update to 2.16.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 338bf64db7..49a3432e5d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -52,7 +52,7 @@ (define-module (gnu packages gtk)
 (define-public atk
   (package
    (name "atk")
-   (version "2.15.3")
+   (version "2.16.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -60,7 +60,7 @@ (define-public atk
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "177a9x6lz2im0mfgxv2crv0l740wy7rg5vlnb8wyyf4fmnh0q19f")))) ; 2.15.3
+              "0qp5i91kfk6rhrlam3s8ha0cz88lkyp89vsyn4pb5856c1h9hpq9"))))
    (build-system gnu-build-system)
    (inputs `(("glib" ,glib)))
    (native-inputs
-- 
cgit v1.2.3


From cd0466ebf83518bd71ccb02484bd66c5008ea9ed Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 11:07:12 +0800
Subject: gnu: atk: Move html documentation to 'doc' output.

* gnu/packages/gtk.scm (atk)[outputs]: New field.
  [arguments]: New field.
---
 gnu/packages/gtk.scm | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 49a3432e5d..7faa9384a1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -62,6 +62,12 @@ (define-public atk
              (base32
               "0qp5i91kfk6rhrlam3s8ha0cz88lkyp89vsyn4pb5856c1h9hpq9"))))
    (build-system gnu-build-system)
+   (outputs '("out" "doc"))
+   (arguments
+    `(#:configure-flags
+      (list (string-append "--with-html-dir="
+                           (assoc-ref %outputs "doc")
+                           "/share/gtk-doc/html"))))
    (inputs `(("glib" ,glib)))
    (native-inputs
     `(("pkg-config" ,pkg-config)
-- 
cgit v1.2.3


From d3d4bc0bc4a408ee2971392ba55253132100d11c Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 11:08:24 +0800
Subject: gnu: at-spi2-atk: Update to 2.16.0.

* gnu/packages/gtk.scm (at-spi2-atk): Update to 2.16.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 7faa9384a1..52795ed97a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -378,7 +378,7 @@ (define-public at-spi2-core
 (define-public at-spi2-atk
   (package
    (name "at-spi2-atk")
-   (version "2.10.0")
+   (version "2.16.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -386,7 +386,7 @@ (define-public at-spi2-atk
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "150sqc21difazqd53llwfdaqnwfy73bic9hia41xpfy9kcpzz9yy"))))
+              "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"))))
    (build-system gnu-build-system)
    (inputs `(("atk" ,atk)
              ("at-spi2-core" ,at-spi2-core)
-- 
cgit v1.2.3


From 13a9e2919097f85bd12f0470f79cbea63dafc819 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 11:11:50 +0800
Subject: gnu: atk: Propagate input glib.

* gnu/packages/gtk.scm (atk): Move glib to 'propagated-inputs'.
---
 gnu/packages/gtk.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 52795ed97a..e45d200bd1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -68,7 +68,7 @@ (define-public atk
       (list (string-append "--with-html-dir="
                            (assoc-ref %outputs "doc")
                            "/share/gtk-doc/html"))))
-   (inputs `(("glib" ,glib)))
+   (propagated-inputs `(("glib" ,glib))) ; required by atk.pc
    (native-inputs
     `(("pkg-config" ,pkg-config)
       ("glib" ,glib "bin")                               ; glib-mkenums, etc.
-- 
cgit v1.2.3


From 57fcd2241524533fe082533a2bbbfb21918c2df8 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 11:17:06 +0800
Subject: gnu: at-spi2-atk: Enable tests.

* gnu/packages/gtk.scm (at-spi2-atk)[arguments]: Remove #:tests? #f.
  Add #:phases.
---
 gnu/packages/gtk.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index e45d200bd1..bfe13cfa85 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -388,15 +388,19 @@ (define-public at-spi2-atk
              (base32
               "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"))))
    (build-system gnu-build-system)
+   (arguments
+    '(#:phases
+      (modify-phases %standard-phases
+        (replace check
+                 ;; Run test-suite under a dbus session.
+                 (lambda _
+                   (zero? (system* "dbus-launch" "make" "check")))))))
    (inputs `(("atk" ,atk)
              ("at-spi2-core" ,at-spi2-core)
              ("dbus" ,dbus)
              ("glib" ,glib)))
    (native-inputs
      `(("pkg-config" ,pkg-config)))
-   (arguments
-    `(#:tests? #f)) ; FIXME: droute/droute-test fails; one should disable
-                    ; tests in a more fine-grained way.
    (synopsis "Assistive Technology Service Provider Interface, ATK bindings")
    (description
     "The Assistive Technology Service Provider Interface
-- 
cgit v1.2.3


From 6967cc3f28ce2d62e2b5c344c3e2e16079fc59d0 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 11:24:40 +0800
Subject: gnu: at-spi2-atk: Propagate input at-spi2-core.

* gnu/packages/gtk.scm (at-spi2-atk): Move at-spi2-core to 'propagated-inputs'.
  Move dbus to 'native-inputs'.
---
 gnu/packages/gtk.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bfe13cfa85..95d005a6f6 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -395,12 +395,13 @@ (define-public at-spi2-atk
                  ;; Run test-suite under a dbus session.
                  (lambda _
                    (zero? (system* "dbus-launch" "make" "check")))))))
-   (inputs `(("atk" ,atk)
-             ("at-spi2-core" ,at-spi2-core)
-             ("dbus" ,dbus)
-             ("glib" ,glib)))
+   (propagated-inputs
+    `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc
+   (inputs
+    `(("atk" ,atk)))
    (native-inputs
-     `(("pkg-config" ,pkg-config)))
+    `(("dbus" ,dbus) ; for testing
+      ("pkg-config" ,pkg-config)))
    (synopsis "Assistive Technology Service Provider Interface, ATK bindings")
    (description
     "The Assistive Technology Service Provider Interface
-- 
cgit v1.2.3


From 068a53c36dec5ace42cc3ea89060d9a485592f08 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Wed, 8 Apr 2015 11:30:58 +0800
Subject: gnu: at-spi2-core: Move html documentation to 'doc' output.

* gnu/packages/gtk.scm (at-spi2-core)[outputs]: New field.
  [arguments]: Add #:configure-flags.
---
 gnu/packages/gtk.scm | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 95d005a6f6..0dd3b37b3c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -349,8 +349,13 @@ (define-public at-spi2-core
              (base32
               "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw"))))
    (build-system gnu-build-system)
+   (outputs '("out" "doc"))
    (arguments
     '(#:make-flags '("CC=gcc") ; for g-ir-scanner
+      #:configure-flags
+      (list (string-append "--with-html-dir="
+                           (assoc-ref %outputs "doc")
+                           "/share/gtk-doc/html"))
       #:phases
       (modify-phases %standard-phases
         (replace check
-- 
cgit v1.2.3