Version updates from upstream gtk-osx modulesets-stable

Held back anything newer we use.


git-svn-id: https://xpra.org/svn/Xpra/trunk@9116 3bb7dfac-3a0b-4e04-842a-767bc560f471

osx/jhbuild/modulesets-stable/bootstrap.modules

@@ -26,16 +26,16 @@
   </autotools>
 
   <autotools id="xz" autogen-sh="configure">
-    <branch repo="tukaani.org" module="xz/xz-5.0.7.tar.bz2" version="5.0.7"/>
+    <branch repo="tukaani.org" module="xz/xz-5.2.1.tar.bz2" version="5.2.1"/>
   </autotools>
 
   <autotools id="apr">
-    <branch repo="apache.org" module="apr/apr-1.5.1.tar.bz2" version="1.5.1"/>
+    <branch repo="apache.org" module="apr/apr-1.4.5.tar.bz2" version="1.4.5"/>
   </autotools>
 
   <autotools id="apr-util" autogenargs="--with-apr=$PREFIX/bin/apr-1-config">
-    <branch repo="apache.org" module="apr/apr-util-1.5.3.tar.bz2"
-	    version="1.5.3"/>
+    <branch repo="apache.org" module="apr/apr-util-1.3.12.tar.bz2"
+	    version="1.3.12"/>
     <dependencies>
       <dep package="apr"/>
     </dependencies>
@@ -52,13 +52,13 @@
   <autotools id="gettext-tools" autogen-sh="configure"
 	     autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib">
     <branch repo="ftp.gnu.org" source-subdir="gettext-tools"
-            module="gettext/gettext-0.19.3.tar.xz" version="0.19.3"
-            size="6628460" md5sum="092c3f460553ceb4a638ff81d36434c4"/>
+            module="gettext/gettext-0.19.4.tar.xz" version="0.19.4"/>
   </autotools>
 
+  <!-- cmakes ./configure is picky about invalid flags so we manually set it -->
   <autotools id="cmake" autogen-sh="bootstrap"
-	     autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
-    <branch repo="cmake" module="v3.0/cmake-3.0.2.tar.gz" version="3.0.2"/>
+	     autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
+    <branch repo="cmake" module="v3.2/cmake-3.2.1.tar.gz" version="3.2.1"/>
   </autotools>
 
   <autotools id="m4" autogen-sh="configure">
@@ -76,7 +76,7 @@
 
   <autotools id="libtool" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
-            module="libtool/libtool-2.4.3.tar.xz" version="2.4.3"/>
+            module="libtool/libtool-2.4.6.tar.gz" version="2.4.6"/>
   </autotools>
 
   <autotools id="automake-1.10" autogen-sh="configure">
@@ -105,6 +105,11 @@
             module="automake/automake-1.14.1.tar.xz"/>
   </autotools>
 
+  <autotools id="automake" autogen-sh="configure">
+    <branch repo="ftp.gnu.org" version="1.15"
+            module="automake/automake-1.15.tar.gz"/>
+  </autotools>
+
   <autotools id="pkg-config" autogen-sh="configure"
              autogenargs="--with-internal-glib">
     <branch repo="pkgconfig"
@@ -167,9 +172,9 @@
   </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"/>
+    <branch repo="intltool" module="0.51.0/+download/intltool-0.51.0.tar.gz"
+	    version="0.51.0"
+	    hash="md5:12e517cac2b57a0121cda351570f1e63"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="perl-xml-parser"/>
@@ -191,6 +196,7 @@
       <dep package="automake-1.12" />
       <dep package="automake-1.13" />
       <dep package="automake-1.14"/>
+      <dep package="automake"/>
       <dep package="pkg-config" />
       <dep package="bison"/>
       <dep package="flex"/>

osx/jhbuild/modulesets-stable/gtk-osx-bootstrap.modules

@@ -148,7 +148,9 @@
              skip-autogen="never"
              autogenargs="--without-bzip2 --without-harfbuzz">
     <branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
-            repo="sourceforge"/>
+	    repo="sourceforge">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/freetype-2.5.3-ccexe_cflags.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="zlib"/>
     </dependencies>
