GNOME.org
 

[gtk-osx] [modulesets] Sync random and unstable modulesets with stable.

commit 0521b30de81e75cae1b955ed876a493cf6a2f7cc
Author: John Ralls <jralls ceridwen us>
Date:   Sat Oct 29 16:55:13 2011 -0700

    [modulesets] Sync random and unstable modulesets with stable.

 modulesets/gtk-osx-random.modules      |   90 ++++++++++++++++++++++++-------
 modulesets/gtk-osx-unsupported.modules |   57 +++++++++++++++-----
 2 files changed, 113 insertions(+), 34 deletions(-)
---
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index d9975ce..36645b1 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -9,10 +9,6 @@
 	      href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
   <repository type="tarball" name="ftp.gnu.org"
 	      href="ftp://ftp.gnu.org/gnu/"/>
-  <repository type="svn" name="inkscape.svn.sourceforge.net" 
-              href="https://inkscape.svn.sourceforge.net/svnroot/inkscape/"/>
-  <repository type="svn" name="ardour" 
-              href="http://subversion.ardour.org/svn/"/>
     <repository type="git" name="git.freedesktop.org"
               href="git://anongit.freedesktop.org/"/>
   <repository type="tarball" name="dbus.freedesktop.org"
@@ -57,6 +53,8 @@
     </after>
   </autotools>
 
+<!-- Libglade's functions have been rolled into Gtk+, and Libglade is
+     deprecated. This is the last release. -->
   <autotools id="libglade">
     <branch tag="LIBGLADE_2_6_4"/>
     <after>
@@ -65,6 +63,7 @@
     </after>
   </autotools>
 
+<!-- Gossip is no longer in the Gnome Git Repository.
   <autotools id="gossip">
     <branch tag="GOSSIP_0_31"/>
     <after>
@@ -77,10 +76,10 @@
       <dep package="libglade"/>
     </dependencies>
   </autotools>
-
-  <autotools id="vala" autogen-sh="configure">
-    <branch repo="ftp.gnome.org" module="vala/0.10/vala-0.10.3.tar.bz2"
-            version="0.10.3" hash="sha256:338b9869ad5c585b58540ffc9b576cbe44709864da2582c7ebc7a5d817004974"/>
+-->
+    <autotools id="vala" autogen-sh="configure">
+    <branch repo="ftp.gnome.org" module="vala/0.14/vala-0.14.0.tar.bz2"
+            version="0.14.0" hash="sha256:4cbca602e2e2a09803ae33fd7324219bc2c611db5a62a52e733e7d8806acb6f5"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-core"/>
@@ -91,7 +90,7 @@
   <autotools id="vala-git">
     <branch/>
     <dependencies>
-      <dep package="vala"/>
+      <dep package="vala" module="vala" tag="0.14"/>
     </dependencies>
   </autotools>
 
@@ -104,12 +103,33 @@
     </after>
     <dependencies>
       <dep package="WebKit"/>
-      <dep package="libglade"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="devhelp-gtk3">
+    <branch tag="gnome-3-2" module="devhelp"/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-themes"/>
+      <dep package="meta-gtk-osx-core"/>
+    </after>
+    <dependencies>
+      <dep package="gtk+-3.0"/>
+      <dep package="WebKit"/>
     </dependencies>
   </autotools>
 
   <autotools id="glade3" autogenargs="--disable-scrollkeeper">
-    <branch revision="glade-3-8"/>
+    <branch revision="glade-3-8" module="glade"/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-themes"/>
+      <dep package="meta-gtk-osx-core"/>
+    </after>
+  </autotools>
+
+  <autotools id="glade" autogenargs="--disable-scrollkeeper">
+    <branch revision="glade-3-10"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
@@ -125,10 +145,19 @@
     </after>
   </autotools>
 
+  <autotools id="gtksourceview-gtk3">
+    <branch revision="gnome-3-2" module="gtksourceview"/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-gtk3"/>
+    </after>
+  </autotools>
+
   <autotools id="libIDL">
     <branch tag="LIBIDL_0_8_14"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-gtk3"/>
       <dep package="meta-gtk-osx-core"/>
     </after>
   </autotools>
