[jhbuild/desrt/master: 4/35] 3.16: fill in a lot of base system depends

[Ryan Lortie <desrt src gnome org>]

commit 5ffd1cb07447d71255cc6e3fb44c315ba447fa99
Author: Ryan Lortie <desrt desrt ca>
Date:   Sun Dec 14 19:17:55 2014 -0500

    3.16: fill in a lot of base system depends
    
    Add sysdep packages for gettext-bin, xmlcatalog, pkg-config, python2,
    cc, libxml2-python, docbook-xsl, xmllint and xsltproc.
    
    The docbook-xsl and libxml2-python packages take advantage of the
    newly-added support for xml and python package sysdeps.
    
    This brings us quite close to being able to fully list off the packages
    required for installation into a base Debian system in order to build
    glib.
    
    automake is not explicitly listed here because it gets pulled in by
    intltool anyway (which pulls in make and a bunch of other nice stuff).
    We may want to make this more explicit in the future, but see below.
    
    We semi-arbitrarily list libtool, gettext-bin and cc on gtk-doc because
    this is the first package that requires these things and it gets pulled
    in by almost anything else that anyone would want to build (by way of
    glib).
    
    We do not list 'git', even though it is required to build almost
    anything.  We also do not list 'pkg-config' or 'xmlcatalog' on the
    packages that require those to be around for detecting the existence of
    other packages.  The best approach here would probably be to
    automatically add dependencies on these programs in case we find a
    package that will require them (eg: 'git' is required for any package
    downloaded from git).  We can also add a proper dependency on 'automake'
    in the same way.
    
    'pkg-config' and 'xmlcatalog' are listed as dependencies of jhbuild
    itself because if you use jhbuild to build itself then you really should
    have these programs available for jhbuild itself to use after it is
    installed.
    
    Some of these dependencies seem pretty theoretical (like checking if
    python is installed from a program written in python) but the
    completeness will allow us to easily generate a full list of all
    software that is required for using jhbuild to build a particular set of
    modules.  This will be useful for populating build chroots, among other
    things.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741538

 modulesets/gnome-apps-3.16.modules             |    5 ++
 modulesets/gnome-suites-core-deps-3.16.modules |    9 +++
 modulesets/gnome-sysdeps-3.16.modules          |   69 ++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.16.modules b/modulesets/gnome-apps-3.16.modules
index 7589096..821967b 100644
--- a/modulesets/gnome-apps-3.16.modules
+++ b/modulesets/gnome-apps-3.16.modules
@@ -1172,6 +1172,11 @@
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="yelp-tools"/>
+      <dep package="gettext-bin"/>
+      <dep package="xmlcatalog"/>
+      <dep package="pkg-config"/>
+      <dep package="python2"/>
+      <dep package="cc"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index f135831..250e3fb 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -159,6 +159,10 @@
     <dependencies>
       <dep package="libxslt"/>
       <dep package="yelp-tools"/>
+      <dep package="libtool"/>
+      <dep package="gettext-bin"/>
+      <dep package="docbook-xsl"/>
+      <dep package="cc"/>
     </dependencies>
   </autotools>
 
@@ -880,6 +884,9 @@
             size="96748">
       <patch file="itstool.use-correct-libxml.patch" strip="1"/>
     </branch>
+    <dependencies>
+      <dep package="libxml2-python"/>
+    </dependencies>
   </autotools>
 
   <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
@@ -1319,6 +1326,8 @@
       <dep package="intltool"/>
       <dep package="yelp-xsl"/>
       <dep package="itstool"/>
+      <dep package="xmllint"/>
+      <dep package="xsltproc"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index 30d9c0f..d476987 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -55,6 +55,13 @@
             version="1.8.4"/>
   </systemmodule>
 
+  <systemmodule id="cc">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="cc"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="cracklib">
     <branch repo="system"/>
     <systemdependencies>
@@ -104,6 +111,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="docbook-xsl">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="xml" name="http://docbook.sourceforge.net/release/xsl/current/"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="dotconf">
     <pkg-config>dotconf.pc</pkg-config>
     <branch repo="system" version="1.3"/>
@@ -209,6 +223,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="gettext-bin">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="msgfmt"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="gexiv2">
     <pkg-config>gexiv2.pc</pkg-config>
     <branch repo="system"/>
@@ -339,6 +360,13 @@
             version="5.0"/>
   </systemmodule>
 
+  <systemmodule id="libtool">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="libtoolize"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="libX11">
     <pkg-config>x11.pc</pkg-config>
     <branch repo="system"/>
@@ -629,6 +657,13 @@
             version="2.7.8"/>
   </systemmodule>
 
+  <systemmodule id="libxml2-python">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="python2" name="libxml2"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="libxslt">
     <pkg-config>libxslt.pc</pkg-config>
     <branch repo="system"
@@ -711,6 +746,13 @@
             version="0.30"/>
   </systemmodule>
 
+  <systemmodule id="pkg-config">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="pkg-config"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="plymouth">
     <pkg-config>ply-boot-client.pc</pkg-config>
     <branch repo="system"
@@ -742,6 +784,13 @@
             version="1.10.0"/>
   </systemmodule>
 
+  <systemmodule id="python2">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="python2"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="python2-devel">
     <pkg-config>python2.pc</pkg-config>
     <branch repo="system"
@@ -965,6 +1014,20 @@
     <branch repo="system" version="2.0.0"/>
   </systemmodule>
 
+  <systemmodule id="xmlcatalog">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="xmlcatalog"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="xmllint">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="xmllint"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="xmlto">
     <branch repo="system"/>
     <systemdependencies>
@@ -972,4 +1035,10 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="xsltproc">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="xsltproc"/>
+    </systemdependencies>
+  </systemmodule>
 </moduleset>