@@ -174,16 +176,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="hicolor-icon-theme" autogen-sh="configure">
+  <autotools id="hicolor-icon-theme" autogen-sh="configure"
+	     supports-non-srcdir-builds="no">
     <branch module="hicolor-icon-theme-0.13.tar.gz" repo="icon-theme"
             version="0.13"/>
   </autotools>
 
   <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.19.3.tar.xz" version="0.19.3"
-            size="6628460" md5sum="092c3f460553ceb4a638ff81d36434c4"/>
+            module="gettext/gettext-0.19.4.tar.xz" version="0.19.4"/>
   </autotools>
 
   <metamodule id="meta-gtk-osx-bootstrap">

osx/jhbuild/modulesets-stable/gtk-osx-python.modules

@@ -84,15 +84,13 @@
   </autotools>
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch repo="python" module="3.4.1/Python-3.4.1.tar.xz" version="3.4.1"/>
+    <branch repo="python" module="3.4.3/Python-3.4.3.tar.xz" version="3.4.3">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Python3.4-stack_size-flag.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="gettext-runtime"/>
       <dep package='readline'/>
     </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-      <dep package="berkeleydb-nonsrctree"/>
-    </after>
   </autotools>
 
   <distutils id="pybsddb">
@@ -101,8 +99,11 @@
 	    version="5.3.0"/>
     <dependencies>
       <dep package="python3"/>
-      <dep package="berkeleydb"/>
     </dependencies>
+    <after>
+      <dep package="berkeleydb"/>
+      <dep package="berkeleydb-nonsrctree"/>
+    </after>
   </distutils>
 
 <!-- Pycairo 1.8.4+ requires Python 2.6. Leopard comes only with 2.5,
@@ -173,7 +174,9 @@
 
    <autotools id="pygobject3" autogen-sh="configure" >
     <branch version="3.14.0" module="pygobject/3.14/pygobject-3.14.0.tar.xz"
-            hash="sha256:779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54"/>
+	    hash="sha256:779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54">
+            <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/pygi-cache-double-typedef.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
     </dependencies>
@@ -202,10 +205,9 @@
 
   <autotools id="gtk-mac-integration-python" autogen-sh="configure"
              autogenargs="--enable-python">
-    <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.5.tar.xz"
-            version="2.0.5"
+    <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.7.tar.xz"
+            version="2.0.7"
             hash="sha256:e6de70da740b452f18c113a7ebb6772936a0fb9873137514090849820e296eb7">
-       <patch file="http://xpra.org/svn/Xpra/trunk/osx/jhbuild/patches/0001-Fix-unhandled-exception-from-attempting-to-access-me.patch" strip="1"/>
     </branch>
     <dependencies>
     </dependencies>

osx/jhbuild/modulesets-stable/gtk-osx-random.modules

@@ -187,8 +187,8 @@ Libglade itself is deprecated. This is the last release. -->
 
   <autotools id="gtksourceview3"
     autogen-template="gnome-autogen.sh --prefix %(prefix)s  %(autogenargs)s">
-    <branch module="gtksourceview/3.10/gtksourceview-3.10.1.tar.xz"
-            version="3.6.0" hash="sha256:38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01">
+    <branch module="gtksourceview/3.14/gtksourceview-3.14.3.tar.xz"
+            version="3.14.3" hash="sha256:7bbe8b603ed7346669911fa074fe69388a4c89c1b15317befc3aa212b3d01a7b">
     </branch>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -282,8 +282,8 @@ Libglade itself is deprecated. This is the last release. -->
              autogenargs="--disable-python --without-x --without-dbus
 			  --without-gnomevfs --without-wmf --enable-binreloc "
 	     makeargs='LDFLAGS="-framework Carbon"'>
-    <branch module="gimp/v2.8/gimp-2.8.2.tar.bz2" version="2.8.2"
-            md5sum="b542138820ca3a41cbd63fc331907955" repo="gimp">
+    <branch module="gimp/v2.8/gimp-2.8.14.tar.bz2" version="2.8.14"
+            md5sum="233c948203383fa078434cc3f8f925cb" repo="gimp">
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch" strip="1" />
     </branch>
     <after>
