Commit ba2c621b authored by Javier Jardón's avatar Javier Jardón

Revert "3.4: Move gnome-common to bootstrap moduleset"

This reverts commit 2e8536ae.
parent e3d831c4
......@@ -3,8 +3,6 @@
<moduleset>
<repository type="tarball" name="ftp.gnu.org"
href="ftp://ftp.gnu.org/gnu/"/>
<repository type="tarball" name="gnome.org"
href="http://download.gnome.org/sources/"/>
<repository type="tarball" name="pkgconfig"
href="http://pkgconfig.freedesktop.org/releases/"/>
<repository type="tarball" name="python"
......@@ -21,15 +19,6 @@
</branch>
</autotools>
<autotools id="gnome-common">
<branch repo="gnome.org"
module="gnome-common/3.1/gnome-common-3.1.0.tar.xz"
version="3.1.0"
hash="sha256:fbbc4e03f9276fb12b7cc2da769c932547cdec3b1604335b178270669dba257c"
size="151396">
</branch>
</autotools>
<autotools id="m4" autogen-sh="configure">
<branch repo="ftp.gnu.org"
module="m4/m4-1.4.11.tar.bz2" version="1.4.11"
......@@ -99,7 +88,6 @@
<metamodule id="meta-bootstrap">
<dependencies>
<dep package="gettext" />
<dep package="gnome-common" />
<dep package="autoconf" />
<dep package="libtool" />
<dep package="automake" />
......
......@@ -740,6 +740,7 @@
<branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gnome-common"/>
<dep package="gnome-doc-utils"/>
<dep package="gtk-doc" />
<dep package="gtk+"/>
......
......@@ -164,6 +164,7 @@
<dependencies>
<dep package="hicolor-icon-theme"/>
<dep package="icon-naming-utils"/>
<dep package="gnome-common"/>
<dep package="intltool"/>
<dep package="gtk+"/>
</dependencies>
......@@ -179,6 +180,7 @@
<autotools id="gnome-icon-theme-symbolic">
<branch/>
<dependencies>
<dep package="gnome-common"/>
<dep package="gtk+"/>
<dep package="icon-naming-utils"/>
</dependencies>
......@@ -202,6 +204,7 @@
<branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gnome-common"/>
<dep package="glib"/>
<dep package="gobject-introspection"/>
</dependencies>
......
......@@ -61,6 +61,7 @@
<autotools id="gcr">
<branch/>
<dependencies>
<dep package="gnome-common"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="libgcrypt" />
......@@ -69,9 +70,17 @@
</dependencies>
</autotools>
<!-- This is a special module: it's needed to build from git, but not
needed to build from tarballs, so it doesn't need to be in our suites
and it doesn't need to be an external dependency -->
<autotools id="gnome-common">
<branch/>
</autotools>
<autotools id="gnome-doc-utils">
<branch/>
<dependencies>
<dep package="gnome-common"/>
<dep package="libxslt"/>
<dep package="libxml2"/>
<dep package="intltool"/>
......@@ -92,6 +101,7 @@
hash="sha256:06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0"
md5sum="d6c91bf06681919ccfdf3624035b75dc" size="139287"/>
<dependencies>
<dep package="gnome-common"/>
</dependencies>
</tarball>
......@@ -886,6 +896,7 @@
<dep package="libxml2"/>
<dep package="glib"/>
<dep package="gdk-pixbuf"/>
<dep package="gnome-common"/>
<dep package="libcroco"/>
</dependencies>
</autotools>
......
......@@ -1376,6 +1376,7 @@
<autotools id="gnome-sound-theme">
<branch/>
<dependencies>
<dep package="gnome-common"/>
<dep package="intltool"/>
</dependencies>
</autotools>
......@@ -1877,6 +1878,7 @@
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
<dep package="gnome-common"/>
</dependencies>
</autotools>
......@@ -1885,6 +1887,7 @@
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
<dep package="gnome-common"/>
<dep package="pango"/>
<dep package="libgnomecups"/>
</dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment