[gtk-osx] Update stable versions for Gnome 3.6
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Update stable versions for Gnome 3.6
- Date: Sun, 4 Nov 2012 21:39:00 +0000 (UTC)
commit 5f5f13b8b157445e5d495f320ebfdb7454a971f7
Author: John Ralls <jralls ceridwen us>
Date: Sat Nov 3 11:54:41 2012 -0700
Update stable versions for Gnome 3.6
modulesets-stable/bootstrap.modules | 25 ++--
modulesets-stable/gtk-osx-bootstrap.modules | 65 ++++++---
modulesets-stable/gtk-osx-gstreamer.modules | 58 +++++++-
modulesets-stable/gtk-osx-gtkmm.modules | 39 +++---
modulesets-stable/gtk-osx-python.modules | 53 ++++++--
modulesets-stable/gtk-osx-random.modules | 81 ++++++------
modulesets-stable/gtk-osx-themes.modules | 20 ++-
modulesets-stable/gtk-osx-unsupported.modules | 59 +++-----
modulesets-stable/gtk-osx.modules | 149 +++++++-------------
patches/0001-Fix-relative-module-paths.patch | 42 ++++++
patches/Bug-673403-replace-values_h.patch | 14 ++
.../libxml2-Bug-686118-pthreads_once_init.patch | 33 +++++
12 files changed, 388 insertions(+), 250 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 9e5960a..7645747 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -19,9 +19,7 @@
</autotools>
<autotools id="xz" autogen-sh="configure">
- <branch repo="tukaani.org" module="xz/xz-5.0.1.tar.bz2" version="5.0.1"
- size="1005959" md5sum="cb6c7a58cec4d663a395c54d186ca0c6"
- hash="sha256:9b380f502d37085a60821484a3a13747454638927cc36033be64970512451ed8"/>
+ <branch repo="tukaani.org" module="xz/xz-5.0.4.tar.bz2" version="5.0.4"/>
</autotools>
<autotools id="apr">
@@ -53,7 +51,7 @@
</branch>
</autotools>
- <autotools id='readline' >
+ <autotools id='readline' autogen-sh="configure">
<branch repo="ftp.gnu.org" module="readline/readline-6.2.tar.gz"
version="6.2"/>
</autotools>
@@ -65,7 +63,7 @@
<autotools id="autoconf" autogen-sh="configure">
<branch repo="ftp.gnu.org"
- module="autoconf/autoconf-2.68.tar.bz2" version="2.68"/>
+ module="autoconf/autoconf-2.69.tar.xz" version="2.69"/>
<dependencies>
<dep package="m4"/>
</dependencies>
@@ -93,10 +91,14 @@
</autotools>
<autotools id="automake-1.11" autogen-sh="configure">
<branch repo="ftp.gnu.org"
- module="automake/automake-1.11.1.tar.bz2" version="1.11.1"
- size="1066685" md5sum="c2972c4d9b3e29c03d5f2af86249876f" />
+ module="automake/automake-1.11.6.tar.xz" version="1.11.6"/>
</autotools>
+ <autotools id="automake-1.12" autogen-sh="configure">
+ <branch repo="ftp.gnu.org"
+ module="automake/automake-1.12.4.tar.xz" version="1.12.4"/>
+
+ </autotools>
<!-- Pkg-config 0.26 and later requires glib, which requires
pkg-config, which, well, you get the idea. -->
<autotools id="pkg-config" autogen-sh="configure">
@@ -106,15 +108,15 @@
<!-- 10.4 has 1.28 which is too old, 10.5 & 10.6 have 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"/>
+ <branch repo="ftp.gnu.org" module="bison/bison-2.6.3.tar.bz2"
+ version="2.6.3"/>
</autotools>
<!-- 10.4 has 2.5.4, too old for gstreamer (and probably others as well)
10.6 has 2.5.35, 10.5 2.5.33 -->
<autotools id="flex" autogen-sh="configure">
- <branch repo="sourceforge" module="flex/flex-2.5.35.tar.bz2"
- version="2.5.35"/>
+ <branch repo="sourceforge" module="flex/flex-2.5.37.tar.bz2"
+ version="2.5.37"/>
</autotools>
<metamodule id="meta-bootstrap">
@@ -130,6 +132,7 @@
<dep package="automake-1.9" />
<dep package="automake-1.10" />
<dep package="automake-1.11" />
+ <dep package="automake-1.12" />
<dep package="pkg-config" />
<dep package="bison"/> <!-- included for Tiger, skipped otherwise -->
<dep package="flex"/> <!-- included for Tiger, skipped otherwise -->
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 96dc667..1413ba0 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -23,16 +23,20 @@
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"
+ href="http://www.freedesktop.org/software/harfbuzz/release/"/>
<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"
+ <autotools id="libjpeg" autogen-sh="configure">
+ <branch module="jpegsrc.v8d.tar.gz" version="8c"
repo="jpeg"
- checkoutdir="jpeg-8c">
+ checkoutdir="jpeg-8d">
</branch>
</autotools>
@@ -46,19 +50,21 @@
</autotools>
<autotools id="libxml2" autogen-sh="configure">
- <branch version="2.7.8" module="libxml2-2.7.8.tar.gz"
- repo="xmlsoft.org"/>
+ <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
+ repo="xmlsoft.org">
+ <patch file="///Users/john/Development/GTK-OSX/gtk-osx-build/patches/libxml2-Bug-686118-pthreads_once_init.patch" strip="1"/>
+ </branch>
</autotools>
<autotools id="libxslt" autogen-sh="configure">
- <branch version="1.1.26" module="libxslt-1.1.26.tar.gz"
+ <branch version="1.1.27" module="libxslt-1.1.27.tar.gz"
repo="xmlsoft.org"/>
<dependencies>
<dep package="libxml2"/>
</dependencies>
</autotools>
- <!-- This is generated by tarring up the needed docbook stylesheets
+ <!-- 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
@@ -71,34 +77,46 @@
</autotools>
<autotools id="gnome-common">
- <branch module="gnome-common/2.34/gnome-common-2.34.0.tar.bz2" version="2.34.0"
- hash="sha256:7a9c4f9ab975501c36be3192aa61641abca045a215d519d7d00527706f1de1df"/>
+ <branch repo="git.gnome.org"/>
</autotools>
- <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper">
- <branch module="gnome-doc-utils/0.20/gnome-doc-utils-0.20.6.tar.bz2" version="0.20.6"
- hash="sha256:091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf"/>
+ <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="gnome-common"/>
+ <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.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"
+ <autotools id="harfbuzz" autogen-sh="configure">
+ <branch repo="harfbuzz" module="harfbuzz-0.9.5.tar.bz2" version="0.9.5"/>
+ <dependemcies>
+ <dep package="freetype"/>
+ <dep package="fontconfig"/>
+ <dep package="glib"/>
+ </dependemcies>
+ </autotools>
+
+ <autotools id="freetype"
+ autogen-template="%(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
+ <branch module="freetype/freetype-2.4.10.tar.gz" version="2.4.10"
repo="sourceforge">
</branch>
</autotools>
<autotools id="fontconfig" autogen-sh="configure"
autogenargs="--disable-docs">
- <branch repo="fontconfig" version="2.8.0" module="fontconfig-2.8.0.tar.gz"/>
+ <branch repo="fontconfig" version="2.10.1" module="fontconfig-2.10.1.tar.gz"/>
<dependencies>
<dep package="expat"/>
<dep package="freetype"/>
@@ -125,8 +143,8 @@
<!-- 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"/>
+ <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"
@@ -147,9 +165,9 @@
</autotools>
<autotools id="intltool" autogen-sh="configure">
- <branch repo="intltool" module="0.41.1/+download/intltool-0.41.1.tar.gz"
+ <branch repo="intltool" module="0.50.2/+download/intltool-0.50.2.tar.gz"
version="0.41.1"
- hash="sha256:06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0"/>
+ hash="md5:23fbd879118253cb99aeac067da5f591"/>
<dependencies>
<dep package="gnome-common"/>
<dep package="perl-xml-parser"/>
@@ -158,7 +176,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">
@@ -183,6 +201,7 @@
<dep package="freetype"/>
<dep package="fontconfig"/>
<dep package="expat"/>
+ <dep package="harfbuzz"/>
</dependencies>
</metamodule>
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 566bb6d..23ccbc4 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -6,21 +6,28 @@
href="http://ftp.gnome.org/pub/GNOME/sources/"/>
<repository type="tarball" name="liboil"
href="http://liboil.freedesktop.org/download/"/>
- <repository type="tarball" name="sourceforge"
+ <repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
+ <repository type="tarball" name="entropywave"
+ href="http://code.entropywave.com/download/"/>
<autotools id="liboil" autogen-template="autoreconf -fis && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs=" CFLAGS=-DHAVE_SYMBOL_UNDERSCORE">
<branch repo="liboil" module="liboil-0.3.17.tar.gz" version="0.3.17" />
</autotools>
+ <autotools id="liborc" autogen-sh="configure">
+ <branch module="orc/orc-0.4.16.tar.gz"
+ repo="entropywave" version="0.4.16"/>
+ </autotools>
+
<autotools id="faad2" autogen-sh="autoreconf"
autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">
<branch repo="sourceforge" module="faac/faad2-2.7.tar.gz"
version="2.7" />
</autotools>
- <autotools id="gstreamer" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no"
+ <autotools id="gstreamer" autogenargs="--disable-tests" supports-non-srcdir-builds="no"
makeargs="ERROR_CFLAGS=" autogen-sh="configure">
<branch module="gstreamer/0.10/gstreamer-0.10.35.tar.bz2" version="0.10.35"
hash="sha256:817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786">
@@ -29,11 +36,36 @@
<dep package="glib"/>
</after>
</autotools>
+
+ <autotools id="gstreamer-1.0" autogenargs="--disable-tests" supports-non-srcdir-builds="no"
+ makeargs="ERROR_CFLAGS=" autogen-sh="configure">
+ <branch module="gstreamer/1.0/gstreamer-1.0.2.tar.xz" version="1.0.2"
+ hash="sha256:10c59112bb01a274eb33950300da13d25fd23a7494781bf1b2328372fdb6ee06">
+ </branch>
+ <after>
+ <dep package="glib"/>
+ </after>
+ </autotools>
+
<!-- This doesn't build: see https://bugzilla.gnome.org/show_bug.cgi?id=660302-->
<autotools id="gst-plugins-base" autogenargs="-- --disable-tests --disable-x --disable-xvideo" supports-non-srcdir-builds="no"
makeargs="ERROR_CFLAGS=" autogen-sh="configure">
<branch module="gst-plugins-base/0.10/gst-plugins-base-0.10.35.tar.bz2"
- version="0.10.15" hash="256:cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103"/>
+ version="0.10.15" hash="sha256:cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103"/>
+ <dependencies>
+ <dep package="gstreamer"/>
+ <!--dep package="gtk+"/-->
+ <dep package="liboil"/>
+ </dependencies>
+ <after>
+ <dep package="gnome-vfs"/>
+ </after>
+ </autotools>
+
+ <autotools id="gst-plugins-base-1.0" autogenargs="--disable-tests --disable-x --disable-xvideo" supports-non-srcdir-builds="no"
+ makeargs="ERROR_CFLAGS=" autogen-sh="configure">
+ <branch module="gst-plugins-base/1.0/gst-plugins-base-1.0.2.tar.xz"
+ version="1.0.2" hash="sha256:7ce2c4462ff89f62a82b4503a3788ce2e5077f886e535796fecc223397acf78d"/>
<dependencies>
<dep package="gstreamer"/>
<!--dep package="gtk+"/-->
@@ -54,6 +86,16 @@
</dependencies>
</autotools>
+ <autotools id="gst-plugins-good-1.0" autogenargs="-- --disable-tests --disable-x --disable-xvideo --disable-osx-video" supports-non-srcdir-builds="no"
+ makeargs="ERROR_CFLAGS=" autogen-sh="configure">
+ <branch module="gst-plugins-good/1.0/gst-plugins-good-1.0.2.tar.xz"
+ version="1.0.2" hash="sha256:34762dbd1462dd31b6ca2a01cf6477843c9dc7112e5819cc9d6dd7396b79244c"/>
+ <dependencies>
+ <dep package="gstreamer"/>
+ <dep package="gst-plugins-base"/>
+ </dependencies>
+ </autotools>
+
<!-- The gst-ffmpeg, gst-plugins-bad and gst-plugins-ugly packages have been
removed from gnome sources. -->
@@ -68,4 +110,14 @@
</dependencies>
</metamodule>
+ <metamodule id="meta-gtk-osx-gstreamer-1.0">
+ <dependencies>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="liborc"/>
+ <dep package="gstreamer-1.0"/>
+ <dep package="gst-plugins-base-1.0"/>
+ <dep package="gst-plugins-good-1.0"/>
+ </dependencies>
+ </metamodule>
+
</moduleset>
diff --git a/modulesets-stable/gtk-osx-gtkmm.modules b/modulesets-stable/gtk-osx-gtkmm.modules
index 67ed523..107c3a8 100644
--- a/modulesets-stable/gtk-osx-gtkmm.modules
+++ b/modulesets-stable/gtk-osx-gtkmm.modules
@@ -15,6 +15,12 @@
</dependencies>
</metamodule>
+ <metamodule id="meta-gtk-osx-gtkmm3">
+ <dependencies>
+ <dep package="gtkmm3"/>
+ </dependencies>
+ </metamodule>
+
<autotools id="cairomm" autogen-sh="configure">
<branch module="cairomm-1.10.0.tar.gz" version="1.10.0"
hash="sha1:f08bf8a331067f0d1e876523f07238fba6b26b99"
@@ -25,26 +31,17 @@
</autotools>
<autotools id="glibmm" autogen-sh="configure">
- <branch module="glibmm/2.28/glibmm-2.28.2.tar.bz2" version="2.28.2"
- hash="sha256:7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"/>
+ <branch module="glibmm/2.34/glibmm-2.34.0.tar.xz" version="2.34.0"
+ hash="sha256:ae5b8221fdace1771d2ae401b52afdca8b64ee12bd0f956fb4e92d482ddc1cbf"/>
<dependencies>
<dep package="glib"/>
<dep package="libsigc++2"/>
</dependencies>
</autotools>
- <autotools id="glibmm3" autogen-sh="configure">
- <branch module="glibmm/2.28/glibmm-2.28.2.tar.bz2" version="2.28.2"
- hash="sha256:7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"/>
- <dependencies>
- <dep package="glib-gtk3"/>
- <dep package="libsigc++2"/>
- </dependencies>
- </autotools>
-
<autotools id="pangomm" autogen-sh="configure">
- <branch module="pangomm/2.28/pangomm-2.28.2.tar.bz2" version="2.28.2"
- hash="sha256:ec1d97245eada5cf18d0e7af3f6e31498f25623b4a354589d631d2dff92fd88f"/>
+ <branch module="pangomm/2.28/pangomm-2.28.4.tar.xz" version="2.28.4"
+ hash="sha256:778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82"/>
<dependencies>
<dep package="glibmm"/>
<dep package="cairomm"/>
@@ -53,8 +50,8 @@
</autotools>
<autotools id="atkmm" autogen-sh="configure">
- <branch module="atkmm/2.22/atkmm-2.22.5.tar.bz2" version="2.22.5"
- hash="sha256:61e03e5e67952c8fd9919049fae680bd0f2a1547344394f36b98b05b34b7be6c"/>
+ <branch module="atkmm/2.22/atkmm-2.22.6.tar.xz" version="2.22.6"
+ hash="sha256:0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6"/>
</autotools>
<!-- libsigc++ depends on doxygen for documentation, but doxygen
@@ -64,17 +61,17 @@
documentation in your jhbuildrc-custom. -->
<autotools id="libsigc++2" autogen-sh="configure"
autogen-args="--disable-documentation">
- <branch module="libsigc++/2.2/libsigc++-2.2.8.tar.bz2" version="2.2.8"
- hash="sha256:0fd75fd8249e09ae2fd3ffd20c3fbaea11b47d71ba5ba2340ed98b6bdca40ea8"/>
+ <branch module="libsigc++/2.2/libsigc++-2.2.11.tar.xz" version="2.2.11"
+ hash="sha256:9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957"/>
</autotools>
<autotools id="gtkmm3" autogen-sh="configure">
- <branch module="gtkmm/3.2/gtkmm-3.2.0.tar.bz2" version="3.2.0"
- hash="sha256:2f28f97692555daf1bdd5178a50be5678f743cd1b09d276f208911b7738a3250">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Gtkmm-won-t-build-for-Quartz.patch"; strip="1"/>
+ <branch module="gtkmm/3.6/gtkmm-3.6.0.tar.xz" version="3.6.0"
+ hash="sha256:888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359">
+ <!--patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Gtkmm-won-t-build-for-Quartz.patch"; strip="1"/-->
</branch>
<dependencies>
- <dep package="glibmm3"/>
+ <dep package="glibmm"/>
<dep package="cairomm"/>
<dep package="pangomm"/>
<dep package="atkmm"/>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 4726667..eda7780 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -30,6 +30,15 @@
</dependencies>
</metamodule>
+ <metamodule id="meta-gtk-osx-python3-gtk3">
+ <dependencies>
+ <dep package="meta-gtk-osx-gtk3"/>
+ <dep package="pycairo-python3"/>
+ <dep package="pygobject3"/>
+ <dep package="gtk-mac-integration-python"/>
+ </dependencies>
+ </metamodule>
+
<autotools id="berkeleydb" autogen-sh="dist/configure"
autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" makeargs="-C build_unix"
makeinstallargs="-C build_unix install">
@@ -40,13 +49,19 @@
<autotools id="python" autogenargs="--enable-shared" autogen-sh="configure">
<branch repo="python"
- module="2.7.2/Python-2.7.2.tar.bz2" version="2.7.2">
+ module="2.7.3/Python-2.7.3.tar.xz" version="2.7.3">
</branch>
<after>
<dep package="berkeleydb"/>
</after>
</autotools>
+ <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"/>
+ <after>
+ <dep package="berkeleydb"/>
+ </after>
+ </autotools>
<!-- Pycairo 1.8.4+ requires Python 2.6. Leopard comes only with 2.5,
so pycairo is by default held at 1.8.2. Use pycairo-python2.6 if
@@ -64,7 +79,8 @@
</autotools>
<!-- Cairographics have changed the name to py2cairo for python 2 holdouts. -->
- <autotools id="pycairo-python2.6" autogen-sh="configure">
+<!-- They also broke configure (left install-sh out of the tarball) but waf works -->
+ <waf id="pycairo-python2.6">
<branch module="py2cairo-1.10.0.tar.bz2" repo="cairographics.org"
version="1.10.0"
hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb"/>
@@ -75,12 +91,28 @@
<dep package="python"/>
<dep package="meta-gtk-osx-core"/>
</after>
+ </waf>
+
+<!-- Pycairo-python3 for those who've made the leap. -->
+ <autotools id="pycairo-python3" autogen-sh="configure">
+ <branch module="pycairo-1.10.0.tar.bz2" repo="cairographics.org"
+ version="1.10.0"
+ hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb"/>
+ <dependencies>
+ <dep package="cairo"/>
+ </dependencies>
+ <after>
+ <dep package="python"/>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
</autotools>
+
<!-- PyGObject 2.28 is the last series for Gtk+-2; for co-installation
with later versions it installs as pygobject2 and PyGObject 3
installs as pygobject3. Introspection is disabled here, because
gir-scanner isn't smart enough to co-install them. -->
- <autotools id="pygobject" autogen-sh="configure" >
+ <autotools id="pygobject" autogen-sh="configure"
+ autogenargs="--disable-introspection">
<branch version="2.28.6" module="pygobject/2.28/pygobject-2.28.6.tar.bz2"
hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"/>
<dependencies>
@@ -92,8 +124,8 @@
</autotools>
<autotools id="pygobject3" autogen-sh="configure" >
- <branch version="3.3.2" module="pygobject/3.3/pygobject-3.3.2.tar.xz"
- hash="sha256:ed66b86114ab45c4fa484b680f09ccdfb36b7760901028cdf7819a6635911715"/>
+ <branch version="3.4.1" module="pygobject/3.4/pygobject-3.4.1.tar.xz"
+ hash="sha256:21dbef53f5a29bcb547f36ba42e021f71981e1c50e8f89526e393d77b36a8b1f"/>
<dependencies>
<dep package="meta-gtk-osx-gtk3"/>
</dependencies>
@@ -102,7 +134,8 @@
</after>
</autotools>
- <autotools id="pygtk" autogen-sh="configure"
+<!-- Pygtk is discontinued, this is the last release -->
+ <autotools id="pygtk" autogen-sh="configure"
autogenargs="CFLAGS="$CFLAGS -xobjective-c" lt_cv_sys_global_symbol_pipe="'sed -n -e '\''s/^.*[ ]\([BCDEGRST][BCDEGRST]*\)[ ][ ]*_\([_A-Za-z][_A-Za-z0-9]*\)$/\1 _\2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''"">
<branch version="2.24.0" module="pygtk/2.24/pygtk-2.24.0.tar.bz2"
hash="sha256:cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912">
@@ -120,9 +153,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.0.tar.bz2"
- version="2.0.0"
- hash="sha256:17773d32be5304839f6f917a6ce4637d9a642829105ce8f9527f663830b8089"/>
+ <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.1.tar.bz2"
+ version="2.0.1"
+ hash="sha256:1a3f6c418819499bbf63a1bb8da7f725eb07c3a929028b7bd0c3d5cd5077a181"/>
<dependencies>
</dependencies>
<after>
@@ -131,7 +164,7 @@
</after>
</autotools>
- <autotools id="pygtk-extras">
+ <autotools id="pygtk-extras" autogen-sh="configure">
<branch module="gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2"
version="2.25.3"/>
<dependencies>
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index c64ee3d..4257870 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -4,7 +4,7 @@
<moduleset>
<repository type="tarball" name="ftp.gnome.org" default="yes"
href="http://ftp.gnome.org/pub/GNOME/sources/"/>
- <repository type="tarball" name="ftp.gtk.org"
+ <repository type="tarball" name="ftp.gtk.org"
href="ftp://ftp.gtk.org/pub/"/>
<repository type="tarball" name="hadess"
href="http://freedesktop.org/~hadess/"/>
@@ -12,7 +12,7 @@
href="ftp://ftp.gimp.org/pub/"/>
<repository type="tarball" name="poppler.freedesktop.org"
href="http://poppler.freedesktop.org/"/>
- <repository type="tarball" name="sourceforge"
+ <repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="git" name="github.com" href="git://github.com/"/>
<repository type="tarball" name="dbus.freedesktop.org"
@@ -74,8 +74,8 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<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"/>
+ <branch repo="ftp.gnome.org" module="vala/0.18/vala-0.18.0.tar.xz"
+ version="0.18.0" hash="sha256:18cb2220ce7352a9dd71be058530f7d4a6c8215a1d9c471430af60a04496a60b"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
@@ -116,8 +116,8 @@ Libglade itself is deprecated. This is the last release. -->
be using WebKit-svn, which is enormous and difficult. Good
Luck. -->
<autotools id="devhelp-gtk3" autogen-sh="configure">
- <branch module="devhelp/3.2/devhelp-3.2.0.tar.bz2" version="3.2.0"
- hash="sha256:1341d1060c094956e8496c9ed68334192ca963fa211489737a0b84a4693c232d"/>
+ <branch module="devhelp/3.6/devhelp-3.6.0.tar.xz" version="3.6.0"
+ hash="sha256:bf0576d5d70496367ccb22be53be620bbfe341bd491c1d725cfb59d566769fe1"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-themes"/>
@@ -129,11 +129,10 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<!-- Glade 3.8 is the last stable series for Gtk+-2 -->
- <autotools id="glade3" autogen-sh="configure"
+ <autotools id="glade3" autogen-sh="configure"
autogenargs="--disable-scrollkeeper">
- <branch module="glade3/3.8/glade3-3.8.0.tar.bz2" version="3.8.0"
- hash="sha256:ad3f726ccd34d210dbec9cc2787cab91f7b4c4b9e7518c00bc72b6d52c9858bb">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Glade-3-8-Bug-663492-Update-Mac-integration-bindings-to-.patch " strip="1"/>
+ <branch module="glade3/3.8/glade3-3.8.2.tar.xz" version="3.8.2"
+ hash="sha256:f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d388b19">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch"; strip="1"/>
</branch>
<after>
@@ -147,9 +146,8 @@ Libglade itself is deprecated. This is the last release. -->
change back to just "glade"-->
<autotools id="glade" autogen-sh="configure"
autogenargs="--disable-scrollkeeper">
- <branch module="glade/3.10/glade-3.10.2.tar.bz2" version="3.10.2"
- hash="sha256:7e6a1423f1697d8b40618d0b01f0ebff572ccb80f5818a36af0971c5d1d94253">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Glade-master-Bug-663492-Update-Mac-integration-bindings-to-.patch"; strip="1"/>
+ <branch module="glade/3.14/glade-3.14.1.tar.xz" version="3.14.1"
+ hash="sha256:8484b62c7a4579ea3e5d98200b397a1baf0b621c0b0c70242ee1dbbe449eae20">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Glade-master-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch"; strip="1"/>
</branch>
<after>
@@ -174,10 +172,8 @@ Libglade itself is deprecated. This is the last release. -->
<autotools id="gtksourceview3"
autogen-template="gnome-autogen.sh --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
- <branch module="gtksourceview/3.2/gtksourceview-3.2.0.tar.bz2"
- version="3.2.0" hash="sha256:82b1028d69fcb24650ebc801454eb688dc3a01c6061c1d77d1cf665f048f050a">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtksourceview3-664679-backends.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtksourceview3-664511-gtkosxapplication.patch"; strip="1"/>
+ <branch module="gtksourceview/3.6/gtksourceview-3.6.0.tar.xz"
+ version="3.6.0" hash="sha256:7d268618fbe8c2960300a305d38255294c9f497fcbc0e53a1da1bf9bda0d1c7a">
</branch>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
@@ -218,7 +214,7 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<!-- NB: dbus support is now built into glib -->
<autotools id="dbus-glib" autogenargs="--disable-selinux">
- <branch module="dbus-glib/dbus-glib-0.92.tar.gz" version="0.92"
+ <branch module="dbus-glib/dbus-glib-0.92.tar.gz" version="0.92"
repo="dbus.freedesktop.org"/>
<dependencies>
<dep package="dbus"/>
@@ -233,27 +229,27 @@ Libglade itself is deprecated. This is the last release. -->
which is available only through svn or from Linux distros -->
<autotools id="gconf" autogen-sh="configure"
autogenargs="--disable-defaults-service">
- <branch module="GConf/2.28/GConf-2.28.0.tar.bz2" version="2.28.0"
+ <!--branch module="GConf/2.28/GConf-2.28.0.tar.bz2" version="2.28.0"
hash="sha256:d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/GConf-characters.patch"; strip="1"/>
- </branch>
+ </branch-->
<!-- GConf-2.32 uses gdbus, which doesn't work for OSX -->
- <!--branch module="GConf/2.32/GConf-2.32.1.tar.bz2" version="2.32.1"
- hash="sha256:f2d06c1ab52ac54e9f025e9bdeb08460f27a7fe6f9e660aa39d9f059dafecd18"/ -->
+ <branch module="GConf/3.2.5/GConf-3.2.5.tar.xz" version="3.2.5"
+ hash="sha256:4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6"/>
<dependencies>
<dep package="ORBit2"/>
- <dep package="dbus-glib"/>
+ <!--dep package="dbus-glib"/-->
</dependencies>
</autotools>
<autotools id="lcms" autogen-sh="configure">
- <branch module="lcms/lcms2-2.2.tar.gz" version="2.2" repo="sourceforge"
+ <branch module="lcms/lcms2-2.4.tar.gz" version="2.4" repo="sourceforge"
/>
</autotools>
<autotools id="shared-mime-info" autogen-sh="configure"
supports-non-srcdir-builds="no" >
- <branch module="shared-mime-info-0.90.tar.bz2" version="0.90"
+ <branch module="shared-mime-info-1.0.tar.xz" version="1.0"
repo="hadess"/>
<dependencies>
<dep package="intltool"/>
@@ -269,8 +265,8 @@ Libglade itself is deprecated. This is the last release. -->
--without-dbus --without-gnomevfs --without-wmf --enable-binreloc "
autogen-template="autoreconf -fis && %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
makeargs='LDFLAGS="-framework Carbon"'>
- <branch module="gimp/v2.6/gimp-2.6.12.tar.bz2" version="2.6.12"
- md5sum="9f876ee63a0c4a4c83f50f32fb3bbe63" repo="gimp">
+ <branch module="gimp/v2.8/gimp-2.8.2.tar.bz2" version="2.8.2"
+ md5sum="b542138820ca3a41cbd63fc331907955" 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>
@@ -290,13 +286,15 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<autotools id="babl" >
- <branch repo="ftp.gtk.org" version="0.1.6"
- module="babl/0.1/babl-0.1.6.tar.bz2"/>
+ <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/patchesBug-673403-replace-values_h.patch"; strip="1"/>
+ </branch>
</autotools>
<autotools id="gegl" autogen-sh="configure" autogenargs="--disable-docs">
- <branch repo="ftp.gtk.org" version="0.1.8"
- module="gegl/0.1/gegl-0.1.8.tar.bz2"/>
+ <branch repo="ftp.gtk.org" version="0.2.0"
+ module="gegl/0.2/gegl-0.2.0.tar.bz2"/>
<dependencies>
<dep package="babl"/>
</dependencies>
@@ -304,7 +302,7 @@ Libglade itself is deprecated. This is the last release. -->
<autotools id="poppler" autogen-sh="configure"
autogenargs="--disable-qt --disable-qt4 --without-x --disable-gtk-test --enable-xpdf-headers">
- <branch module="poppler-0.16.7.tar.gz" version="0.16.7"
+ <branch module="poppler-0.20.5.tar.gz" version="0.20.5"
repo="poppler.freedesktop.org"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
@@ -313,8 +311,9 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<!-- SQLite3 is provided by MacOSX in /usr/lib/libsqlite.3.dylib -->
- <autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe" >
- <branch module="sqlite-autoconf-3070800.tar.gz" version='3.7.8'
+ <autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe"
+ autogen-sh="configure">
+ <branch module="sqlite-autoconf-3071401.tar.gz" version='3.7.14'
repo="sqlite"/>
</autotools>
@@ -329,8 +328,8 @@ Libglade itself is deprecated. This is the last release. -->
<!-- Goocanvas-2 is for gtk+-3. -->
<autotools id="goocanvas2">
- <branch module="goocanvas/2.0/goocanvas-2.0.0.tar.bz2" version="2.0.0"
- hash="9f8d7f700ad9617adef37e63f58cb2d038d799443e3756040f368ceea7f01331"/>
+ <branch module="goocanvas/2.0/goocanvas-2.0.1.tar.xz" version="2.0.1"
+ hash="sha256:0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553"/>
<dependencies>
<dep package="gtk+-3.0"/>
</dependencies>
@@ -351,7 +350,7 @@ Libglade itself is deprecated. This is the last release. -->
repo="sourceforge"/>
</autotools>
- <autotools id="gtkspell">
+ <autotools id="gtkspell" autogen-sh="configure">
<branch module="gtkspell/gtkspell-2.0.16.tar.gz" repo="sourceforge"
version="2.0.16"/>
<dependencies>
@@ -365,10 +364,11 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<autotools id="gmp">
- <!--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-5.0.5.tar.bz2" version="5.0.5"/-->
<branch repo="ftp.gnu.org" module="gmp/gmp-4.3.2.tar.bz2" version="4.3.2"/>
</autotools>
+
<autotools id="guile" autogen-sh="configure">
<branch repo="ftp.gnu.org" module="guile/guile-1.8.8.tar.gz"
version="1.8.8"/>
@@ -378,12 +378,11 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<autotools id="guile2" autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="guile/guile-2.0.2.tar.gz"
- version="2.0.2"/>
+ <branch repo="ftp.gnu.org" module="guile/guile-2.0.6.tar.gz"
+ version="2.0.6"/>
<dependencies>
<dep package="gmp"/>
</dependencies>
</autotools>
-
</moduleset>
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index 108162c..986d043 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -64,16 +64,22 @@
hash="sha256:e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912"/>
</autotools>
- <autotools id="librsvg">
- <branch module="librsvg/2.32/librsvg-2.32.1.tar.bz2" version="2.32.1"
- hash="sha256:91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334"/>
+ <autotools id="librsvg2" autogenargs="--disable-Bsymbolic">
+ <branch module="librsvg/2.36/librsvg-2.36.4.tar.xz" version="2.36.4"
+ hash="sha256:1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2"/>
+ <dependencies>
+ <dep package="libcroco"/>
+ <dep package="libgsf"/>
+ <!--dep package="libart_lgpl"/><goffice.modules -->
+ </dependencies>
</autotools>
- <autotools id="libcroco">
- <branch module="libcroco/0.6/libcroco-0.6.2.tar.bz2" version="0.6.2"
- hash="sha256:be24853f64c09b63d39e563fb0222e29bae1a33c3d9f6cbffc0bc27669371749"/>
+ <autotools id="libcroco" autogenargs="--disable-Bsymbolic"
+ autogen-sh="configure">
+ <branch module="libcroco/0.6/libcroco-0.6.8.tar.xz" version="0.6.8"
+ hash="sha256:ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570"/>
<dependencies>
- <dep package="librsvg"/>
+ <!--dep package="librsvg"/-->
</dependencies>
</autotools>
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index e635678..7c5a3e6 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -8,7 +8,7 @@
href="http://www.68k.org/~michael/"/>
<repository type='tarball' name='ftp.gnu.org' href="ftp://ftp.gnu.org/gnu/"/>
<repository type='tarball' name='ftp.gnupg.org' href="ftp://ftp.gnupg.org/"; />
- <repository type="tarball" name="sourceforge"
+ <repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="svn" name="svn.debian.org" href="svn://svn.debian.org/"/>
<repository type="tarball" name="abisource/enchant"
@@ -20,7 +20,7 @@
<repository type="tarball" name="curl.haxx.se"
href="http://curl.haxx.se/download/"/>
<repository type="tarball" name="webkit.org"
- href="http://www.webkitgtk.org/"/>
+ href="http://www.webkitgtk.org/releases/"/>
<repository type="svn" name="svn.webkit.org"
href="http://svn.webkit.org/repository/"/>
@@ -58,17 +58,17 @@
</autotools>
<autotools id="iso-codes" autogen-sh="configure">
- <branch module="iso-codes_3.38.orig.tar.xz" version="3.38" repo="iso-codes" checkoutdir="iso-codes-3.37"/>
+ <branch module="iso-codes_3.39.orig.tar.xz" version="3.39" repo="iso-codes" checkoutdir="iso-codes-3.39"/>
</autotools>
- <autotools id="zlib">
- <branch repo="sourceforge" version="1.2.5"
- module="libpng/zlib-1.2.5.tar.gz"/>
+ <autotools id="zlib" autogen-sh="configure">
+ <branch repo="sourceforge" version="1.2.7"
+ module="libpng/zlib-1.2.7.tar.gz"/>
</autotools>
<autotools id="gnutls" autogen-sh="configure" autogenargs="--with-libgcrypt --without-p11-kit">
- <branch repo='ftp.gnu.org' version='2.12.11'
- module="gnutls/gnutls-2.12.11.tar.bz2"/>
+ <branch repo='ftp.gnu.org' version='2.12.20'
+ module="gnutls/gnutls-2.12.20.tar.bz2"/>
<dependencies>
<dep package="libgcrypt" />
<dep package="libtasn1" />
@@ -78,24 +78,25 @@
</autotools>
<cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
- <branch version='0.4.7' module='libproxy-0.4.7.tar.gz'
+ <branch version='0.4.10' module='libproxy-0.4.10.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"/>
-<!-- Comment #1 on issue 168 by dominiqu gmail com: LibProxy doesn't make its pkgconfig file under OSX
+ <!-- patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libproxy-Bug-052-POSIX_C_SOURCE.patch"; strip="1"/>
+ Comment #1 on issue 168 by dominiqu gmail com: LibProxy doesn't make its pkgconfig file under OSX
http://code.google.com/p/libproxy/issues/detail?id=168
This issue was closed by revision r827.
-->
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-168-libproxy-pc-file.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" autogenargs="--disable-tests">
- <branch module="libgnome-keyring/3.2/libgnome-keyring-3.2.2.tar.bz2"
- version="3.2.2" hash="sha256:5332e1e428aa7c1cece68fb37799681df30eeb8a73d96c354969d401fdfeddd7">
+ <autotools id="libgnome-keyring" autogenargs="--disable-tests"
+ autogen-sh="configure">
+ <branch module="libgnome-keyring/3.6/libgnome-keyring-3.6.0.tar.xz"
+ version="3.6.0" hash="sha256:6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830">
</branch>
<dependencies>
<dep package="glib"/>
@@ -107,8 +108,8 @@ This issue was closed by revision r827.
<autotools id="glib-networking" autogen-sh="configure"
autogenargs="--without-ca-certificates">
- <branch module="glib-networking/2.28/glib-networking-2.28.7.tar.bz2"
- version="2.28.7" hash="sha256:98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c"/>
+ <branch module="glib-networking/2.34/glib-networking-2.34.0.tar.xz"
+ version="2.34.0" hash="sha256:c56eb4161671bff9568f3a92a88531ca01217eb7ee8514bb6255730400f877f1"/>
<dependencies>
<dep package="gnutls"/>
<dep package="libgcrypt"/>
@@ -118,8 +119,8 @@ This issue was closed by revision r827.
<!-- Libsoup's gnome-2-32 branch tags versions on 2.32, gnome-3-0 tags
2.34, gnome-3-2 tags 2.36 -->
<autotools id="libsoup" autogen-sh="configure" autogenargs="">
- <branch module="libsoup/2.34/libsoup-2.34.3.tar.bz2"
- version="2.34.3" hash="sha256:940fa2777542e564ba7052252ee065adc6c7982c0cae56a4c541a04329fc7dc7" />
+ <branch module="libsoup/2.40/libsoup-2.40.1.tar.xz"
+ version="2.40.1" hash="sha256:77a55d57e7e8055acd2f44e0cc889b9ba48052e8b7f07e829157d57417ac650a" />
<dependencies>
<dep package="glib"/>
<dep package="glib-networking"/>
@@ -128,17 +129,6 @@ This issue was closed by revision r827.
</dependencies>
</autotools>
- <autotools id="libsoup-gtk3" autogen-sh="configure" autogenargs="">
- <branch module="libsoup/2.36/libsoup-2.36.1.tar.bz2" version="2.36.1"
- hash="sha256:c387eefd8214c458965b1d6e3490cea33b5bb6c81798cac90cde96136dc19401" />
- <dependencies>
- <dep package="glib-gtk3"/>
- <dep package="glib-networking"/>
- <dep package="libgnome-keyring"/>
- <dep package='sqlite'/>
- </dependencies>
- </autotools>
-
<autotools id="enchant" autogen-sh="configure"
autogenargs="--with-myspell-dir=/Library/Dictionaries">
<branch module="1.6.0/enchant-1.6.0.tar.gz" version="1.6.0"
@@ -163,13 +153,13 @@ This issue was closed by revision r827.
<autotools id="libtasn1" supports-non-srcdir-builds="no"
autogen-sh="configure">
- <branch repo="ftp.gnu.org" version='2.9'
- module="libtasn1/libtasn1-2.9.tar.gz"/>
+ <branch repo="ftp.gnu.org" version='2.14'
+ module="libtasn1/libtasn1-2.14.tar.gz"/>
</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" />
+ <branch repo="curl.haxx.se" module="curl-7.28.0.tar.bz2" version="7.28.0" />
</autotools>
<autotools id="WebKit" autogen-sh="configure"
@@ -183,10 +173,9 @@ This issue was closed by revision r827.
</branch>
<dependencies>
<dep package="enchant"/>
+ <dep package="libsoup"/>
</dependencies>
<after>
- <dep package="libsoup"/>
- <dep package="libsoup-gtk3"/>
<dep package="meta-gtk-osx-core"/>
<dep package="meta-gtk-osx-gtk3"/>
</after>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 530ea1e..462b9f0 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -12,6 +12,7 @@
href="http://ftp.gnu.org/gnu/"/>
<repository type="tarball" name="sourceware.org"
href="ftp://sourceware.org/pub/"/>
+
<!-- This module set works a bit differently than for example the
GNOME ones do. It's split up in seperate pieces:
@@ -65,19 +66,8 @@
</metamodule>
<autotools id="glib" autogen-sh="configure">
- <branch module="glib/2.28/glib-2.28.8.tar.bz2" version="2.28.8"
- hash="sha256:222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/glib-iconv.patch"; strip="1"/>
- </branch>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="gtk-doc"/>
- </after>
- </autotools>
-
- <autotools id="glib-gtk3" autogen-sh="configure">
- <branch module="glib/2.33/glib-2.33.2.tar.xz" version="2.33.2"
- hash="sha256:b7163e9f159775d13ecfb433d67c3f0883e0e518e85b2e970d4ad9773d7cd0b4"/>
+ <branch module="glib/2.34/glib-2.34.1.tar.xz" version="2.34.1"
+ hash="sha256:6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1"/>
<dependencies>
<dep package="libffi"/>
<dep package="gtk-doc"/>
@@ -87,13 +77,14 @@
</after>
</autotools>
- <autotools id="libffi" autogenargs="--disable-builddir">
- <branch module="libffi/libffi-3.0.10.tar.gz" repo="sourceware.org"
- version="3.0.10" checkoutdir="atgreen-libffi-873d687"/>
+ <autotools id="libffi" autogenargs="--disable-builddir"
+ autogen-sh="configure">
+ <branch module="libffi/libffi-3.0.11.tar.gz" repo="sourceware.org"
+ version="3.0.11" checkoutdir="atgreen-libffi-873d687"/>
</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. -->
- <autotools id="gobject-introspection">
+<!-- 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 -->
+ <autotools id="gobject-introspection-10" autogen-sh="configure">
<branch module="gobject-introspection/0.10/gobject-introspection-0.10.8.tar.bz2"
version="0.10.8"
hash="sha256:5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e">
@@ -106,66 +97,44 @@
</dependencies>
</autotools>
- <autotools id="gobject-introspection-gtk3">
- <branch module="gobject-introspection/1.33/gobject-introspection-1.33.2.tar.xz"
- version="1.33.2"
- hash="sha256:86f7325a7a8e1df7eb99d3bed83dead92e1283a8ec167b57727f138a205bb9e7">
+ <autotools id="gobject-introspection" autogen-sh="configure">
+ <branch module="gobject-introspection/1.34/gobject-introspection-1.34.1.tar.xz"
+ version="1.34.1"
+ hash="sha256:bf40470c863dbb292ec52d1e84495e9334ea954e3a0ee59d6ff5f8161ea53abd">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/girscanner-objc.patch"; strip="1"/>
- <!--patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-scanner-split-CC-environment-variable.patch"; strip="1"/-->
- </branch>
- <dependencies>
- <dep package="glib-gtk3"/>
- <dep package="cairo"/>
- </dependencies>
- </autotools>
-
-<!-- PangoFt2 and hence freetype and fontconfig are required by WebKitGtk. -->
- <autotools id="pango" autogen-sh="configure"
- autogenargs="--without-x --with-included-modules=basic-atsui"
- makeargs="-k -C modules; make">
- <!-- The last version that will build on Tiger is 1.24.5 -->
- <branch version="1.28.4" module="pango/1.28/pango-1.28.4.tar.bz2"
- hash="sha256:7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f">
-<!-- <branch version="1.24.5" module="pango/1.24/pango-1.24.5.tar.bz2"
- hash="sha256:0f733d1ec3e8dafcae152d7ac58f1090bee1fd856176c8fee0e81b0e42392f4e">-->
</branch>
<dependencies>
- <dep package="cairo"/>
- <dep package="fontconfig"/>
<dep package="glib"/>
- <dep package="gobject-introspection"/>
+ <dep package="cairo"/>
</dependencies>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- </after>
</autotools>
- <autotools id="pango-gtk3" autogen-sh="configure"
- autogenargs="--without-x --with-included-modules=basic-atsui"
+ <autotools id="pango" autogen-sh="configure"
+ autogenargs="--without-x"
makeargs="-k -C modules; make">
- <branch version="1.30.1" module="pango/1.30/pango-1.30.1.tar.xz"
- hash="sha256:3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe">
- <!--patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/pango-CoreText-fix-zero-width-space-bgo-666856.patch"; strip="1"/-->
+ <branch version="1.32.1" module="pango/1.32/pango-1.32.1.tar.xz"
+ hash="sha256:484babf7e1ac4bf959a0babe8168f180acb516932d70e2985de5f6e2961fcd82">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Fix-relative-module-paths.patch"; strip="1"/>
</branch>
<dependencies>
<dep package="cairo"/>
- <dep package="fontconfig"/>
- <dep package="glib-gtk3"/>
- <dep package="gobject-introspection-gtk3"/>
- </dependencies>
+ </dependencies>
<after>
+ <dep package="gobject-introspection"/>
+ <dep package="meta-gtk-osx-freetype"/>
+ <dep package="glib"/>
<dep package="meta-gtk-osx-bootstrap"/>
</after>
</autotools>
<autotools id="atk" autogen-sh="configure">
- <branch module="atk/2.2/atk-2.2.0.tar.bz2" version="2.2.0"
- hash="sha256:d201e3f5808aef0b1aec2277bfa61074f68863e405428adb57a73aab5c838450"/>
+ <branch module="atk/2.6/atk-2.6.0.tar.xz" version="2.6.0"
+ hash="sha256:eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"/>
<dependencies>
</dependencies>
<after>
<dep package="glib"/>
- <dep package="glib-gtk3"/>
+ <dep package="glib"/>
<dep package="meta-gtk-osx-bootstrap"/>
</after>
</autotools>
@@ -178,37 +147,28 @@
</after>
</autotools>
- <autotools id="gdk-pixbuf-gtk3">
- <branch module="gdk-pixbuf/2.26/gdk-pixbuf-2.26.1.tar.xz" version="2.26.1"
- hash="sha256:a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba"/>
+ <autotools id="gdk-pixbuf-gtk3" autogen-sh="configure">
+ <branch module="gdk-pixbuf/2.26/gdk-pixbuf-2.26.4.tar.xz" version="2.26.4"
+ hash="sha256:a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be"/>
<after>
- <dep package="pango-gtk3"/>
+ <dep package="pango"/>
</after>
</autotools>
<autotools id="gtk+" autogen-sh="configure"
- autogenargs="--with-gdktarget=quartz --enable-quartz-relocation"
+ autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection"
autogen-template="autoreconf -fis && %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
- <branch module="gtk+/2.24/gtk+-2.24.9.tar.xz" version="2.24.9">
+ <branch module="gtk+/2.24/gtk+-2.24.13.tar.xz" version="2.24.13"
+ hash="sha256:35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch"; strip="1"/>
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtk+-Bug-655065-Better-Fix.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0002-gtk2-Extract-reasons-and-reasons_desc-arrays-to-file-leve.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0003-gtk2-Create-enum-PrinterStateLevel.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0004-gtk2-Extract-printer-setup-variables-into-a-struct.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0005-gtk2-Extract-function-cups_printer_handle_attribute.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0006-gtk2-Extract-Function-cups_create_printer.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0007-gtk2-Move-some-variable-declarations-into-the-scopes-in-w.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0008-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0009-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch"; strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch"; strip="1"/>
</branch>
<dependencies>
<dep package="glib"/>
<dep package="pango"/>
<dep package="atk"/>
- <dep package="gdk-pixbuf"/>
+ <dep package="gdk-pixbuf-gtk3"/>
<dep package="gobject-introspection"/>
</dependencies>
<after>
@@ -218,24 +178,15 @@
<autotools id="gtk+-3.0" autogen-sh="autogen.sh"
autogenargs="--enable-quartz-backend --enable-quartz-relocation">
- <branch module="gtk+/3.4/gtk+-3.4.3.tar.xz" version="3.4.3"
- hash="sha256:846010442a96590469cde16ed6a1fdfe09397e435165459f04d31cfa5713799f">
- <!--patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-571582-GtkSelection-implementation-for-quartz.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0002-gtk3-Extract-reasons-and-reasons_desc-arrays-to-file-leve.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0003-gtk3-Create-enum-PrinterStateLevel.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0004-gtk3-Extract-printer-setup-variables-into-a-struct.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0005-gtk3-Extract-function-cups_printer_handle_attribute.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0006-gtk3-Extract-Function-cups_create_printer.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0007-gtk3-Move-some-variable-declarations-into-the-scopes-in-w.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0008-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0009-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch"; strip="1"/-->
- </branch>
+ <branch module="gtk+/3.6/gtk+-3.6.1.tar.xz" version="3.6.1"
+ hash="sha256:fe6c89ae40145b077d7291105e81d4f876be01bf21ddfb9cba449f6be49d7996">
+ </branch>
<dependencies>
- <dep package="glib-gtk3"/>
- <dep package="pango-gtk3"/>
+ <dep package="glib"/>
+ <dep package="pango"/>
<dep package="atk"/>
<dep package="gdk-pixbuf-gtk3"/>
- <dep package="gobject-introspection-gtk3"/>
+ <dep package="gobject-introspection"/>
</dependencies>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
@@ -243,9 +194,9 @@
</autotools>
<autotools id="pixman" autogenargs="--disable-gtk" autogen-sh="configure">
- <branch version="0.22.2" module="pixman-0.22.2.tar.gz"
+ <branch version="0.26.2" module="pixman-0.26.2.tar.gz"
repo="cairographics"
- hash="sha1:b42a7aec5119b1e5ce8eed06452645fa3a4892ac"/>
+ hash="sha1:3c7d72b5b52e6d301efc68aa480f0737a641bdd3"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
</after>
@@ -253,11 +204,11 @@
<autotools id="cairo" autogen-sh="configure"
autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
- <branch module="cairo-1.10.2.tar.gz" version="1.10.2"
+ <branch module="cairo-1.12.6.tar.xz" version="1.12.6"
repo="cairographics"
- hash="sha1:ccce5ae03f99c505db97c286a0c9a90a926d3c6e">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Cairo-44584-llvm-no-flto.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-quartz-Fix-the-32-bits-build-on-MacOSX-10.7.patch"; strip="1"/>
+ hash="sha1:a383c6cb4495e18848ea43e1031c294aa9417a43">
+ <!--patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Cairo-44584-llvm-no-flto.patch"; strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-quartz-Fix-the-32-bits-build-on-MacOSX-10.7.patch"; strip="1"/-->
</branch>
<dependencies>
<dep package="pixman"/>
@@ -271,9 +222,9 @@
<autotools id="gtk-mac-integration" autogen-sh="configure"
autogenargs="--disable-python">
- <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.0.tar.xz"
- version="2.0.0"
- hash="sha256:44c6461e7b2b058bd4c9c7a28903e2a25fa5a5b1eeea49331c4fe7043a042436">
+ <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.1.tar.xz"
+ version="2.0.1"
+ hash="sha256:1a3f6c418819499bbf63a1bb8da7f725eb07c3a929028b7bd0c3d5cd5077a181">
</branch>
<dependencies>
</dependencies>
diff --git a/patches/0001-Fix-relative-module-paths.patch b/patches/0001-Fix-relative-module-paths.patch
new file mode 100644
index 0000000..e5722ec
--- /dev/null
+++ b/patches/0001-Fix-relative-module-paths.patch
@@ -0,0 +1,42 @@
+From 2332e82a1415696a36f138768b8330c1e97d3a89 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Sat, 3 Nov 2012 11:46:59 -0700
+Subject: [PATCH] Fix relative module paths
+
+So that the created absolute path is where the modules are installed
+instead of where the modules file is installed (i.e.,
+lib/pango/1.8.0/modules instead of etc/pango).
+---
+ pango/modules.c | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/pango/modules.c b/pango/modules.c
+index 644cc9c..c5a19f2 100644
+--- a/pango/modules.c
++++ b/pango/modules.c
+@@ -450,11 +450,17 @@ process_module_file (FILE *module_file, const gchar *module_file_dir)
+ switch (i)
+ {
+ case 0:
+- if (!g_path_is_absolute (tmp_buf->str)) {
+- const gchar *abs_file_name = g_build_filename (module_file_dir, tmp_buf->str, NULL);
+- g_string_assign (tmp_buf, abs_file_name);
+- g_free ((gpointer) abs_file_name);
+- }
++ if (!g_path_is_absolute (tmp_buf->str))
++ {
++ const gchar *lib_dir = pango_get_lib_subdirectory ();
++ const gchar *abs_file_name = g_build_filename (lib_dir,
++ MODULE_VERSION,
++ "modules",
++ tmp_buf->str,
++ NULL);
++ g_string_assign (tmp_buf, abs_file_name);
++ g_free ((gpointer) abs_file_name);
++ }
+ pair->module = find_or_create_module (tmp_buf->str);
+ break;
+ case 1:
+--
+1.7.9.6 (Apple Git-31.1)
+
diff --git a/patches/Bug-673403-replace-values_h.patch b/patches/Bug-673403-replace-values_h.patch
new file mode 100644
index 0000000..8cd1f7f
--- /dev/null
+++ b/patches/Bug-673403-replace-values_h.patch
@@ -0,0 +1,14 @@
+
+--- a/babl/babl-palette.c~ Thu Mar 29 16:10:26 2012
++++ b/babl/babl-palette.c Sat Oct 27 16:04:12 2012
+@@ -19,7 +19,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+-#include <values.h>
++#include <limits.h>
+ #include <assert.h>
+ #include "config.h"
+ #include "babl-internal.h"
+
+Diff finished. Sat Oct 27 16:11:32 2012
diff --git a/patches/libxml2-Bug-686118-pthreads_once_init.patch b/patches/libxml2-Bug-686118-pthreads_once_init.patch
new file mode 100644
index 0000000..8f42220
--- /dev/null
+++ b/patches/libxml2-Bug-686118-pthreads_once_init.patch
@@ -0,0 +1,33 @@
+From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001
+From: Friedrich Haubensak <hsk fli-leibniz de>
+Date: Wed, 12 Sep 2012 15:34:53 +0000
+Subject: Fix a thread portability problem
+
+cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10
+
+I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in
+a structure assignment anyway
+---
+diff --git a/threads.c b/threads.c
+index f206149..7e85a26 100644
+--- a/threads.c
++++ b/threads.c
+@@ -146,6 +146,7 @@ struct _xmlRMutex {
+ static pthread_key_t globalkey;
+ static pthread_t mainthread;
+ static pthread_once_t once_control = PTHREAD_ONCE_INIT;
++static pthread_once_t once_control_init = PTHREAD_ONCE_INIT;
+ static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER;
+ #elif defined HAVE_WIN32_THREADS
+ #if defined(HAVE_COMPILER_TLS)
+@@ -915,7 +916,7 @@ xmlCleanupThreads(void)
+ #ifdef HAVE_PTHREAD_H
+ if ((libxml_is_threaded) && (pthread_key_delete != NULL))
+ pthread_key_delete(globalkey);
+- once_control = PTHREAD_ONCE_INIT;
++ once_control = once_control_init;
+ #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
+ if (globalkey != TLS_OUT_OF_INDEXES) {
+ xmlGlobalStateCleanupHelperParams *p;
+--
+cgit v0.9.0.2
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
