From bcb354ad94daaa16f710062dcbf1f979495a29f1 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Sun, 23 Aug 2015 18:24:08 +0800
Subject: gnu: Fix build failures due to missing XMLLINT.

This is a followup to commit 4b58d88.

* gnu/packages/gnome.scm (eog, epiphany, evince, gnome-desktop,
  gnome-klotski, gnome-mines, gnome-terminal, rhythmbox, seahorse,
  simple-scan, totem): Add LIBXML2 to native-inputs.
  (evince, gnome-desktop, rhythmbox): Move ITSTOOL to native-inputs.
---
 gnu/packages/gnome.scm | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4b26066379..b392399157 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -174,15 +174,16 @@ (define-public gnome-desktop
         "05lvik5cdh51xqd332qingph09zdhiaa1kqy9k2sk1simz4pvf8m"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
+     `(("itstool" ,itstool)
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("xmllint" ,libxml2)))
     (inputs
      `(("gdk-pixbuf" ,gdk-pixbuf)
        ("glib" ,glib)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gtk+" ,gtk+)
        ("iso-codes" ,iso-codes)
-       ("itstool" ,itstool)
        ("libx11" ,libx11)
        ("libxext" ,libxext)
        ("libxkbfile" ,libxkbfile)
@@ -408,7 +409,6 @@ (define-public evince
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("libgnome-keyring" ,libgnome-keyring)
        ("adwaita-icon-theme" ,adwaita-icon-theme)
-       ("itstool" ,itstool)
        ("gdk-pixbuf" ,gdk-pixbuf)
        ("atk" ,atk)
        ("pango" ,pango)
@@ -421,13 +421,14 @@ (define-public evince
        ("dconf" ,dconf)
        ("libcanberra" ,libcanberra)
        ("libsecret" ,libsecret)
-
        ;; For tests.
        ("dogtail" ,python2-dogtail)))
     (native-inputs
-     `(("intltool" ,intltool)
+     `(("itstool" ,itstool)
+       ("intltool" ,intltool)
        ("glib" ,glib "bin")
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("xmllint" ,libxml2)))
     (home-page
      "http://www.gnome.org/projects/evince/")
     (synopsis "GNOME's document viewer")
@@ -1607,7 +1608,8 @@ (define-public seahorse
      `(("intltool" ,intltool)
        ("glib:bin" ,glib "bin")
        ("itstool" ,itstool)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("xmllint" ,libxml2)))
     (home-page "https://launchpad.net/gnome-themes-standard")
     (synopsis "Manage encryption keys and passwords in the GNOME keyring")
     (description
@@ -2089,7 +2091,8 @@ (define-public gnome-mines
      `(("pkg-config" ,pkg-config)
        ("desktop-file-utils" ,desktop-file-utils)
        ("intltool" ,intltool)
-       ("itstool" ,itstool)))
+       ("itstool" ,itstool)
+       ("xmllint" ,libxml2)))
     (inputs
      `(("gtk+" ,gtk+)
        ("librsvg" ,librsvg)))
@@ -2128,7 +2131,8 @@ (define-public gnome-terminal
      `(("pkg-config" ,pkg-config)
        ("desktop-file-utils" ,desktop-file-utils)
        ("intltool" ,intltool)
-       ("itstool" ,itstool)))
+       ("itstool" ,itstool)
+       ("xmllint" ,libxml2)))
     (propagated-inputs
      `(("dconf" ,dconf)))
     (inputs
@@ -2764,7 +2768,8 @@ (define-public gnome-klotski
      `(("desktop-file-utils" ,desktop-file-utils)
        ("intltool" ,intltool)
        ("itstool" ,itstool)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("xmllint" ,libxml2)))
     (inputs
      `(("gtk+" ,gtk+)
        ("librsvg" ,librsvg)))
@@ -2899,7 +2904,8 @@ (define-public totem
        ("desktop-file-utils" ,desktop-file-utils)
        ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
-       ("itstool" ,itstool)))
+       ("itstool" ,itstool)
+       ("xmllint" ,libxml2)))
     (propagated-inputs
      `(("dconf" ,dconf)))
     (inputs
@@ -2996,11 +3002,13 @@ (define-public rhythmbox
    (propagated-inputs
     `(("dconf" ,dconf)))
    (native-inputs
-    `(("intltool" ,intltool)
+    `(("itstool" ,itstool)
+      ("intltool" ,intltool)
       ("glib" ,glib "bin")
       ("gobject-introspection" ,gobject-introspection)
       ("desktop-file-utils" ,desktop-file-utils)
-      ("pkg-config" ,pkg-config)))
+      ("pkg-config" ,pkg-config)
+      ("xmllint" ,libxml2)))
    (inputs
     `(("json-glib" ,json-glib)
       ("tdb" ,tdb)
@@ -3010,7 +3018,6 @@ (define-public rhythmbox
       ("vala" ,vala)
       ("gmime" ,gmime)
       ("nettle" ,nettle)
-      ("itstool" ,itstool)
       ("adwaita-icon-theme" ,adwaita-icon-theme)
       ("grilo" ,grilo)
       ("grilo-plugins" ,grilo-plugins)
@@ -3075,7 +3082,8 @@ (define-public eog
       ("itstool", itstool)
       ("glib" ,glib "bin")
       ("gobject-introspection" ,gobject-introspection)
-      ("pkg-config" ,pkg-config)))
+      ("pkg-config" ,pkg-config)
+      ("xmllint" ,libxml2)))
    (inputs
     `(("gnome-desktop" ,gnome-desktop)
       ("shared-mime-info" ,shared-mime-info)
@@ -3246,7 +3254,8 @@ (define-public simple-scan
        ("colord" ,colord)
        ("glib" ,glib "bin")                       ; glib-compile-schemas, etc.
        ("pkg-config" ,pkg-config)
-       ("vala" ,vala)))
+       ("vala" ,vala)
+       ("xmllint" ,libxml2)))
     (home-page "https://launchpad.net/simple-scan")
     (synopsis "Document and image scanner")
     (description "Simple Scan is an easy-to-use application, designed to let
@@ -3281,7 +3290,8 @@ (define-public epiphany
     (native-inputs
      `(("intltool" ,intltool)
        ("itstool" ,itstool)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("xmllint" ,libxml2)))
     (inputs
      `(("avahi" ,avahi)
        ("gcr" ,gcr)
-- 
cgit v1.2.3