[gtk-osx] Synch gtk-osx-bootstrap.modules in modulesets and modulesets-unstable with modulesets-stable.

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-osx] Synch gtk-osx-bootstrap.modules in modulesets and modulesets-unstable with modulesets-stable.
Date: Thu, 20 Oct 2011 20:10:42 +0000 (UTC)
commit 29d6b42ba209ee33d76a21b88069dce9c0d0980f
Author: John Ralls <jralls ceridwen us>
Date:   Thu Oct 20 12:58:41 2011 -0700

    Synch gtk-osx-bootstrap.modules in modulesets and modulesets-unstable with modulesets-stable.

 modulesets-unstable/gtk-osx-bootstrap.modules |   46 ++++++++++----------
 modulesets/gtk-osx-bootstrap.modules          |   59 +++++++++----------------
 2 files changed, 44 insertions(+), 61 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 353d173..410d54b 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -4,42 +4,40 @@
 <moduleset>
 
   <repository type="tarball" name="ftp.gnome.org" default="yes"
-	      href="http://svn.gnome.org/svn/"/>
-  <repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
-  <repository type="tarball" name="ftp.gnome.org"
 	      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"
 	      href="http://www.ijg.org/files/"/>
-  <repository type="tarball" name="remotesensing"
-	      href="ftp://ftp.remotesensing.org/pub/"/>
+  <repository type="tarball" name="libtiff"
+	      href="http://download.osgeo.org/"/>
   <repository type="tarball" name="fontconfig"
-	      href="http://www.fontconfig.org/release/"/>
+	      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="ftp.gnu.org"
               href="http://ftp.gnu.org/gnu/"/>
-  <repository type="tarball" name="curl.haxx.se"
-              href="http://curl.haxx.se/download/"/>
 
+<!-- Libpng-1.5 has made private struct definitions; gdk-pixbuf 2-23
+     hasn't adjusted -->
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="1.2.40" module="libpng/libpng-1.2.40.tar.bz2"
+    <branch version="1.4.8" module="libpng/libpng-1.4.8.tar.bz2"
 	    repo="sourceforge"/>
   </autotools>
 
   <autotools id="libjpeg">
-    <branch module="jpegsrc.v7.tar.gz" version="7"
+    <branch module="jpegsrc.v8c.tar.gz" version="8c"
             repo="jpeg"
-            checkoutdir="jpeg-7">
+            checkoutdir="jpeg-8">
     </branch>
   </autotools>
 
   <autotools id="libtiff" autogen-sh="configure"
 	     autogenargs="--without-x --without-apple-opengl-framework">
-    <branch version="3.9.1" module="libtiff/tiff-3.9.1.tar.gz"
-	    repo="remotesensing"/>
+    <branch version="3.9.5" module="libtiff/tiff-3.9.5.tar.gz"
+	    repo="libtiff"/>
     <dependencies>
       <dep package="libjpeg"/>
     </dependencies>
@@ -77,14 +75,14 @@
 
   <autotools id="freetype"
 	     autogen-template="%(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
-    <branch module="freetype/freetype-2.3.11.tar.gz" version="2.3.11"
+    <branch module="freetype/freetype-2.4.6.tar.gz" version="2.4.6"
             repo="sourceforge">
     </branch>
   </autotools>
 
   <autotools id="fontconfig" autogen-sh="configure"
 	     autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.7.3" module="fontconfig-2.7.3.tar.gz"/>
+    <branch repo="fontconfig" version="2.8.0" module="fontconfig-2.8.0.tar.gz"/>
     <dependencies>
       <dep package="expat"/>
       <dep package="freetype"/>
@@ -93,8 +91,8 @@
 
   <perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
     <branch repo="cpan"
-        module="authors/id/C/CH/CHORNY/XML-Parser-2.40.tar.gz"
-	version="2.40"/>
+        module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
+	version="2.41"/>
     <dependencies>
       <dep package="expat"/>
     </dependencies>
@@ -109,18 +107,19 @@
     </dependencies>
   </perl>
 
+  <!-- Needed for building Gnome apps from the repository -->
   <autotools id="gnome-common" autogen-sh="configure">
-    <branch module="gnome-common/2.28/gnome-common-2.28.0.tar.bz2"
-	    version="2.28.0" hash="sha256:dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1"/>
+    <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-scrollkeepeer --with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
+  <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.11" module="gtk-doc/1.11/gtk-doc-1.11.tar.bz2"
-	    md5sum="b5e268c71fa90aad890cf53715664d0a"/>
+    <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="gtk-osx-docbook"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
   </autotools>
