GNOME.org
 

[gtk-osx] Sync gtk-osx-bootstrap.modules between the three modulesets.

commit ef48247670ac837dfa56854f97d0c01079e46bed
Author: John Ralls <jralls ceridwen us>
Date:   Sat Nov 3 16:33:32 2012 -0700

    Sync gtk-osx-bootstrap.modules between the three modulesets.
    
    
    Switch to git builds for some Gnome modules.

 modulesets-unstable/gtk-osx-bootstrap.modules |   55 ++++++++++++-------------
 modulesets/gtk-osx-bootstrap.modules          |   55 +++++++++++-------------
 2 files changed, 51 insertions(+), 59 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 71e05c6..63e5a43 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -9,12 +9,14 @@
   <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"
+	      href="git://git.sv.nongnu.org/"/>
   <repository type="tarball" name="jpeg"
 	      href="http://www.ijg.org/files/"/>
   <repository type="tarball" name="libtiff"
 	      href="http://download.osgeo.org/"/>
-  <repository type="tarball" name="fontconfig"
-	      href="http://www.freedesktop.org/software/fontconfig/release/"/>
+  <repository type="git" name="freedesktop"
+	      href="git://anongit.freedesktop.org/"/>
   <repository type="tarball" name="icon-theme"
 	      href="http://icon-theme.freedesktop.org/releases/"/>
   <repository type="tarball" name="cmake"
@@ -27,14 +29,14 @@
               href="git://git.gnome.org/"/>
 
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="1.5.12" module="libpng/libpng-1.5.12.tar.bz2"
+    <branch version="1.5.13" module="libpng/libpng-1.5.13.tar.bz2"
 	    repo="sourceforge"/>
   </autotools>
 
   <autotools id="libjpeg">
-    <branch module="jpegsrc.v8c.tar.gz" version="8c"
+    <branch module="jpegsrc.v8d.tar.gz" version="8c"
             repo="jpeg"
-            checkoutdir="jpeg-8c">
+            checkoutdir="jpeg-8d">
     </branch>
   </autotools>
 
@@ -96,19 +98,20 @@
 
   <!-- 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.0.1.tar.gz" version="2.0.1"
+    <branch module="expat/expat-2.1.0.tar.gz" version="2.1.0"
 	    repo="sourceforge"/>
   </autotools>
 
-  <autotools id="freetype" autogen-sh="configure">
-    <branch module="freetype/freetype-2.4.6.tar.gz" version="2.4.6"
-            repo="sourceforge">
-    </branch>
+  <autotools id="harfbuzz">
+    <branch repo="freedesktop"/>
+  </autotools>
+
+  <autotools id="freetype">
+    <branch module="freetype/freetype2" repo="nongnu"/>
   </autotools>
 
-  <autotools id="fontconfig" autogen-sh="configure"
-	     autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.8.0" module="fontconfig-2.8.0.tar.gz"/>
+  <autotools id="fontconfig" autogenargs="--disable-docs">
+    <branch repo="freedesktop"/>
     <dependencies>
       <dep package="expat"/>
       <dep package="freetype"/>
@@ -127,23 +130,15 @@
   <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"/>
+        size="71129" md5sum="593aa8001e5c301cdcdb4bb3b63abc33"/>
     <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/2.34/gnome-common-2.34.0.tar.bz2"
-	    version="2.34.0" hash="sha256:7a9c4f9ab975501c36be3192aa61641abca045a215d519d7d00527706f1de1df"/>
-  </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"/>
+	     makeargs="-k -i" makeinstallargs="-k -i install">
+    <branch/>
     <dependencies>
       <dep package="gtk-osx-docbook"/>
       <dep package="gnome-doc-utils"/>
@@ -153,13 +148,15 @@
   <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.41.1/+download/intltool-0.41.1.tar.gz"
-	    version="0.41.1"
-	    hash="sha256:06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0"/>
+    <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"/>
@@ -168,7 +165,7 @@
 
   <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.6.tar.gz" version="2.8.6"/>
+    <branch repo="cmake" module="v2.8/cmake-2.8.9.tar.gz" version="2.8.9"/>
   </autotools>
 
   <metamodule id="meta-gtk-osx-bootstrap">
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index c300cfc..665d299 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -9,12 +9,14 @@
   <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"
