[gtk-osx] Rearrange bootstrap.modules and gtk-osx-bootstrap.modules
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Rearrange bootstrap.modules and gtk-osx-bootstrap.modules
- Date: Sun, 5 May 2013 17:46:45 +0000 (UTC)
commit dc475c215a851d478da5d182647d0d37c84155bc
Author: John Ralls <jralls ceridwen us>
Date: Fri Apr 26 14:29:16 2013 -0700
Rearrange bootstrap.modules and gtk-osx-bootstrap.modules
So that all tools are in the former and all dependencies are in the latter. The intention is to enable
building the tools into ~/.local once instead of requiring an individual build per tree.
That doesn't work quite right because xz at least won't build universal 32/64 directly (I haven't yet
tried separate compiles and lipo).
modulesets-stable/bootstrap.modules | 97 +++++++++++++++++---
modulesets-stable/gtk-osx-bootstrap.modules | 116 ++++++------------------
modulesets-stable/gtk-osx-python.modules | 5 +-
modulesets-stable/gtk-osx-random.modules | 8 +--
modulesets-stable/gtk-osx-universal.modules | 1 -
modulesets-stable/gtk-osx.modules | 1 -
modulesets-unstable/gtk-osx-bootstrap.modules | 119 ++++++++-----------------
modulesets-unstable/gtk-osx-python.modules | 1 -
modulesets-unstable/gtk-osx-random.modules | 1 -
modulesets-unstable/gtk-osx-universal.modules | 1 -
modulesets-unstable/gtk-osx.modules | 1 -
modulesets/gtk-osx-bootstrap.modules | 110 ++++++++---------------
modulesets/gtk-osx-random.modules | 1 -
modulesets/gtk-osx-universal.modules | 1 -
modulesets/gtk-osx.modules | 1 -
15 files changed, 192 insertions(+), 272 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 67c5461..b921edb 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -1,6 +1,8 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: nxml -*-->
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset>
+ <repository type="tarball" name="ftp.gnome.org" default="yes"
+ href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
<repository type="tarball" name="ftp.gnu.org"
href="ftp://ftp.gnu.org/gnu/"/>
<repository type="tarball" name="pkgconfig"
@@ -13,11 +15,16 @@
href="http://archive.apache.org/dist/"/>
<repository type="tarball" name="tukaani.org"
href="http://tukaani.org/"/>
+ <repository type="tarball" name="cmake"
+ href="http://www.cmake.org/files/"/>
+ <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
+ <repository type="tarball" name="intltool"
+ href="http://launchpad.net/intltool/trunk/"/>
<autotools id="make">
<branch repo="ftp.gnu.org" module="make/make-3.82.tar.gz" version="3.82"/>
</autotools>
-
+
<autotools id="xz" autogen-sh="configure">
<branch repo="tukaani.org" module="xz/xz-5.0.4.tar.bz2" version="5.0.4"/>
</autotools>
@@ -42,23 +49,18 @@
</dependencies>
</autotools>
- <autotools id="gettext" autogen-sh="configure"
+ <autotools id="gettext-tools" autogen-sh="configure"
autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf
--disable-csharp">
- <branch repo="ftp.gnu.org"
+ <branch repo="ftp.gnu.org" source-subdir="gettext-tools"
module="gettext/gettext-0.18.1.1.tar.gz" version="0.18.1.1"
size="15139737" md5sum="3dd55b952826d2b32f51308f2f91aa89">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gettext-bug33999-stpncpy.patch";
strip="1"/>
</branch>
</autotools>
- <autotools id='readline' autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="readline/readline-6.2.tar.gz"
- version="6.2">
- <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-001"; strip="0"/>
- <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-002"; strip="0"/>
- <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-003"; strip="0"/>
- <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-004"; strip="0"/>
- </branch>
+ <autotools id="cmake" autogen-sh="bootstrap"
+ autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
+ <branch repo="cmake" module="v2.8/cmake-2.8.9.tar.gz" version="2.8.9"/>
</autotools>
<autotools id="m4" autogen-sh="configure">
@@ -124,12 +126,75 @@
version="2.5.37"/>
</autotools>
+ <!-- Expat could be skipped for >= 10.5 since it's is part of the SDK there. -->
+ <autotools id="expat" autogen-sh="configure">
+ <branch module="expat/expat-2.1.0.tar.gz" version="2.1.0"
+ repo="sourceforge"/>
+ </autotools>
+
+ <perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
+ <branch repo="cpan"
+ module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
+ version="2.41"/>
+ <dependencies>
+ <dep package="expat"/>
+ </dependencies>
+ </perl>
+
+ <perl id="perl-xml-simple">
+ <branch repo="cpan"
+ module="authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz" version="2.20"
+ size="75993" md5sum="4d10964e123b76eca36678464daa63cd"/>
+ <dependencies>
+ <dep package="perl-xml-parser"/>
+ </dependencies>
+ </perl>
+
+ <!-- Needed for building Gnome apps from the repository -->
+ <autotools id="gnome-common">
+ <branch module="gnome-common/3.6/gnome-common-3.6.0.tar.xz" version="3.6.0"
+ hash="sha256:e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95"/>
+ </autotools>
+ <!-- This is generated by tarring up the needed docbook stylesheets
+ for gtk-doc to work. If someone wants to work on a setup that
+ uses the real docbook source from upstream, feel free to do so,
+ it used to be a huge amount of work, but might be easier these
+ days.
+
+ -->
+ <autotools id="gtk-osx-docbook" autogen-sh="configure"
+ supports-non-srcdir-builds="no" >
+ <branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.1.tar.gz"
+ version="1.1"/>
+ </autotools>
+
+ <autotools id="gtk-doc" autogenargs="--disable-scrollkeeper
--with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
+ makeargs="-k -i" makeinstallargs="-k -i install"
+ autogen-sh="configure">
+ <branch version="1.18" module="gtk-doc/1.18/gtk-doc-1.18.tar.bz2"
+ hash="sha256:a634d2e93d70468237033c06a17c97f29cf71a35ac5cc01c016324c965d42f73"/>
+ <dependencies>
+ <dep package="gtk-osx-docbook"/>
+ <dep package="gnome-doc-utils"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="intltool" autogen-sh="configure">
+ <branch repo="intltool" module="0.50.2/+download/intltool-0.50.2.tar.gz"
+ version="0.50.2"
+ hash="md5:23fbd879118253cb99aeac067da5f591"/>
+ <dependencies>
+ <dep package="gnome-common"/>
+ <dep package="perl-xml-parser"/>
+ </dependencies>
+ </autotools>
+
<metamodule id="meta-bootstrap">
<dependencies>
<dep package="xz"/>
<dep package="make"/> <!-- Needed for Tiger, skipped otherwise -->
<dep package="subversion"/> <!-- Needed for Tiger, skipped otherwise -->
- <dep package="gettext" /> <!-- Needed for 64-bit -->
+ <dep package="gettext-tools" /> <!-- Needed for 64-bit -->
<dep package="m4"/> <!-- Can be skipped for Leopard and later -->
<dep package="autoconf" />
<dep package="libtool" />
@@ -141,7 +206,13 @@
<dep package="pkg-config" />
<dep package="bison"/> <!-- included for Tiger, skipped otherwise -->
<dep package="flex"/> <!-- included for Tiger, skipped otherwise -->
- <dep package="readline"/>
+ <dep package="expat"/>
+ <dep package="perl-xml-parser"/>
+ <dep package="perl-xml-simple"/>
+ <dep package="gtk-osx-docbook"/>
+ <dep package="gtk-doc"/>
+ <dep package="gnome-common"/>
+ <dep package="intltool"/>
</dependencies>
</metamodule>
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index e4a6cac..757322b 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -6,7 +6,6 @@
<repository type="tarball" name="ftp.gnome.org" default="yes"
href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
<repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
- <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
<repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="tarball" name="jpeg"
@@ -17,12 +16,8 @@
href="http://www.freedesktop.org/software/fontconfig/release/"/>
<repository type="tarball" name="icon-theme"
href="http://icon-theme.freedesktop.org/releases/"/>
- <repository type="tarball" name="cmake"
- href="http://www.cmake.org/files/"/>
<repository type="tarball" name="xmlsoft.org"
href="ftp://xmlsoft.org/libxml2/"/>
- <repository type="tarball" name="intltool"
- href="http://launchpad.net/intltool/trunk/"/>
<repository type="git" name="git.gnome.org"
href="git://git.gnome.org/"/>
<repository type="tarball" name="harfbuzz"
@@ -30,6 +25,16 @@
<repository type="tarball" name="cups"
href="http://ftp.easysw.com/pub/"/>
+ <autotools id='readline' autogen-sh="configure">
+ <branch repo="ftp.gnu.org" module="readline/readline-6.2.tar.gz"
+ version="6.2">
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-001"; strip="0"/>
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-002"; strip="0"/>
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-003"; strip="0"/>
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-004"; strip="0"/>
+ </branch>
+ </autotools>
+
<autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
<branch version="1.5.13" module="libpng/libpng-1.5.13.tar.bz2"
repo="sourceforge"/>
@@ -56,8 +61,9 @@
otherwise the links in the SDKs are messed up and libxml's python
module won't link. In case you're wondering, gnome-doc-utils
needs libxml2's python module. -->
+
<autotools id="libxml2" autogen-sh="configure">
- <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
+ <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
repo="xmlsoft.org">
<patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libxml2-Bug-686118-pthreads_once_init.patch";
strip="1"/>
</branch>
@@ -75,40 +81,21 @@
</dependencies>
</autotools>
- <!-- This is generated by tarring up the needed docbook stylesheets
- for gtk-doc to work. If someone wants to work on a setup that
- uses the real docbook source from upstream, feel free to do so,
- it used to be a huge amount of work, but might be easier these
- days.
-
- -->
- <autotools id="gtk-osx-docbook" autogen-sh="configure" >
- <branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.1.tar.gz"
- version="1.1"/>
- </autotools>
-
- <autotools id="gnome-common">
- <branch module="gnome-common/3.6/gnome-common-3.6.0.tar.xz" version="3.6.0"
- hash="sha256:e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95"/>
- </autotools>
-
+<!-- Yes, this is a tool and it should be in bootstrap.modules, but it
+ needs libxslt and libxml2, both of which are dependencies for a
+ lot of packages. -->
+<!-- This has python bits that don't work in a separate build
+ dir. Until a better solution is found, just copy the source into
+ the build and try again.-->
<autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper"
autogen-sh="configure" >
<branch module="gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz"
version="0.20.10" hash="sha256:cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"/>
<dependencies>
- <dep package="gtk-osx-docbook"/>
<dep package="libxslt"/>
- <dep package="intltool"/>
- <dep package="gnome-common"/>
</dependencies>
</autotools>
- <!-- Expat could be skipped for >= 10.5 since it's is part of the SDK there. -->
- <autotools id="expat" autogen-sh="configure">
- <branch module="expat/expat-2.1.0.tar.gz" version="2.1.0"
- repo="sourceforge"/>
- </autotools>
<!-- Cups is needed *only* for Tiger, and skipped otherwise -->
<autotools id='cups' autogen-sh='configure' skip-autogen='never'
autogenargs='DSOFLAGS="$LDFLAGS"'>
@@ -141,82 +128,36 @@
autogenargs="--disable-docs">
<branch repo="fontconfig" version="2.10.91" module="fontconfig-2.10.91.tar.gz"/>
<dependencies>
- <dep package="expat"/>
<dep package="freetype"/>
</dependencies>
</autotools>
- <perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
- <branch repo="cpan"
- module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
- version="2.41"/>
- <dependencies>
- <dep package="expat"/>
- </dependencies>
- </perl>
-
- <perl id="perl-xml-simple">
- <branch repo="cpan"
- module="authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz" version="2.20"
- size="75993" md5sum="4d10964e123b76eca36678464daa63cd"/>
- <dependencies>
- <dep package="perl-xml-parser"/>
- </dependencies>
- </perl>
-
- <!-- Needed for building Gnome apps from the repository -->
- <autotools id="gnome-common" autogen-sh="configure">
- <branch module="gnome-common/3.6/gnome-common-3.6.0.tar.xz"
- version="3.6.0" hash="sha256:e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95"/>
- </autotools>
-
- <autotools id="gtk-doc" autogenargs="--disable-scrollkeeper
--with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
- makeargs="-k -i" makeinstallargs="-k -i install"
- autogen-sh="configure">
- <branch version="1.18" module="gtk-doc/1.18/gtk-doc-1.18.tar.bz2"
- hash="sha256:a634d2e93d70468237033c06a17c97f29cf71a35ac5cc01c016324c965d42f73"/>
- <dependencies>
- <dep package="gtk-osx-docbook"/>
- <dep package="gnome-doc-utils"/>
- </dependencies>
- </autotools>
-
+<!-- Another one that won't build in a separate directory -->
<autotools id="hicolor-icon-theme" autogen-sh="configure">
<branch module="hicolor-icon-theme-0.11.tar.gz" repo="icon-theme"
version="0.11" />
</autotools>
- <autotools id="intltool" autogen-sh="configure">
- <branch repo="intltool" module="0.50.2/+download/intltool-0.50.2.tar.gz"
- version="0.50.2"
- hash="md5:23fbd879118253cb99aeac067da5f591"/>
- <dependencies>
- <dep package="gnome-common"/>
- <dep package="perl-xml-parser"/>
- </dependencies>
- </autotools>
-
- <autotools id="cmake" autogen-sh="bootstrap"
- autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
- <branch repo="cmake" module="v2.8/cmake-2.8.9.tar.gz" version="2.8.9"/>
+ <autotools id="gettext-runtime" autogen-sh="configure"
+ autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf
--disable-csharp">
+ <branch repo="ftp.gnu.org" source-subdir="gettext-runtime"
+ module="gettext/gettext-0.18.1.1.tar.gz" version="0.18.1.1"
+ size="15139737" md5sum="3dd55b952826d2b32f51308f2f91aa89">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gettext-bug33999-stpncpy.patch";
strip="1"/>
+ </branch>
</autotools>
<metamodule id="meta-gtk-osx-bootstrap">
<dependencies>
+ <dep package="readline"/>
<dep package="cups"/>
<dep package="libpng"/>
- <dep package="gtk-doc"/>
<dep package="libjpeg"/>
<dep package="libtiff"/>
- <dep package="gtk-osx-docbook"/>
+ <dep package="gettext-runtime"/>
<dep package="gnome-doc-utils"/>
- <dep package="expat"/>
- <dep package="perl-xml-parser"/>
- <dep package="perl-xml-simple"/>
<dep package="hicolor-icon-theme"/>
- <dep package="gnome-common"/>
- <dep package="intltool"/>
</dependencies>
</metamodule>
@@ -224,7 +165,6 @@
<dependencies>
<dep package="freetype"/>
<dep package="fontconfig"/>
- <dep package="expat"/>
<dep package="harfbuzz"/>
</dependencies>
</metamodule>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index e3c5377..1d0fc13 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -53,7 +53,7 @@
module="2.7.3/Python-2.7.3.tar.xz" version="2.7.3">
</branch>
<dependencies>
- <dep package="expat"/>
+ <dep package="gettext-runtime"/>
</dependencies>
<after>
<dep package="berkeleydb"/>
@@ -62,6 +62,9 @@
<autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
<branch repo="python" module="3.3.0/Python-3.3.0.tar.xz" version="3.3.0"/>
+ <dependencies>
+ <dep package="gettext-runtime"/>
+ </dependencies>
<after>
<dep package="berkeleydb"/>
</after>
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 57336fc..bc4bcdf 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -258,7 +258,6 @@ Libglade itself is deprecated. This is the last release. -->
<branch module="shared-mime-info-1.0.tar.xz" version="1.0"
repo="hadess"/>
<dependencies>
- <dep package="intltool"/>
<dep package="glib"/>
</dependencies>
</autotools>
@@ -283,12 +282,7 @@ Libglade itself is deprecated. This is the last release. -->
</dependencies>
</autotools>
- <autotools id='readline' >
- <branch repo="ftp.gnu.org" module="readline/readline-6.2.tar.gz"
- version="6.2"/>
- </autotools>
-
-<autotools id="babl" >
+ <autotools id="babl" >
<branch repo="ftp.gtk.org" version="0.1.10"
module="babl/0.1/babl-0.1.10.tar.bz2">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Bug-673403-replace-values_h.patch";
strip="1"/>
diff --git a/modulesets-stable/gtk-osx-universal.modules b/modulesets-stable/gtk-osx-universal.modules
index 712a716..86fb414 100644
--- a/modulesets-stable/gtk-osx-universal.modules
+++ b/modulesets-stable/gtk-osx-universal.modules
@@ -20,7 +20,6 @@
</dependencies>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
- <dep package="gtk-doc"/>
</after>
</metamodule>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 959f82c..9661bf8 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -70,7 +70,6 @@
hash="sha256:855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7"/>
<dependencies>
<dep package="libffi"/>
- <dep package="gtk-doc"/>
</dependencies>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 6f0feaf..e2306d2 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -6,7 +6,6 @@
<repository type="tarball" name="ftp.gnome.org" default="yes"
href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
<repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
- <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
<repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="git" name="nongnu"
@@ -19,14 +18,22 @@
href="git://anongit.freedesktop.org/"/>
<repository type="tarball" name="icon-theme"
href="http://icon-theme.freedesktop.org/releases/"/>
- <repository type="tarball" name="cmake"
- href="http://www.cmake.org/files/"/>
<repository type="tarball" name="xmlsoft.org"
href="ftp://xmlsoft.org/libxml2/"/>
- <repository type="tarball" name="intltool"
- href="http://launchpad.net/intltool/trunk/"/>
<repository type="git" name="git.gnome.org"
href="git://git.gnome.org/"/>
+ <repository type="tarball" name="cups"
+ href="http://ftp.easysw.com/pub/"/>
+
+ <autotools id='readline' autogen-sh="configure">
+ <branch repo="ftp.gnu.org" module="readline/readline-6.2.tar.gz"
+ version="6.2">
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-001"; strip="0"/>
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-002"; strip="0"/>
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-003"; strip="0"/>
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-004"; strip="0"/>
+ </branch>
+ </autotools>
<autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
<branch version="1.5.13" module="libpng/libpng-1.5.13.tar.bz2"
@@ -77,38 +84,29 @@
</dependencies>
</autotools>
- <!-- This is generated by tarring up the needed docbook stylesheets
- for gtk-doc to work. If someone wants to work on a setup that
- uses the real docbook source from upstream, feel free to do so,
- it used to be a huge amount of work, but might be easier these
- days.
-
- -->
- <autotools id="gtk-osx-docbook" autogen-sh="configure" >
- <branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.1.tar.gz"
- version="1.1"/>
- </autotools>
-
- <autotools id="gnome-common">
- <branch repo="git.gnome.org"/>
- </autotools>
-
+<!-- Yes, this is a tool and it should be in bootstrap.modules, but
+ the dependency on lixslt makes that not possible. -->
+<!-- This has python bits that don't work in a separate build
+ dir. Until a better solution is found, just copy the source int
+ the build and try again. -->
<autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper" >
<branch repo="git.gnome.org"/>
<dependencies>
- <dep package="gtk-osx-docbook"/>
<dep package="libxslt"/>
- <dep package="intltool"/>
- <dep package="gnome-common"/>
</dependencies>
</autotools>
- <!-- Expat could be skipped for >= 10.5 since it's is part of the SDK there. -->
- <autotools id="expat" autogen-sh="configure">
- <branch module="expat/expat-2.1.0.tar.gz" version="2.1.0"
- repo="sourceforge"/>
+ <!-- Cups is needed *only* for Tiger, and skipped otherwise -->
+ <autotools id='cups' autogen-sh='configure' skip-autogen='never'
+ autogenargs='DSOFLAGS="$LDFLAGS"'>
+ <branch module="cups/1.2.12/cups-1.2.12-source.tar.bz2"
+ version="1.2.12" repo="cups" checkoutdir='cups-1.2.12'/>
+ <dependencies>
+ <dep package="libtiff"/>
+ </dependencies>
</autotools>
+
<autotools id="harfbuzz">
<branch repo="freedesktop"/>
<dependencies>
@@ -130,75 +128,35 @@
<autotools id="fontconfig" autogenargs="--disable-docs">
<branch repo="freedesktop"/>
<dependencies>
- <dep package="expat"/>
<dep package="freetype"/>
</dependencies>
</autotools>
- <perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
- <branch repo="cpan"
- module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
- version="2.41"/>
- <dependencies>
- <dep package="expat"/>
- </dependencies>
- </perl>
-
- <perl id="perl-xml-simple">
- <branch repo="cpan"
- module="authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz" version="2.20"
- size="75993" md5sum="4d10964e123b76eca36678464daa63cd"/>
- <dependencies>
- <dep package="perl-xml-parser"/>
- </dependencies>
- </perl>
-
- <autotools id="gtk-doc" autogenargs="--disable-scrollkeeper
--with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
- makeargs="-k -i" makeinstallargs="-k -i install">
- <branch repo="git.gnome.org"/>
- <dependencies>
- <dep package="gtk-osx-docbook"/>
- <dep package="gnome-doc-utils"/>
- </dependencies>
- </autotools>
-
+<!-- Another one that won't build in a separate directory -->
<autotools id="hicolor-icon-theme" autogen-sh="configure">
<branch module="hicolor-icon-theme-0.11.tar.gz" repo="icon-theme"
version="0.11" />
</autotools>
-<!-- Intltool keeps their repo on Launchpad, so they use bizarre. To
- avoid having a one-off dependency, we'll stick with the
- tarball. -->
- <autotools id="intltool" autogen-sh="configure">
- <branch repo="intltool" module="0.50.2/+download/intltool-0.50.2.tar.gz"
- version="0.50.2"
- hash="md5:23fbd879118253cb99aeac067da5f591"/>
- <dependencies>
- <dep package="gnome-common"/>
- <dep package="perl-xml-parser"/>
- </dependencies>
- </autotools>
-
- <autotools id="cmake" autogen-sh="bootstrap"
- autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
- <branch repo="cmake" module="v2.8/cmake-2.8.9.tar.gz" version="2.8.9"/>
+ <autotools id="gettext-runtime" autogen-sh="configure"
+ autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf
--disable-csharp">
+ <branch repo="ftp.gnu.org" source-subdir="gettext-runtime"
+ module="gettext/gettext-0.18.1.1.tar.gz" version="0.18.1.1"
+ size="15139737" md5sum="3dd55b952826d2b32f51308f2f91aa89">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gettext-bug33999-stpncpy.patch";
strip="1"/>
+ </branch>
</autotools>
- <metamodule id="meta-gtk-osx-bootstrap">
+ <metamodule id="meta-gtk-osx-bootstrap">
<dependencies>
+ <dep package="readline"/>
+ <dep package="cups"/>
<dep package="libpng"/>
- <dep package="gtk-doc"/>
<dep package="libjpeg"/>
<dep package="libtiff"/>
- <dep package="gtk-osx-docbook"/>
+ <dep package="gettext-runtime"/>
<dep package="gnome-doc-utils"/>
- <dep package="expat"/>
- <dep package="perl-xml-parser"/>
- <dep package="perl-xml-simple"/>
<dep package="hicolor-icon-theme"/>
- <dep package="gnome-common"/>
- <dep package="intltool"/>
</dependencies>
</metamodule>
@@ -207,7 +165,6 @@
<dep package="harfbuzz"/>
<dep package="freetype"/>
<dep package="fontconfig"/>
- <dep package="expat"/>
</dependencies>
</metamodule>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 9b43eee..5f30ec8 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -44,7 +44,6 @@
module="2.7.3/Python-2.7.3.tar.xz" version="2.7.3">
</branch>
<dependencies>
- <dep package="expat"/>
</dependencies>
<after>
<dep package="berkeleydb4.8"/>
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index 92d4fad..c51d190 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -192,7 +192,6 @@
<branch module="xdg/shared-mime-info"
repo="git.freedesktop.org"/>
<dependencies>
- <dep package="intltool"/>
<dep package="glib"/>
</dependencies>
</autotools>
diff --git a/modulesets-unstable/gtk-osx-universal.modules b/modulesets-unstable/gtk-osx-universal.modules
index c3555a8..72c8c31 100644
--- a/modulesets-unstable/gtk-osx-universal.modules
+++ b/modulesets-unstable/gtk-osx-universal.modules
@@ -18,7 +18,6 @@
</dependencies>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
- <dep package="gtk-doc"/> <!-- FIXME: http://bugs.gnome.org/546640 -->
</after>
</metamodule>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index bd71a68..f5db602 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -66,7 +66,6 @@
<branch />
<dependencies>
<dep package="meta-gtk-osx-bootstrap"/>
- <dep package="gtk-doc"/> <!-- FIXME: http://bugs.gnome.org/546640 -->
<dep package="libffi"/>
</dependencies>
</autotools>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 05c2fcf..618928a 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -6,7 +6,6 @@
<repository type="tarball" name="ftp.gnome.org" default="yes"
href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
<repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
- <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
<repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="git" name="nongnu"
@@ -19,14 +18,22 @@
href="git://anongit.freedesktop.org/"/>
<repository type="tarball" name="icon-theme"
href="http://icon-theme.freedesktop.org/releases/"/>
- <repository type="tarball" name="cmake"
- href="http://www.cmake.org/files/"/>
<repository type="tarball" name="xmlsoft.org"
href="ftp://xmlsoft.org/libxml2/"/>
- <repository type="tarball" name="intltool"
- href="http://launchpad.net/intltool/trunk/"/>
<repository type="git" name="git.gnome.org"
href="git://git.gnome.org/"/>
+ <repository type="tarball" name="cups"
+ href="http://ftp.easysw.com/pub/"/>
+
+ <autotools id='readline' autogen-sh="configure">
+ <branch repo="ftp.gnu.org" module="readline/readline-6.2.tar.gz"
+ version="6.2">
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-001"; strip="0"/>
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-002"; strip="0"/>
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-003"; strip="0"/>
+ <patch file="http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-004"; strip="0"/>
+ </branch>
+ </autotools>
<autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
<branch version="1.5.13" module="libpng/libpng-1.5.13.tar.bz2"
@@ -72,22 +79,12 @@
</dependencies>
</autotools>
- <!-- This is generated by tarring up the needed docbook stylesheets
- for gtk-doc to work. If someone wants to work on a setup that
- uses the real docbook source from upstream, feel free to do so,
- it used to be a huge amount of work, but might be easier these
- days.
-
- -->
- <autotools id="gtk-osx-docbook" autogen-sh="configure" >
- <branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.1.tar.gz"
- version="1.1"/>
- </autotools>
-
- <autotools id="gnome-common">
- <branch repo="git.gnome.org" tag="3.6.0"/>
- </autotools>
-
+<!-- Yes, this is a tool and it should be in bootstrap.modules, but it
+ needs libxslt and libxml2, both of which are dependencies for a
+ lot of packages. -->
+<!-- This has python bits that don't work in a separate build
+ dir. Until a better solution is found, just copy the source into
+ the build and try again.-->
<autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper" >
<branch repo="git.gnome.org" tag="0.20.10"/>
<dependencies>
@@ -98,10 +95,14 @@
</dependencies>
</autotools>
- <!-- Expat could be skipped for >= 10.5 since it's is part of the SDK there. -->
- <autotools id="expat" autogen-sh="configure">
- <branch module="expat/expat-2.1.0.tar.gz" version="2.1.0"
- repo="sourceforge"/>
+ <!-- Cups is needed *only* for Tiger, and skipped otherwise -->
+ <autotools id='cups' autogen-sh='configure' skip-autogen='never'
+ autogenargs='DSOFLAGS="$LDFLAGS"'>
+ <branch module="cups/1.2.12/cups-1.2.12-source.tar.bz2"
+ version="1.2.12" repo="cups" checkoutdir='cups-1.2.12'/>
+ <dependencies>
+ <dep package="libtiff"/>
+ </dependencies>
</autotools>
<autotools id="harfbuzz">
@@ -128,68 +129,32 @@
</dependencies>
</autotools>
- <perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
- <branch repo="cpan"
- module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
- version="2.41"/>
- <dependencies>
- <dep package="expat"/>
- </dependencies>
- </perl>
-
- <perl id="perl-xml-simple">
- <branch repo="cpan"
- module="authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz" version="2.20"
- size="75993" md5sum="4d10964e123b76eca36678464daa63cd"/>
- <dependencies>
- <dep package="perl-xml-parser"/>
- </dependencies>
- </perl>
-
- <autotools id="gtk-doc" autogenargs="--disable-scrollkeeper
--with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
- makeargs="-k -i" makeinstallargs="-k -i install">
- <branch tag="GTK_DOC_1_18" repo="git.gnome.org"/>
- <dependencies>
- <dep package="gtk-osx-docbook"/>
- <dep package="gnome-doc-utils"/>
- </dependencies>
- </autotools>
-
+<!-- Another one that won't build in a separate directory -->
<autotools id="hicolor-icon-theme" autogen-sh="configure">
<branch module="hicolor-icon-theme-0.11.tar.gz" repo="icon-theme"
version="0.11" />
</autotools>
- <autotools id="intltool" autogen-sh="configure">
- <branch repo="intltool" module="0.50.2/+download/intltool-0.50.2.tar.gz"
- version="0.50.2"
- hash="md5:23fbd879118253cb99aeac067da5f591"/>
- <dependencies>
- <dep package="gnome-common"/>
- <dep package="perl-xml-parser"/>
- </dependencies>
- </autotools>
-
- <autotools id="cmake" autogen-sh="bootstrap"
- autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
- <branch repo="cmake" module="v2.8/cmake-2.8.9.tar.gz" version="2.8.9"/>
+ <autotools id="gettext-runtime" autogen-sh="configure"
+ autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf
--disable-csharp">
+ <branch repo="ftp.gnu.org" source-subdir="gettext-runtime"
+ module="gettext/gettext-0.18.1.1.tar.gz" version="0.18.1.1"
+ size="15139737" md5sum="3dd55b952826d2b32f51308f2f91aa89">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gettext-bug33999-stpncpy.patch";
strip="1"/>
+ </branch>
</autotools>
<metamodule id="meta-gtk-osx-bootstrap">
<dependencies>
+ <dep package="readline"/>
+ <dep package="cups"/>
<dep package="libpng"/>
- <dep package="gtk-doc"/>
<dep package="libjpeg"/>
<dep package="libtiff"/>
- <dep package="gtk-osx-docbook"/>
+ <dep package="gettext-runtime"/>
<dep package="gnome-doc-utils"/>
- <dep package="expat"/>
- <dep package="perl-xml-parser"/>
- <dep package="perl-xml-simple"/>
<dep package="hicolor-icon-theme"/>
- <dep package="gnome-common"/>
- <dep package="intltool"/>
</dependencies>
</metamodule>
@@ -198,7 +163,6 @@
<dep package="harfbuzz"/>
<dep package="freetype"/>
<dep package="fontconfig"/>
- <dep package="expat"/>
</dependencies>
</metamodule>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 5129ddf..9cf936c 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -207,7 +207,6 @@
<branch module="xdg/shared-mime-info" tag="Release-1-0"
repo="git.freedesktop.org"/>
<dependencies>
- <dep package="intltool"/>
<dep package="glib"/>
</dependencies>
</autotools>
diff --git a/modulesets/gtk-osx-universal.modules b/modulesets/gtk-osx-universal.modules
index 2344a98..55b3ed2 100644
--- a/modulesets/gtk-osx-universal.modules
+++ b/modulesets/gtk-osx-universal.modules
@@ -19,7 +19,6 @@
</dependencies>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
- <dep package="gtk-doc"/> <!-- FIXME: http://bugs.gnome.org/546640 -->
</after>
</metamodule>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 68fb810..0939960 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -67,7 +67,6 @@
</dependencies>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
- <dep package="gtk-doc"/>
</after>
</autotools>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