@@ -183,8 +212,7 @@
 
   <!-- These folks don't make their repository available.-->
   <autotools id="lcms" autogen-sh="configure">
-    <branch module="lcms/lcms-1.19.tar.gz" version="1.19" repo="sourceforge"
-            checkoutdir="lcms-1.19"/>
+    <branch module="lcms/lcms2-2.2.tar.gz" version="2.2" repo="sourceforge"/>
   </autotools>
 
   <autotools id="shared-mime-info" supports-non-srcdir-builds="no" >
@@ -214,7 +242,7 @@
 
    <autotools id="babl">
 <!-- Release 0.1.2; there are newer ones, but this is the latest tarball -->
-     <branch tag="2bbfd9bf7ac807072d2b9c7030e837e1c4432f7f"/>
+     <branch tag="BABL_0_1_2"/>
   </autotools>
 
   <autotools id="gegl">
@@ -238,20 +266,39 @@
   <autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe" >
     <!-- Another package with a non-standard repository structure. Tarballs
     are easier.-->
-    <branch module="sqlite-autoconf-3070500.tar.gz" version='3.7.5'
+    <branch module="sqlite-autoconf-3070800.tar.gz" version='3.7.8'
 	    repo="sqlite"/>
   </autotools>
 
+<!-- Goocanvas 1.0 is for Gtk+-2, and has a branch. -->
   <autotools id="goocanvas">
-    <!-- No tags, so this is release 2.0.0 -->
-    <branch revision="20e61391912cb930924c62a102c5482011d2d411"/>
+    <branch revision="goocanvas-1.0"/>
     <dependencies>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
+<!-- Goocanvas 2.0 is for Gtk+-3, and uses the master branch. -->
+  <autotools id="goocanvas2">
+    <!-- No tags, so this is release 2.0.0 -->
+    <branch revision="20e61391912cb930924c62a102c5482011d2d411"
+	    module="goocanvas"/>
+    <dependencies>
+      <dep package="gtk+-3"/>
+    </dependencies>
+  </autotools>
+
+<!-- Libart_lgpl is deprecated. -->
+  <autotools id="libart_lgpl">
+    <branch/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-core"/>
+    </after>
+  </autotools>
+
   <autotools id="hunspell" >
-    <branch module="hunspell" version="1.2.14"
+    <branch module="hunspell" version="1.3.2"
 	    repo="hunspell-cvs"/>
   </autotools>
 
@@ -263,15 +310,16 @@
     </dependencies>
   </autotools>
 
+<!-- LibGSF develops in master -->
   <autotools id="libgsf" autogenargs="--without-python">
-    <branch tag="LIBGSF_1_14_19"/>
+    <branch tag="LIBGSF_1_14_21"/>
   </autotools>
 
   <!-- gmp uses Mercurial, so we stick with the tarball to avoid
        having to install yet another vcs tool. -->
  <autotools id="gmp">
-    <!--branch repo="ftp.gnu.org" module="gmp/gmp-5.0.0.tar.bz2" version="5.0.0"/-->
-    <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.1.tar.bz2" version="4.3.1"/>
+    <!--branch repo="ftp.gnu.org" module="gmp/gmp-5.0.2.tar.bz2" version="5.0.2"/-->
+    <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.2.tar.bz2" version="4.3.2"/>
   </autotools>
 
   <autotools id="guile">
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 2775794..4de5c90 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -8,14 +8,11 @@
               href="git://git.savannah.gnu.org/"/>
   <repository type='git' name='git.debian.org'
 	      href="git://git.debian.org/git/"/>
-  <repository type='svn' name='cvs.gnupg.org' href="svn://cvs.gnupg.org/" />
+  <repository type='git' name='git.gnupg.org' href="git://git.gnupg.org/" />
   <repository type='tarball' name='ftp.gnupg.org' href="ftp://ftp.gnupg.org/"; />
   <repository type='tarball' name='ftp.gnu.org' href="ftp://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="sourceforge" 
               href="http://downloads.sourceforge.net/sourceforge/"/>