@@ -128,6 +127,7 @@
   <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">
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 0ad5b35..a905cb2 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -4,43 +4,40 @@
 <moduleset>
 
   <repository type="tarball" name="ftp.gnome.org" default="yes"
-	      href="http://svn.gnome.org/svn/"/>
-  <repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
-  <repository type="tarball" name="ftp.gnome.org"
 	      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"
 	      href="http://www.ijg.org/files/"/>
-  <repository type="tarball" name="remotesensing"
-	      href="ftp://ftp.remotesensing.org/pub/"/>
+  <repository type="tarball" name="libtiff"
+	      href="http://download.osgeo.org/"/>
   <repository type="tarball" name="fontconfig"
-	      href="http://www.fontconfig.org/release/"/>
+	      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="ftp.gnu.org"
               href="http://ftp.gnu.org/gnu/"/>
-  <repository type="tarball" name="curl.haxx.se"
-              href="http://curl.haxx.se/download/"/>
 
+<!-- Libpng-1.5 has made private struct definitions; gdk-pixbuf 2-23
+     hasn't adjusted -->
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="1.2.40" module="libpng/libpng-1.2.40.tar.bz2"
+    <branch version="1.4.8" module="libpng/libpng-1.4.8.tar.bz2"
 	    repo="sourceforge"/>
   </autotools>
 
-
   <autotools id="libjpeg">
-    <branch module="jpegsrc.v7.tar.gz" version="7"
+    <branch module="jpegsrc.v8c.tar.gz" version="8c"
             repo="jpeg"
-            checkoutdir="jpeg-7">
+            checkoutdir="jpeg-8">
     </branch>
   </autotools>
 
   <autotools id="libtiff" autogen-sh="configure"
 	     autogenargs="--without-x --without-apple-opengl-framework">
-    <branch version="3.9.1" module="libtiff/tiff-3.9.1.tar.gz"
-	    repo="remotesensing"/>
+    <branch version="3.9.5" module="libtiff/tiff-3.9.5.tar.gz"
+	    repo="libtiff"/>
     <dependencies>
       <dep package="libjpeg"/>
     </dependencies>
@@ -78,14 +75,14 @@
 
   <autotools id="freetype"
 	     autogen-template="%(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
-    <branch module="freetype/freetype-2.3.11.tar.gz" version="2.3.11"
+    <branch module="freetype/freetype-2.4.6.tar.gz" version="2.4.6"
             repo="sourceforge">
     </branch>
   </autotools>
 
   <autotools id="fontconfig" autogen-sh="configure"
 	     autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.7.3" module="fontconfig-2.7.3.tar.gz"/>
+    <branch repo="fontconfig" version="2.8.0" module="fontconfig-2.8.0.tar.gz"/>
     <dependencies>
       <dep package="expat"/>
       <dep package="freetype"/>
@@ -94,8 +91,8 @@
 
   <perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
     <branch repo="cpan"
-        module="authors/id/C/CH/CHORNY/XML-Parser-2.40.tar.gz"
-	version="2.40"/>
+        module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
+	version="2.41"/>
     <dependencies>
       <dep package="expat"/>
     </dependencies>
@@ -110,16 +107,17 @@
     </dependencies>
   </perl>
 
+  <!-- Needed for building Gnome apps from the repository -->
   <autotools id="gnome-common" autogen-sh="configure">
-    <branch module="gnome-common/2.28/gnome-common-2.28.0.tar.bz2"
-	    version="2.28.0" hash="sha256:dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1"/>
+    <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-scrollkeepeer --with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
+  <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.11" module="gtk-doc/1.11/gtk-doc-1.11.tar.bz2"
-	    md5sum="b5e268c71fa90aad890cf53715664d0a"/>
+    <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"/>
@@ -141,21 +139,6 @@
     </dependencies>
   </autotools>
 
-  <!-- 10.5 has 7.16.3, which is too old for some things. Otherwise can be skipped. -->
-  <autotools id="libcurl" autogen-sh="configure">
-    <branch repo="curl.haxx.se" module="curl-7.19.6.tar.bz2" version="7.19.6" />
-  </autotools>
-
-  <!-- 10.4 has 1.28 which is too old, 10.5 has 2.3 which is OK. -->
-  <autotools id="bison" autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="bison/bison-2.4.1.tar.bz2"
-            version="2.4.1"/>
-  </autotools>
-
-  <!-- 10.4 has 2.5.4, too old for gstreamer (and probably others as well -->
-  <autotools id="flex" autogen-sh="configure">
-    <branch repo="sourceforge" module="flex/flex-2.5.35.tar.bz2"
-	    version="2.5.35"/>
   </autotools>
 
   <metamodule id="meta-gtk-osx-bootstrap">
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]