@@ -297,6 +297,11 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
+  <autotools id='json-glib' autogen-sh="configure">
+    <branch   module="json-glib/1.0/json-glib-1.0.2.tar.xz" version="1.0.2"
+	      hash="sha256:887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a"/>
+  </autotools>
+
   <autotools id="babl" >
     <branch repo="ftp.gtk.org" version="0.1.10"
             module="babl/0.1/babl-0.1.10.tar.bz2">
@@ -309,6 +314,7 @@ Libglade itself is deprecated. This is the last release. -->
             module="gegl/0.2/gegl-0.2.0.tar.bz2"/>
     <dependencies>
       <dep package="babl"/>
+      <dep package="json-glib"/>
     </dependencies>
   </autotools>
 
@@ -372,9 +378,9 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
-  <autotools id="gtkspell3" autogen-sh="autoreconf">
-    <branch module="gtkspell/gtkspell3-3.0.4.tar.gz" repo="sourceforge"
-	    version="3.0.4">
+  <autotools id="gtkspell3" autogen-sh="configure">
+    <branch module="gtkspell/gtkspell3-3.0.7.tar.gz" repo="sourceforge"
+	    version="3.0.7">
     </branch>
     <dependencies>
       <dep package="enchant"/>

osx/jhbuild/modulesets-stable/gtk-osx-unsupported.modules

@@ -26,6 +26,8 @@
   <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
   <repository type="tarball" name="webm"
               href="http://downloads.webmproject.org/releases/"/>
+  <repository type="tarball" name="openssl"
+	      href="https://www.openssl.org/source/"/>
 
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
@@ -42,6 +44,14 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gtk-osx-webkit1.6">
+    <dependencies>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="libsoup"/>
+      <dep package="WebKit1.6"/>
+    </dependencies>
+  </metamodule>
+
   <metamodule id="meta-gtk-osx-webkit-gtk3">
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
@@ -63,37 +73,54 @@
 	    repo="iso-codes"/>
   </autotools>
 
-  <autotools id="zlib" autogen-sh="configure" skip-autogen="never">
+  <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
+	     supports-non-srcdir-builds="no">
     <branch repo="sourceforge" version="1.2.8"
             module="libpng/zlib-1.2.8.tar.xz"/>
   </autotools>
 
   <autotools id="p11-kit" autogen-sh="configure"
              autogenargs="--without-trust-paths">
-    <branch repo="p11-glue" version="0.22.1" module="p11-kit-0.22.1.tar.gz"/>
+    <branch repo="p11-glue" version="0.22.1"
+	    module="p11-kit-0.22.1.tar.gz">
+<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/p11-kit-dirfd.patch"
+       strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libtasn1"/>
     </dependencies>
   </autotools>
 
+  <!-- of the many arguments such as prefix and libdir that jhbuild might pass
+  to configure, openssl only understands prefix, and only with =. -->
+  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s"
+	     supports-non-srcdir-builds="no">
+    <branch module="openssl-0.9.8ze.tar.gz" version="0.9.8ze" repo="openssl"/>
+  </autotools>
+
+
   <!-- Rudely demands TeX to build documentation -->
   <!-- Assembler files are missing md5-compress.asm for x86_64 -->
   <autotools id="libnettle" autogen-sh="configure"
        autogenargs="--disable-documentation --disable-assembler">
     <!-- gnutls 3.3.x does not support nettle 3.0 -->
     <branch repo="ftp.gnu.org" version="2.7.1"
-            module="nettle/nettle-2.7.1.tar.gz"/>
+            module="nettle/nettle-2.7.1.tar.gz">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libnettle-cc-for-build-needs-cflags.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="gmp"/>
+      <dep package="openssl"/>
     </dependencies>
   </autotools>
 
+  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
   <autotools id="gnutls" autogen-sh="configure"
-             autogenargs="--disable-gtk-doc-html">
+             autogenargs="--disable-gtk-doc-html --without-p11-kit">
     <branch repo="gnutls" version="3.3.12"
             module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
     <dependencies>