-  <repository type="cvs" name="gnutls.gnupg.org"
-              cvsroot=":pserver:anoncvs cvs gnupg org:/cvs/gnutls"
-              password="anoncvs"/>
   <repository type="svn" name="abisource/enchant"
               href="http://svn.abisource.com/"; />
   <repository type='svn' name='libproxy.google.com'
@@ -51,9 +48,9 @@
   </autotools>
 
   <autotools id="gnutls" autogen-sh="configure">
- <!--   <branch repo='git.gnu.org' tag='gnutls_2_8_1' module="gnutls"/> -->
-    <branch repo='ftp.gnu.org' version='2.8.4'
-            module="gnutls/gnutls-2.8.4.tar.bz2"/>
+    <branch repo='git.gnu.org' tag='gnutls_2_12_x'/>
+    <!--branch repo='ftp.gnu.org' version='2.12.11'
+            module="gnutls/gnutls-2.12.11.tar.bz2"/-->
     <dependencies>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
@@ -62,7 +59,7 @@
     </dependencies>
   </autotools>
 
-<!-- Libsoup doesn't work with newer versions of libproxy -->
+<!-- Libproxy needs patches to build correctly.
   <cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
     <branch version='0.4.7' module='libproxy-0.4.7.tar.gz'
             repo='libproxy.google.com'/>
@@ -70,8 +67,20 @@
       <dep package="cmake"/>
     </dependencies>
   </cmake>
+-->
 
-  <autotools id="gnome-keyring">
+  <cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
+    <branch version='0.4.7' module='libproxy-0.4.7.tar.gz'
+            repo='libproxy.google.com'>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libproxy-Bug-052-POSIX_C_SOURCE.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-168-libproxy-pc-file.patch"; strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="cmake"/>
+    </dependencies>
+  </cmake>
+
+  <autotools id="libgnome-keyring">
     <branch revision="gnome-2-32"/>
     <dependencies>
       <dep package="gtk+"/>
@@ -88,8 +97,30 @@
       <dep package='libproxy'/>
       <dep package='gconf'/>
       <dep package='sqlite'/>
-      <dep package="libxml2"/>
-      <dep package="gnome-keyring"/>
+      <!-- dep package="libxml2"/ -->
+      <dep package="libgnome-keyring"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnome-keyring-gtk3">
+    <branch revision="gnome-3-2" module="libgnome-keyring"/>
+    <dependencies>
+      <dep package="gtk+-3.0"/>
+      <dep package="libgcrypt"/>
+      <dep package="libtasn1"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libsoup-gtk3">
+    <branch revision="gnome-3-2" module="libsoup"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gnutls"/>
+      <dep package='libproxy'/>
+      <dep package='gconf'/>
+      <dep package='sqlite'/>
+      <!-- dep package="libxml2"/ -->
+      <dep package="libgnome-keyring-gtk3"/>
     </dependencies>
   </autotools>
 
@@ -103,14 +134,14 @@
 
   <autotools id="libgpg-error"
              autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
-    <branch repo='cvs.gnupg.org' module="libgpg-error"
+    <branch repo='git.gnupg.org' module="libgpg-error"
             tag="libgpg-error-1.10"/>
   </autotools>
 
   <autotools id="libgcrypt"     autogen-sh="configure">
 
 <!-- CVS version requires fig2dev, an X11 utility.
-     <branch repo='cvs.gnupg.org' tag="libgcrypt-1.4.4" module='libgcrypt'/> -->
+     <branch repo='git.gnupg.org' tag="libgcrypt-1.4.4" module='libgcrypt'/> -->
     <branch repo='ftp.gnupg.org' version='1.4.6'
 	    module='gcrypt/libgcrypt/libgcrypt-1.4.6.tar.bz2'/>
     <dependencies>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]