[PATCH 01/11] gnu: at-spi2-core: Update to 2.16.0.

[PATCH 01/11] 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(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b3688d5..113037f 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -332,7 +332,7 @@ in the GNOME project.")
 (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 "/"
@@ -340,7 +340,7 @@ in the GNOME project.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "1ns44yibdgcwzwri7sr075hfs5rh5lgxkh71247a0822az3mahcn"))))
+              "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw"))))
    (build-system gnu-build-system)
    (inputs `(("dbus" ,dbus)
              ("glib" ,glib)
-- 
2.2.1

[PATCH 02/11] 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(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 113037f..459112c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -342,6 +342,13 @@ in the GNOME project.")
              (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)
@@ -349,9 +356,6 @@ in the GNOME project.")
    (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,
-- 
2.2.1

[PATCH 03/11] 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(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 459112c..176017a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -349,10 +349,13 @@ in the GNOME project.")
                  ;; 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)))
-- 
2.2.1

[PATCH 04/11] 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(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 176017a..68cfdf3 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -343,7 +343,8 @@ in the GNOME project.")
               "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.
@@ -357,8 +358,9 @@ in the GNOME project.")
     `(("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,
-- 
2.2.1

[PATCH 05/11] 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(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 68cfdf3..268723c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -51,7 +51,7 @@
 (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 "/"
@@ -59,7 +59,7 @@
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "177a9x6lz2im0mfgxv2crv0l740wy7rg5vlnb8wyyf4fmnh0q19f")))) ; 2.15.3
+              "0qp5i91kfk6rhrlam3s8ha0cz88lkyp89vsyn4pb5856c1h9hpq9"))))
    (build-system gnu-build-system)
    (inputs `(("glib" ,glib)))
    (native-inputs
-- 
2.2.1

[PATCH 06/11] 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(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 268723c..fdfb2fc 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -61,6 +61,12 @@
              (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)
-- 
2.2.1

[PATCH 07/11] 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(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index fdfb2fc..91e63f8 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -377,7 +377,7 @@ is part of the GNOME accessibility project.")
 (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 "/"
@@ -385,7 +385,7 @@ is part of the GNOME accessibility project.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "150sqc21difazqd53llwfdaqnwfy73bic9hia41xpfy9kcpzz9yy"))))
+              "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"))))
    (build-system gnu-build-system)
    (inputs `(("atk" ,atk)
              ("at-spi2-core" ,at-spi2-core)
-- 
2.2.1

[PATCH 08/11] 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(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 91e63f8..2f31e7b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -67,7 +67,7 @@
       (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.
-- 
2.2.1

[PATCH 09/11] 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(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2f31e7b..10868c7 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -387,15 +387,19 @@ is part of the GNOME accessibility project.")
              (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
-- 
2.2.1

[PATCH 10/11] 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(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 10868c7..a7c11e5 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -394,12 +394,13 @@ is part of the GNOME accessibility project.")
                  ;; 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
-- 
2.2.1

[PATCH 11/11] 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(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a7c11e5..57a7d9b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -348,8 +348,13 @@ in the GNOME project.")
              (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
-- 
2.2.1