-      <dep package="p11-kit"/>
       <dep package="libnettle"/>
       <dep package="libtasn1" />
       <dep package="zlib"/>
@@ -147,6 +174,7 @@
 	    repo="abisource/enchant">
  <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-gsize.patch" strip="1"/>
  <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-env.patch" strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-xdg-path.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -211,6 +239,33 @@
     <after>
       <dep package="meta-gtk-osx-core"/>
       <dep package="meta-gstreamer-1.0"/>
+      <dep package="meta-gtk-osx-gtk3"/>
+    </after>
+  </autotools>
+
+  /* WebKit 1.10 doesn't build with the 10.5 SDK, so use this older version for old builds. */
+  <autotools id="WebKit1.6" autogen-sh="configure"
+	     autogenargs="--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0">
+    <branch repo="webkit.org" module="webkit-1.6.1.tar.gz" version="1.6.1">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-no-x11.patch" strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-pango-includes.patch" strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-utf8-include.patch" strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-enable-blob.patch" strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch" strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-clang-fixup.patch" strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-out-of-source-fixup.patch" strip="1"/>
+
+    </branch>
+    <dependencies>
+      <dep package="enchant"/>
+      <dep package="icu"/>
+      <dep package="libsoup"/>
+      <dep package="meta-gtk-osx-freetype"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gstreamer-1.0"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
@@ -227,13 +282,13 @@
   <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
              autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 --disable-credential-storage --disable-geolocation --disable-video --disable-web-audio CXXFLAGS='-std=gnu++11'">
     <branch repo="webkit.org" module="webkitgtk-2.4.8.tar.xz" version="2.4.8">
-      <patch file="file:///Users/john/Development/GTK-OSX/gtk-osx-build/patches/webkit-126324-clang-check.patch"
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126324-clang-check.patch"
              strip="1"/>
-      <patch file="file:///Users/john/Development/GTK-OSX/gtk-osx-build/patches/webkit-140167-disable-netscape-api.patch"
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch"
              strip="1"/>
-      <patch file="file:///Users/john/Development/GTK-OSX/gtk-osx-build/patches/webkit-133293-cfi-clang-failure.patch"
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch"
              strip="1"/>
-      <patch file="file:///Users/john/Development/GTK-OSX/gtk-osx-build/patches/webkit-126433-check-platform-gtk.patch"
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126433-check-platform-gtk.patch"
              strip="1"/>
     </branch>
     <dependencies>

osx/jhbuild/modulesets-stable/gtk-osx.modules

@@ -84,8 +84,8 @@
 
   <autotools id="libffi" autogenargs="--disable-builddir"
              autogen-sh="configure">
-    <branch module="libffi/libffi-3.0.13.tar.gz" repo="sourceware.org"
-            version="3.0.13" checkoutdir="atgreen-libffi-873d687"/>
+    <branch module="libffi/libffi-3.2.1.tar.gz" repo="sourceware.org"
+            version="3.2.1"/>
   </autotools>
 
 <!-- This is the latest 0.10 version. Later versions are 1.29 and intended to work with glib 2.29; the minor version of gobject-introspection will track the minor version of glib that it's intended to work with. Note that in the unlikely event you need to introspect Gtk+-2.0, you need to build Glib 1.28 and use this gobject-introspection. The default is to *not* introspect Gtk+-2.0 and to use the latest GLib and Gobject-Introspection with Gtk3 -->
@@ -219,10 +219,9 @@
 
   <autotools id="gtk-mac-integration" autogen-sh="configure"
              autogenargs="--disable-python">
-    <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.5.tar.xz"
-            version="2.0.5"
-            hash="sha256:6c4ff7501d7ff35e49068052d80fcf76ce494e5953c5f3967e4958b1b0c67b9f">
-       <patch file="http://xpra.org/svn/Xpra/trunk/osx/jhbuild/patches/0001-Fix-unhandled-exception-from-attempting-to-access-me.patch" strip="1"/>
+    <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.7.tar.xz"
+            version="2.0.7"
+            hash="sha256:e6de70da740b452f18c113a7ebb6772936a0fb9873137514090849820e296eb7">
     </branch>
     <dependencies>
     </dependencies>