+	      href="git://git.sv.nongnu.org/"/>
   <repository type="tarball" name="jpeg"
 	      href="http://www.ijg.org/files/"/>
   <repository type="tarball" name="libtiff"
 	      href="http://download.osgeo.org/"/>
-  <repository type="tarball" name="fontconfig"
-	      href="http://www.freedesktop.org/software/fontconfig/release/"/>
+  <repository type="git" name="freedesktop"
+	      href="git://anongit.freedesktop.org/"/>
   <repository type="tarball" name="icon-theme"
 	      href="http://icon-theme.freedesktop.org/releases/"/>
   <repository type="tarball" name="cmake"
@@ -27,14 +29,14 @@
               href="git://git.gnome.org/"/>
 
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="1.5.12" module="libpng/libpng-1.5.12.tar.bz2"
+    <branch version="1.5.13" module="libpng/libpng-1.5.13.tar.bz2"
 	    repo="sourceforge"/>
   </autotools>
 
   <autotools id="libjpeg">
-    <branch module="jpegsrc.v8c.tar.gz" version="8c"
+    <branch module="jpegsrc.v8d.tar.gz" version="8c"
             repo="jpeg"
-            checkoutdir="jpeg-8c">
+            checkoutdir="jpeg-8d">
     </branch>
   </autotools>
 
@@ -83,11 +85,11 @@
   </autotools>
 
   <autotools id="gnome-common">
-     <branch repo="git.gnome.org"/>
+     <branch repo="git.gnome.org" tag="3.6.0"/>
   </autotools>
 
   <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper" >
-    <branch repo="git.gnome.org"/>
+    <branch repo="git.gnome.org" tag="0.20.10"/>
     <dependencies>
       <dep package="gtk-osx-docbook"/>
       <dep package="libxslt"/>
@@ -98,20 +100,20 @@
 
   <!-- 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.0.1.tar.gz" version="2.0.1"
+    <branch module="expat/expat-2.1.0.tar.gz" version="2.1.0"
 	    repo="sourceforge"/>
   </autotools>
 
-  <autotools id="freetype"
-	     autogen-template="%(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
-    <branch module="freetype/freetype-2.4.6.tar.gz" version="2.4.6"
-            repo="sourceforge">
-    </branch>
+  <autotools id="harfbuzz">
+    <branch repo="freedesktop" tag="0.9.5"/>
+  </autotools>
+
+  <autotools id="freetype">
+    <branch module="freetype/freetype2" tag="VER-2-4-10" repo="nongnu"/>
   </autotools>
 
-  <autotools id="fontconfig" autogen-sh="configure"
-	     autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.8.0" module="fontconfig-2.8.0.tar.gz"/>
+  <autotools id="fontconfig" autogenargs="--disable-docs">
+    <branch repo="freedesktop" tag="2.10.1"/>
     <dependencies>
       <dep package="expat"/>
       <dep package="freetype"/>
@@ -136,17 +138,9 @@
     </dependencies>
   </perl>
 
-  <!-- Needed for building Gnome apps from the repository -->
-  <autotools id="gnome-common" autogen-sh="configure">
-    <branch module="gnome-common/2.34/gnome-common-2.34.0.tar.bz2"
-	    version="2.34.0" hash="sha256:7a9c4f9ab975501c36be3192aa61641abca045a215d519d7d00527706f1de1df"/>
-  </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"/>
+	     makeargs="-k -i" makeinstallargs="-k -i install">
+    <branch tag="GTK_DOC_1_18"/>
     <dependencies>
       <dep package="gtk-osx-docbook"/>
       <dep package="gnome-doc-utils"/>
@@ -160,9 +154,9 @@
   </autotools>
 
   <autotools id="intltool" autogen-sh="configure">
-    <branch repo="intltool" module="0.41.1/+download/intltool-0.41.1.tar.gz"
-	    version="0.41.1"
-	    hash="sha256:06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0"/>
+    <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"/>
@@ -171,7 +165,7 @@
 
   <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.6.tar.gz" version="2.8.6"/>
+    <branch repo="cmake" module="v2.8/cmake-2.8.9.tar.gz" version="2.8.9"/>
   </autotools>
 
   <metamodule id="meta-gtk-osx-bootstrap">
@@ -193,6 +187,7 @@
 
   <metamodule id="meta-gtk-osx-freetype">
     <dependencies>
+      <dep package="harfbuzz"/>
       <dep package="freetype"/>
       <dep package="fontconfig"/>
       <dep package="expat"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]