[gtk-osx] Update all package versions to current releases.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Update all package versions to current releases.
- Date: Sat, 29 Apr 2017 18:12:24 +0000 (UTC)
commit eef92a1d23e08b4fb07b35c5f1e8c462798aef62
Author: John Ralls <jralls ceridwen us>
Date: Fri Apr 21 08:30:04 2017 -0700
Update all package versions to current releases.
jhbuildrc-gtk-osx | 4 +-
modulesets-stable/bootstrap.modules | 58 +-
modulesets-stable/gtk-osx-bootstrap.modules | 52 +-
modulesets-stable/gtk-osx-gstreamer.modules | 139 +----
modulesets-stable/gtk-osx-gtkmm.modules | 28 +-
modulesets-stable/gtk-osx-javascript.modules | 14 +-
modulesets-stable/gtk-osx-network.modules | 69 +--
modulesets-stable/gtk-osx-python.modules | 14 +-
modulesets-stable/gtk-osx-random.modules | 178 ++-----
modulesets-stable/gtk-osx-themes.modules | 23 +-
modulesets-stable/gtk-osx-unsupported.modules | 38 +-
modulesets-stable/gtk-osx.modules | 78 +--
modulesets-unstable/gtk-osx-network.modules | 41 +-
modulesets-unstable/gtk-osx-random.modules | 24 +-
...0001-Bug-70255-Build-fails-with-glib-2.38.patch | 42 --
...1-Bug-781118-gtk-3.22.12-quartz-backend-s.patch | 43 ++
...-Don-t-error-out-on-missing-cairo-xlib.pc.patch | 30 -
.../gjs-Bug-737702-Use-R-instead-of-rpath.patch | 28 -
...js-Bug-740696-Use-m4-directory-for-macros.patch | 45 --
patches/gmp-4.3.2-stddef.patch | 17 -
patches/gmp-cc-for-build-needs-cflags.patch | 41 --
.../gstreamer-680428-Fix-flex-version-check.patch | 24 -
...r-706462-Make-grammar-y-work-with-Bison-3.patch | 20 -
.../gstreamer-fix-includes-in-gstdatetime.patch | 12 -
patches/libunistring-clang.patch | 18 -
patches/webkit-144560-platform-fixes.patch | 647 --------------------
patches/webkit-144561-quartz-backend.patch | 45 --
patches/webkit-144785-link-injected-bundle.patch | 10 -
...148606-build-texture-mapper-gl-separately.patch | 23 -
...nclude-stub-for-plugin-permission-request.patch | 14 -
30 files changed, 309 insertions(+), 1510 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 4a8f4e3..65e6d10 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -241,7 +241,6 @@ def setup_sdk(target=_osx_version, sdk_version=None, architectures=[_default_arc
print "WARNING: Universal builds are neither prohibited nor supported. It might work, but if it
doesn't you're on your own."
# For unknown reasons, iconv is not picked up correctly without this
#
- append_autogenargs('glib', ' --with-libiconv=gnu')
gcc = _popen("xcrun -f gcc")
gpp = _popen("xcrun -f g++")
ld = _popen("xcrun -f ld")
@@ -313,6 +312,9 @@ def setup_sdk(target=_osx_version, sdk_version=None, architectures=[_default_arc
# openssl doesn't understand DESTDIR, but luckily it has its own mechanism.
module_extra_env['openssl'] = {'INSTALL_PREFIX': os.path.join(prefix, '_jhbuild', 'root-openssl')}
+ # GMP deliberately attempts to use CC_FOR_BUILD with no separate
+ # cflags so we need to force it:
+ module_extra_env['gmp'] = {'CC_FOR_BUILD':os.environ['CC'] + ' ' + os.environ['CFLAGS']}
# Finally when building normally we need to force CFLAGS_FOR_BUILD
# to our current CFLAGS so that everything will link with other
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 38a067a..2af2403 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -22,8 +22,8 @@
href="http://launchpad.net/intltool/trunk/"/>
<autotools id='readline' autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
- version="6.3">
+ <branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
+ version="7.0">
</branch>
</autotools>
@@ -36,17 +36,17 @@
</autotools>
<autotools id="xz" autogen-sh="configure" bootstrap="true">
- <branch repo="tukaani.org" module="xz/xz-5.2.1.tar.bz2" version="5.2.1"/>
+ <branch repo="tukaani.org" module="xz/xz-5.2.3.tar.bz2" version="5.2.3"/>
</autotools>
<autotools id="apr">
- <branch repo="apache.org" module="apr/apr-1.4.5.tar.bz2" version="1.4.5"/>
+ <branch repo="apache.org" module="apr/apr-1.5.2.tar.bz2" version="1.5.2"/>
</autotools>
<autotools id="apr-util" autogenargs="--with-apr=$PREFIX/bin/apr-1-config">
- <branch repo="apache.org" module="apr/apr-util-1.3.12.tar.bz2"
- version="1.3.12"/>
- <dependencies>
+ <branch repo="apache.org" module="apr/apr-util-1.5.4.bz2"
+ version="1.5.4" />
+ <dependencies>
<dep package="apr"/>
</dependencies>
</autotools>
@@ -60,8 +60,8 @@
<!-- 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">
- <branch repo="cmake" module="v3.2/cmake-3.2.1.tar.gz" version="3.2.1">
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/cmake-libnetwork.patch"; strip="1"/>
+ <branch repo="cmake" module="v3.8/cmake-3.8.0.tar.gz" version="3.8.0">
+ <!--patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/cmake-libnetwork.patch";
strip="1"/-->
</branch>
</autotools>
@@ -75,8 +75,8 @@
<autotools id="autoconf-archive" autogen-sh="configure">
<branch repo="ftp.gnu.org"
- module="autoconf-archive/autoconf-archive-2016.09.16.tar.xz"
- version="2016-09.16"/>
+ module="autoconf-archive/autoconf-archive-2017.03.21.tar.xz"
+ version="2017-03-21"/>
</autotools>
<autotools id="libtool" autogen-sh="configure" bootstrap="true">
@@ -136,37 +136,33 @@
<autotools id="pkg-config" autogen-sh="configure"
autogenargs="--with-internal-glib">
<branch repo="pkgconfig"
- module="pkg-config-0.28.tar.gz" version="0.28"/>
+ module="pkg-config-0.29.2.tar.gz" version="0.29.2"/>
</autotools>
- <!-- 10.5-10.10 have 2.3, gstreamer requires 2.4. -->
+ <!-- MacOS provides 2.3 (presumably the last GPL2 version, gstreamer
+ requires 2.4. -->
<autotools id="bison" autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="bison/bison-3.0.2.tar.xz"
- version="3.0.2"/>
+ <branch repo="ftp.gnu.org" module="bison/bison-3.0.4.tar.xz"
+ version="3.0.4"/>
</autotools>
- <autotools id="bison2" autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="bison/bison-2.7.1.tar.xz"
- version="2.7.1"/>
- </autotools>
-
- <!-- 10.4 has 2.5.4, too old for gstreamer (and probably others as well)
- 10.6-10.10 have 2.5.35, 10.5 2.5.33 -->
+ <!-- MacOS hasn't updated flex since 2012. Since it's BSD-licensed
+ it must be just because Apple doesn't use it and doesn't
+ care. We'll provide something more up-to-date. -->
<autotools id="flex" autogen-sh="configure">
- <branch repo="sourceforge" module="flex/flex-2.5.37.tar.bz2"
- version="2.5.37"/>
+ <branch module="flex/flex-2.6.0.tar.xz" version="2.6.0"
+ repo="sourceforge" />
</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.1.0.tar.gz" version="2.1.0"
+ <branch module="expat/expat-2.2.0.tar.bz2" version="2.2.0"
repo="sourceforge"/>
</autotools>
<perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
<branch repo="cpan"
- module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
- version="2.41"/>
+ module="authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz"
+ version="2.44"/>
<dependencies>
<dep package="expat"/>
</dependencies>
@@ -184,8 +180,8 @@
<!-- Needed for building Gnome apps from the repository -->
<autotools id="gnome-common">
- <branch module="gnome-common/3.14/gnome-common-3.14.0.tar.xz" version="3.14.0"
- hash="sha256:4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c"/>
+ <branch module="gnome-common/3.18/gnome-common-3.18.0.tar.xz" version="3.18.0"
+ hash="sha256:22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"/>
</autotools>
<!-- This is generated by tarring up the needed docbook stylesheets
for gtk-doc to work. If someone wants to work on a setup that
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 32f8786..b3eed9d 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -4,10 +4,10 @@
<moduleset>
<repository type="tarball" name="ftp.gnome.org" default="yes"
- href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
+ 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="sourceforge"
- href="http://downloads.sourceforge.net/sourceforge/"/>
+ href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="tarball" name="jpeg"
href="http://www.ijg.org/files/"/>
<repository type="tarball" name="libtiff"
@@ -29,19 +29,19 @@
href="http://www.colm.net/files/ragel/"/>
<autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
- <branch version="1.6.17" module="libpng/libpng-1.6.17.tar.xz"
- repo="sourceforge" md5sum="430a9b76b78533235cd4b9b26ce75c7e"/>
+ <branch version="1.6.29" module="libpng/libpng-1.6.29.tar.xz"
+ repo="sourceforge"/>
</autotools>
<autotools id="libjpeg" autogen-sh="configure">
- <branch module="jpegsrc.v9a.tar.gz" version="9a"
+ <branch module="jpegsrc.v9b.tar.gz" version="9b"
repo="jpeg"
- checkoutdir="jpeg-9a">
+ checkoutdir="jpeg-9b">
</branch>
</autotools>
<autotools id="libtiff" autogen-sh="configure" autogenargs="--without-x">
- <branch version="4.0.3" module="libtiff/tiff-4.0.3.tar.gz"
+ <branch version="4.0.7" module="libtiff/tiff-4.0.7.tar.gz"
repo="libtiff"/>
<dependencies>
<dep package="libjpeg"/>
@@ -65,7 +65,7 @@
</autotools>
<autotools id="libxslt" autogen-sh="configure">
- <branch version="1.1.28" module="libxslt-1.1.28.tar.gz"
+ <branch version="1.1.29" module="libxslt-1.1.29.tar.gz"
repo="xmlsoft.org"/>
<dependencies>
<dep package="libxml2"/>
@@ -81,8 +81,8 @@
</autotools>
<autotools id="yelp-xsl">
- <branch version="3.16.1" module="yelp-xsl/3.16/yelp-xsl-3.16.1.tar.xz"
- hash="sha256:3295eecc4b03d2a239f7a1bdf4a1311d34c46c3055e6535c1f72bb5a49b4174a"/>
+ <branch version="3.20.1" module="yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz"
+ hash="sha256:dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"/>
<dependencies>
<dep package="libxml2"/>
<dep package="libxslt"/>
@@ -91,8 +91,8 @@
</autotools>
<autotools id="yelp-tools">
- <branch version="3.16.1" module="yelp-tools/3.16/yelp-tools-3.16.1.tar.xz"
- hash="sha256:b4f66c145af1c6448dc51037d305d6844da13dc31d07729b8e29005ee4fef89c"/>
+ <branch version="3.18.0" module="yelp-tools/3.18/yelp-tools-3.18.0.tar.xz"
+ hash="sha256:c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"/>
<dependencies>
<dep package="libxml2"/>
<dep package="libxslt"/>
@@ -103,8 +103,8 @@
<autotools id="gtk-doc" autogen-sh="configure"
autogenargs="--with-xml-catalog=$JHBUILD_PREFIX/share/xml/catalog">
- <branch version="1.21" module="gtk-doc/1.21/gtk-doc-1.21.tar.xz"
- hash="sha256:5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e"/>
+ <branch version="1.25" module="gtk-doc/1.25/gtk-doc-1.25.tar.xz"
+ hash="sha256:1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42"/>
<dependencies>
<dep package="libxml2"/>
<dep package="itstool"/>
@@ -114,20 +114,20 @@
<autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
- <branch repo="icu" version="55.1" checkoutdir="icu"
- module="icu4c/55.1/icu4c-55_1-src.tgz"/>
+ <branch repo="icu" version="58.2" checkoutdir="icu"
+ module="icu4c/58.2/icu4c-58_2-src.tgz"/>
</autotools>
<autotools id="ragel" autogen-sh='autoreconf'>
- <branch repo="ragel" module="ragel-6.9.tar.gz" version="6.9">
+ <branch repo="ragel" module="ragel-6.10.tar.gz" version="6.10">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/ragel-6.9-setiosflags.patch";
strip="1"/>
</branch>
</autotools>
<autotools id="harfbuzz" autogen-sh="configure"
autogenargs="--with-coretext --with-freetype --with-icu">
- <branch repo="harfbuzz" module="harfbuzz-0.9.40.tar.bz2" version="0.9.40">
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch";
strip="1"/>
+ <branch repo="harfbuzz" module="harfbuzz-1.4.5.tar.bz2" version="1..45">
+ <!--patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch";
strip="1"/-->
</branch>
<dependencies>
<dep package="freetype-no-harfbuzz"/>
@@ -140,9 +140,9 @@
<autotools id="freetype-no-harfbuzz" autogen-sh="configure"
skip-autogen="never"
autogenargs="--without-bzip2 --without-harfbuzz">
- <branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
+ <branch module="freetype/freetype-2.7.1.tar.gz" version="2.7.1"
repo="sourceforge">
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/freetype-2.5.3-ccexe_cflags.patch";
strip="1"/>
+ <!--patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/freetype-2.5.3-ccexe_cflags.patch";
strip="1"/-->
</branch>
<dependencies>
<dep package="zlib"/>
@@ -151,7 +151,7 @@
<autotools id="freetype" autogen-sh="configure" skip-autogen="never"
autogenargs="--without-bzip2">
- <branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
+ <branch module="freetype/freetype-2.7.1.tar.gz" version="2.7.1"
repo="sourceforge">
</branch>
<dependencies>
@@ -162,8 +162,8 @@
<autotools id="fontconfig" autogen-sh="autoreconf"
autogenargs="--disable-docs">
- <branch repo="fontconfig" version="2.11.1"
- module="fontconfig-2.11.1.tar.bz2"/>
+ <branch repo="fontconfig" version="2.12.1"
+ module="fontconfig-2.12.1.tar.bz2"/>
<dependencies>
<dep package="freetype"/>
</dependencies>
@@ -182,8 +182,8 @@
</autotools>
<autotools id='readline' autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
- version="6.3">
+ <branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
+ version="7.0">
</branch>
</autotools>
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 0416028..806675a 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -6,20 +6,12 @@
href="http://ftp.gnome.org/pub/GNOME/sources/"/>
<repository type="tarball" name="gstreamer"
href="http://gstreamer.freedesktop.org/src/"/>
- <repository type="tarball" name="liboil"
- href="http://liboil.freedesktop.org/download/"/>
<repository type="tarball" name="sourceforge"
href="http://iweb.dl.sf.net/project/"/>
- <autotools id="liboil" autogen-template="autoreconf -fis && %(srcdir)s/configure --prefix
%(prefix)s %(autogenargs)s"
- makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'>
- <branch repo="liboil" module="liboil-0.3.17.tar.gz" version="0.3.17">
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/liboil-use-ac-config-headers-macro.patch"; strip="1"/>
- </branch>
- </autotools>
-
<autotools id="liborc" autogen-sh="configure">
- <branch repo="gstreamer" module="orc/orc-0.4.22.tar.xz" version="0.4.22"/>
+ <branch repo="gstreamer" module="orc/orc-0.4.26.tar.xz" version="0.4.26"
+ hash="sha256:7d52fa80ef84988359c3434e1eea302d077a08987abdde6905678ebcad4fa649"/>
</autotools>
<autotools id="faad2" autogen-sh="autoreconf"
@@ -32,21 +24,8 @@
<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.36.tar.xz" version="0.10.36"
- hash="sha256:9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da">
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch";
strip="1"/>
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-706462-Make-grammar-y-work-with-Bison-3.patch";
strip="1"/>
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-680428-Fix-flex-version-check.patch";
strip="1"/>
- </branch>
- <after>
- <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.4/gstreamer-1.4.3.tar.xz" version="1.4.3"
- hash="sha256:11f155784d28b85a12b50d2fc8f91c6b75d9ca325cc76aaffba1a58d4c9549c9">
+ <branch module="gstreamer/1.11/gstreamer-1.11.2.tar.xz" version="1.11.2"
+ hash="sha256:baa27e761e9d2e1770a8e311b2a61397edd6a288b2ff188940ea001615883305">
</branch>
<after>
<dep package="glib"/>
@@ -55,22 +34,9 @@
<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.36.tar.xz"
- version="0.10.36"
- hash="sha256:1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a"/>
- <dependencies>
- <dep package="gstreamer"/>
- <dep package="liboil"/>
- </dependencies>
- <after>
- </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.4/gst-plugins-base-1.4.3.tar.xz"
- version="1.4.3"
- hash="sha256:f7b4d2b3ba2bcac485896e2c1c36459cb091ebe8b49e91635c27d40f66792d9d"/>
+ <branch module="gst-plugins-base/1.11/gst-plugins-base-1.11.2.tar.xz"
+ version="1.11.2"
+ hash="sha256:7f73876e795dccf8acf1a45148b7cdd32bc618de6cadb049a00ea38111ceebd9"/>
<dependencies>
<dep package="gstreamer"/>
<dep package="liborc"/>
@@ -81,86 +47,38 @@
<autotools id="gst-plugins-good" 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/0.10/gst-plugins-good-0.10.31.tar.xz"
- version="0.10.31"
- hash="sha256:77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64"/>
+ <branch module="gst-plugins-good/1.11/gst-plugins-good-1.11.2.tar.xz"
+ version="1.11.2"
+ hash="sha256:704dadaa6b024bb5cdbdae58d6dabcbc3134294b64555484927a137c5b66ae69"/>
<dependencies>
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
</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.4/gst-plugins-good-1.4.3.tar.xz"
- version="1.4.3"
- hash="sha256:5876a74402f2a24d1d3ae9163c32466bdc7a565696dddeef65e6a9a93efc5537"/>
- <dependencies>
- <dep package="gstreamer-1.0"/>
- <dep package="gst-plugins-base-1.0"/>
- </dependencies>
- </autotools>
-
<autotools id="gst-plugins-ugly" autogenargs="--disable-tests"
supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS="
autogen-sh="configure">
- <branch repo="gstreamer" version="0.10.19"
- module="gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.gz"
- hash="md5:6382de48e6361fd2fb14af15af94cc8a"/>
+ <branch repo="gstreamer" version="1.11.2"
+ module="gst-plugins-ugly/gst-plugins-ugly-1.11.2.tar.xz"
+ hash="sha256:240c4d933f331f003386795ad10674e58440e2a7f8b82cb742d67d2df333116d"/>
<dependencies>
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
</dependencies>
</autotools>
- <autotools id="gst-plugins-ugly-1.0" autogenargs="--disable-tests"
- supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS="
- autogen-sh="configure">
- <branch repo="gstreamer" version="1.4.3"
- module="gst-plugins-ugly/gst-plugins-ugly-1.4.3.tar.xz"
- hash="sha256:d581592a82cf3930361430d38436c30a58d8b6c249cad18f7f213b203e206d46"/>
- <dependencies>
- <dep package="gstreamer-1.0"/>
- <dep package="gst-plugins-base-1.0"/>
- </dependencies>
- </autotools>
-
<autotools id="gst-plugins-bad" supports-non-srcdir-builds="no"
autogenargs="--disable-tests --disable-x --disable-xvid"
makeargs="ERROR_CFLAGS=" autogen-sh="configure">
- <branch repo="gstreamer" version="0.10.23"
- module="gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz"
- hash="md5:e4822fa2cc933768e2998311a1565979"/>
+ <branch repo="gstreamer" version="1.11.2"
+ module="gst-plugins-bad/gst-plugins-bad-1.11.2.tar.xz"
+ hash="sha256:c23fc89a5fdd8e1c77a3b12e8667df33990526c88b328ee7957dbbf9b29cc16a"/>
<dependencies>
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="faad2"/>
- </dependencies>
- </autotools>
-
- <autotools id="gst-plugins-bad-1.0" supports-non-srcdir-builds="no"
- autogenargs="--disable-tests --disable-x --disable-xvid"
- makeargs="ERROR_CFLAGS=" autogen-sh="configure">
- <branch repo="gstreamer" version="1.4.3"
- module="gst-plugins-bad/gst-plugins-bad-1.4.3.tar.xz"
- hash="sha256:a6840080c469d0db51d6d4d0f7c42c97b3c8c01942f24401c61b1ad36726b97c"/>
- <dependencies>
- <dep package="gstreamer-1.0"/>
- <dep package="gst-plugins-base-1.0"/>
- <dep package="faad2"/>
- </dependencies>
- </autotools>
-
- <!-- gst-libav was named gst-ffmpeg before 1.0 -->
- <!-- 0.10.13 has mismatched libtool versions in its dist tarball -->
- <autotools id="gst-ffmpeg" autogenargs="--disable-tests --disable-mmx"
- supports-non-srcdir-builds="no" autogen-sh="configure">
- <branch repo="gstreamer" version="0.10.12"
- module="gst-ffmpeg/gst-ffmpeg-0.10.12.tar.gz"
- hash="md5:a2516b4819b47437fb81a35762887a06"/>
- <dependencies>
- <dep package="gstreamer"/>
- <dep package="gst-plugins-base"/>
+ <dep package='openssl'/>
</dependencies>
</autotools>
@@ -169,12 +87,12 @@
<autotools id="gst-libav" supports-non-srcdir-builds="no"
autogen-sh="configure"
autogenargs="--disable-tests --disable-mmx --with-libav-extra-configure='--disable-yasm'">
- <branch repo="gstreamer" version="1.4.3"
- module="gst-libav/gst-libav-1.4.3.tar.xz"
- hash="sha256:833229d2b1aad6549ad0297435516508cc3ac47b166d6393ecdffc34c31a01d3"/>
+ <branch repo="gstreamer" version="1.11.2"
+ module="gst-libav/gst-libav-1.11.2.tar.xz"
+ hash="sha256:b4798dc916a9ce7cdbbab1b9ecfb5170113b8fc1ba6db440c37d603621ae7fda"/>
<dependencies>
- <dep package="gstreamer-1.0"/>
- <dep package="gst-plugins-base-1.0"/>
+ <dep package="gstreamer"/>
+ <dep package="gst-plugins-base"/>
</dependencies>
</autotools>
@@ -183,19 +101,8 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="gst-plugins-good"/>
- <!--dep package="gst-plugins-ugly"/-->
+ <dep package="gst-plugins-ugly"/>
<dep package="gst-plugins-bad"/>
- <dep package="gst-ffmpeg"/>
- </dependencies>
- </metamodule>
-
- <metamodule id="meta-gstreamer-1.0">
- <dependencies>
- <dep package="gstreamer-1.0"/>
- <dep package="gst-plugins-base-1.0"/>
- <dep package="gst-plugins-good-1.0"/>
- <!--dep package="gst-plugins-ugly-1.0"/-->
- <dep package="gst-plugins-bad-1.0"/>
<dep package="gst-libav"/>
</dependencies>
</metamodule>
diff --git a/modulesets-stable/gtk-osx-gtkmm.modules b/modulesets-stable/gtk-osx-gtkmm.modules
index be3b194..ed1be63 100644
--- a/modulesets-stable/gtk-osx-gtkmm.modules
+++ b/modulesets-stable/gtk-osx-gtkmm.modules
@@ -22,8 +22,8 @@
</metamodule>
<autotools id="cairomm" autogen-sh="configure">
- <branch module="cairomm-1.11.2.tar.gz" version="1.11.2"
- hash="sha1:35e190a03f760924bece5dc1204cc36b3583c806"
+ <branch module="cairomm-1.15.3.tar.gz" version="1.15.3"
+ hash="sha1:e87ccdae0800615beab29a0328e88f4597ecb805"
repo="cairographics" />
<dependencies>
<dep package="cairo"/>
@@ -31,8 +31,8 @@
</autotools>
<autotools id="glibmm" autogen-sh="configure">
- <branch module="glibmm/2.42/glibmm-2.42.0.tar.xz" version="2.42.0"
- hash="sha256:985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397"/>
+ <branch module="glibmm/2.53/glibmm-2.53.1.tar.xz" version="2.53.1"
+ hash="sha256:ccd3f4ae8522cf7e0220f60141c91b547c9cf698d48ee8f86c92128dfc556863"/>
<dependencies>
<dep package="glib"/>
<dep package="libsigc++2"/>
@@ -40,8 +40,8 @@
</autotools>
<autotools id="pangomm" autogen-sh="configure">
- <branch module="pangomm/2.34/pangomm-2.34.0.tar.xz" version="2.34.0"
- hash="sha256:0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41"/>
+ <branch module="pangomm/2.41/pangomm-2.41.2.tar.xz" version="2.41.2"
+ hash="sha256:3bd99f5793e08f2d728af4306757559c66bcfce07eabe7a7a03cbe335e4b61fb"/>
<dependencies>
<dep package="glibmm"/>
<dep package="cairomm"/>
@@ -50,8 +50,8 @@
</autotools>
<autotools id="atkmm" autogen-sh="configure">
- <branch module="atkmm/2.22/atkmm-2.22.7.tar.xz" version="2.22.7"
- hash="sha256:bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f91b"/>
+ <branch module="atkmm/2.25/atkmm-2.25.2.tar.xz" version="2.25.2"
+ hash="sha256:b20d1e8368097c34115b687b703f908ea1a1120b21ef92d54954de92f5277a67"/>
<dependencies>
<dep package="glibmm"/>
<dep package="cairomm"/>
@@ -67,13 +67,13 @@
documentation in your jhbuildrc-custom. -->
<autotools id="libsigc++2" autogen-sh="configure"
autogen-args="--disable-documentation">
- <branch module="libsigc++/2.4/libsigc++-2.4.0.tar.xz" version="2.2.0"
- hash="sha256:7593d5fa9187bbad7c6868dce375ce3079a805f3f1e74236143bceb15a37cd30"/>
+ <branch module="libsigc++/2.10/libsigc++-2.10.0.tar.xz" version="2.10.0"
+ hash="sha256:f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"/>
</autotools>
<autotools id="gtkmm3" autogen-sh="configure">
- <branch module="gtkmm/3.14/gtkmm-3.14.0.tar.xz" version="3.14.0"
- hash="sha256:d9f528a62c6ec226fa08287c45c7465b2dce5aae5068e9ac48d30a64a378e48b">
+ <branch module="gtkmm/3.22/gtkmm-3.22.0.tar.xz" version="3.22.0"
+ hash="sha256:05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5">
</branch>
<dependencies>
<dep package="glibmm"/>
@@ -85,8 +85,8 @@
</autotools>
<autotools id="gtkmm" autogen-sh="configure">
- <branch module="gtkmm/2.24/gtkmm-2.24.4.tar.xz" version="2.24.4"
- hash="sha256:443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee"/>
+ <branch module="gtkmm/2.24/gtkmm-2.24.5.tar.xz" version="2.24.5"
+ hash="sha256:0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"/>
<dependencies>
<dep package="glibmm"/>
<dep package="cairomm"/>
diff --git a/modulesets-stable/gtk-osx-javascript.modules b/modulesets-stable/gtk-osx-javascript.modules
index a969a8e..8bd5720 100644
--- a/modulesets-stable/gtk-osx-javascript.modules
+++ b/modulesets-stable/gtk-osx-javascript.modules
@@ -18,14 +18,8 @@
</metamodule>
<autotools id="gjs" autogenargs="--enable-installed-tests">
- <branch version="1.42.0" module="gjs/1.42/gjs-1.42.0.tar.xz"
- hash="sha256:0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13">
- <patch strip="1"
-
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Bug-737701-Don-t-error-out-on-missing-cairo-xlib.pc.patch"/>
- <patch strip="1"
-
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Bug-737702-Use-R-instead-of-rpath.patch"/>
- <patch strip="1"
-
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Bug-740696-Use-m4-directory-for-macros.patch"/>
+ <branch version="1.48.1" module="gjs/1.48/gjs-1.48.1.tar.xz"
+ hash="sha256:21198950472c3c8f4a4679b0292c663faed04b07ee5de026bfd19eaa4ed15a84">
</branch>
<dependencies>
<dep package="gobject-introspection"/>
@@ -50,8 +44,8 @@
<autotools id="nspr" autogen-sh="mozilla/nsprpub/configure"
autogenargs="--enable-64bit" check-target="false">
- <branch repo="mozilla" version="4.9.2"
- module="nspr/releases/v4.9.2/src/nspr-4.9.2.tar.gz">
+ <branch repo="mozilla" version="4.14"
+ module="nspr/releases/v4.14/src/nspr-4.14.tar.gz">
<patch file="nspr.autogen.patch" strip="1"/>
<patch file="nspr.config_64bits.patch" strip="1"/>
<patch file="nspr.hostcompiler.patch" strip="1"/>
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index dd34cdc..6d39596 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -23,15 +23,6 @@
</dependencies>
</metamodule>
- <!-- Same as meta-gtk-osx-webkit above, but builds the last version that
- worked on SDK <= 10.5 -->
- <metamodule id="meta-gtk-osx-webkit1.6">
- <dependencies>
- <dep package="meta-gtk-osx-core"/>
- <dep package="WebKit1.6"/>
- </dependencies>
- </metamodule>
-
<!-- Builds latest stable version of WebKitGTK for GTK 3.x -->
<metamodule id="meta-gtk-osx-webkit-gtk3">
<dependencies>
@@ -45,8 +36,8 @@
<autotools id="openssl" autogen-sh="Configure" autogenargs="shared "
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl
%(autogenargs)s"
makeinstallargs="install_sw" supports-non-srcdir-builds="no">
- <branch module="openssl-1.0.2f.tar.gz" version="1.0.2f" repo="openssl"
- hash="sha256:932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c"/>
+ <branch module="openssl-1.1.0e.tar.gz" version="1.1.0e" repo="openssl"
+ hash="sha256:57be8618979d80c910728cfc99369bf97b2a1abd8f366ab6ebdee8975ad3874c"/>
</autotools>
<!-- Rudely demands TeX to build documentation -->
@@ -54,8 +45,8 @@
<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">
+ <branch repo="ftp.gnu.org" version="3.3"
+ module="nettle/nettle-3.3.tar.gz">
<patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/libnettle-cc-for-build-needs-cflags.patch";
strip="1"/>
</branch>
<dependencies>
@@ -66,33 +57,39 @@
<autotools id="libtasn1" supports-non-srcdir-builds="no"
autogen-sh="configure">
- <branch repo="ftp.gnu.org" version="4.4"
- module="libtasn1/libtasn1-4.4.tar.gz"/>
+ <branch repo="ftp.gnu.org" version="4.10"
+ module="libtasn1/libtasn1-4.10.tar.gz"/>
</autotools>
<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"/>
+ <branch repo="sourceforge" version="1.2.11"
+ module="libpng/zlib-1.2.11.tar.xz"/>
</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 --without-p11-kit">
- <branch repo="gnutls" version="3.3.12"
- module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
+ <branch repo="gnutls" version="3.5.9"
+ module="gcrypt/gnutls/v3.5/gnutls-3.5.9.tar.xz"/>
<dependencies>
+ <dep package="libunistring"/>
<dep package="libnettle"/>
<dep package="libtasn1"/>
<dep package="zlib"/>
</dependencies>
</autotools>
+ <autotools id="libgcrypt" autogen-sh="configure">
+ <branch repo="gnutls" version="1.7.6"
+ module="gcrypt/libgcrypt/libgcrypt-1.7.6.tar.gz"/>
+ </autotools>
+
<autotools id="glib-networking" autogen-sh="configure"
autogenargs="--without-ca-certificates set_more_warnings=no">
- <branch module="glib-networking/2.44/glib-networking-2.44.0.tar.xz"
- hash="sha256:8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"
- version="2.44.0"/>
+ <branch module="glib-networking/2.50/glib-networking-2.50.0.tar.xz"
+ hash="sha256:3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"
+ version="2.50.0"/>
<dependencies>
<dep package="gnutls"/>
</dependencies>
@@ -100,17 +97,18 @@
<autotools id="libsoup" autogen-sh="configure"
autogenargs="set_more_warnings=no">
- <branch module="libsoup/2.48/libsoup-2.48.1.tar.xz" version="2.48.1"
- hash="sha256:9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a"/>
+ <branch module="libsoup/2.57/libsoup-2.57.1.tar.xz" version="2.57.1"
+ hash="sha256:ca1ca037e89e8bc7b782559f3ec5d89c9d0b836f505b2f95e008ed517fd6658f"/>
<dependencies>
<dep package="glib"/>
<dep package="glib-networking"/>
<dep package="sqlite"/>
+ <dep package="vala"/>
</dependencies>
</autotools>
<autotools id="libwebp" autogen-sh="configure">
- <branch repo="webm" module="webp/libwebp-0.4.3.tar.gz" version="0.4.3"/>
+ <branch repo="webm" module="webp/libwebp-0.6.0.tar.gz" version="0.6.0"/>
</autotools>
<!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
@@ -142,7 +140,7 @@
</dependencies>
<after>
<dep package="meta-gtk-osx-gtk"/>
- <dep package="meta-gstreamer-1.0"/>
+ <dep package="meta-gstreamer"/>
</after>
</autotools>
@@ -166,7 +164,7 @@
</dependencies>
<after>
<dep package="meta-gtk-osx-gtk3"/>
- <dep package="meta-gstreamer-1.0"/>
+ <dep package="meta-gstreamer"/>
</after>
</autotools>
@@ -186,29 +184,20 @@
USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
-->
<cmake id="webkit2gtk3"
- cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS="$CXX_FLAGS -stdlib=libc++"'>
- <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch";
- strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144560-platform-fixes.patch";
- strip="1"/>
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144785-link-injected-bundle.patch";
- strip="1"/>
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148606-build-texture-mapper-gl-separately.patch";
- strip="1"/>
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148607-include-stub-for-plugin-permission-request.patch";
- strip="1"/>
+ cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_INTROSPECTION=OFF
-DENABLE_OPENGL=OFF -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF
-DENABLE_TOUCH_EVENTS=OFF -DCMAKE_CXX_FLAGS="$CXX_FLAGS -stdlib=libc++"'>
+ <branch repo="webkit.org" module="webkitgtk-2.16.1.tar.xz" version="2.16.1">
</branch>
<dependencies>
<dep package="libwebp"/>
<dep package="enchant"/>
<dep package="icu"/>
<dep package="libsoup"/>
+ <dep package="libgcrypt"/>
<dep package="meta-gtk-osx-freetype"/>
</dependencies>
<after>
<dep package="meta-gtk-osx-gtk3"/>
- <dep package="meta-gstreamer-1.0"/>
+ <dep package="meta-gstreamer"/>
</after>
</cmake>
</moduleset>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 41e18e8..81e4729 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -71,7 +71,7 @@
<autotools id="python" autogenargs="--enable-shared"
autogen-sh="configure" supports-non-srcdir-builds="no">
<branch repo="python"
- module="2.7.12/Python-2.7.12.tar.xz" version="2.7.12">
+ module="2.7.13/Python-2.7.13.tar.xz" version="2.7.13">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/python2-linkflags.patch"; strip="1"/>"/>
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/python-issue27806_v3.patch"; strip="1"/>
</branch>
@@ -86,7 +86,7 @@
</autotools>
<autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
- <branch repo="python" module="3.4.3/Python-3.4.3.tar.xz" version="3.4.3">
+ <branch repo="python" module="3.6.1/Python-3.6.1.tar.xz" version="3.6.1">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/Python3.4-stack_size-flag.patch";
strip="1"/>
</branch>
<dependencies>
@@ -96,9 +96,9 @@
</autotools>
<distutils id="pybsddb">
- <branch module="b/bsddb3/bsddb3-5.3.0.tar.gz"
- hash="md5:d5aa4f293c4ea755e84383537f74be82" repo="pymodules"
- version="5.3.0"/>
+ <branch module="b/bsddb3/bsddb3-6.2.4.tar.gz"
+ hash="md5:eec77d104c5981366701c6b0de585504" repo="pymodules"
+ version="6.2.4"/>
<dependencies>
<dep package="python3"/>
</dependencies>
@@ -157,8 +157,8 @@
</autotools>
<autotools id="pygobject3" autogen-sh="configure" >
- <branch version="3.16.1" module="pygobject/3.16/pygobject-3.16.1.tar.xz"
- hash="sha256:7d96dad050f15ec1688617b749bb485811842de46a22d31f9396023e8eaa1ec3"/>
+ <branch version="3.24.1" module="pygobject/3.24/pygobject-3.23.1.tar.xz"
+ hash="sha256:a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd"/>
<dependencies>
<dep package="meta-gtk-osx-gtk3"/>
</dependencies>
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 3df7ad0..cfb661a 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -42,17 +42,6 @@
<dep package="glade3"/>
</dependencies>
</metamodule>
- <!-- Loudmouth is an abandoned Imendio project, now developed on
- Github. This is the last release from gnome, and is the last
- known to work on Leopard. -->
- <autotools id="loudmouth" autogenargs="--with-ssl=openssl">
- <branch version="1.4.3" module="loudmouth/1.4/loudmouth-1.4.3.tar.bz2"
- md5sum="55339ca42494690c3942ee1465a96937"/>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="glib"/>
- </after>
- </autotools>
<!-- Libglade's functions are now part of Gtk+ with different names and
Libglade itself is deprecated. This is the last release. -->
@@ -66,25 +55,11 @@ Libglade itself is deprecated. This is the last release. -->
<dep package="meta-gtk-osx-core"/>
</after>
</autotools>
-<!-- Gossip has received no updates other than translations since December 2009 -->
- <autotools id="gossip" autogen-sh="configure">
- <branch module="gossip/0.31/gossip-0.31.tar.bz2" version="0.31"
- md5sum="feacf7a78ced249268898d2a3f7063cd"/>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-themes"/>
- <dep package="meta-gtk-osx-core"/>
- </after>
- <dependencies>
- <dep package="loudmouth"/>
- <dep package="libglade"/>
- </dependencies>
- </autotools>
<autotools id="vala" autogen-sh="configure">
- <branch repo="ftp.gnome.org" version="0.28.0"
- module="vala/0.28/vala-0.28.0.tar.xz"
- hash="sha256:0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f"/>
+ <branch repo="ftp.gnome.org" version="0.36.1"
+ module="vala/0.36/vala-0.36.1.tar.xz"
+ hash="sha256:13f4a3f99d983bf76e8d9dd736021ecc95f53ec1f9582423aa4b4be87455aa07"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
@@ -121,8 +96,8 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<autotools id="devhelp-gtk3" autogen-sh="configure">
- <branch module="devhelp/3.16/devhelp-3.16.1.tar.xz" version="3.16.1"
- hash="sha256:673c34e6851c2848e6257da8de5edc222d41e1dbf110501bd29d7f6810f41345"/>
+ <branch module="devhelp/3.24/devhelp-3.24.0.tar.xz" version="3.24.0"
+ hash="sha256:4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-themes"/>
@@ -136,16 +111,11 @@ Libglade itself is deprecated. This is the last release. -->
</dependencies>
</autotools>
- <autotools id="itstool" autogen-sh='configure'>
- <branch module="itstool/itstool-2.0.2.tar.bz2" version="2.0.2"
- repo="itstool"/>
- </autotools>
-
<!-- Glade 3.8 is the last stable series for Gtk+-2 -->
<autotools id="glade3" autogen-sh="configure"
autogenargs="--disable-scrollkeeper">
- <branch module="glade3/3.8/glade3-3.8.2.tar.xz" version="3.8.2"
- hash="sha256:f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d388b19">
+ <branch module="glade3/3.8/glade3-3.8.5.tar.xz" version="3.8.5"
+ hash="sha256:58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735">
<patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch";
strip="1"/>
</branch>
<after>
@@ -159,8 +129,8 @@ Libglade itself is deprecated. This is the last release. -->
change back to just "glade"-->
<autotools id="glade" autogen-sh="configure"
autogenargs='--disable-scrollkeeper --disable-introspection CPPFLAGS="$CPPFLAGS -xobjective-c"'>
- <branch module="glade/3.18/glade-3.18.3.tar.xz" version="3.18.3"
- hash="sha256:ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452">
+ <branch module="glade/3.20/glade-3.20.0.tar.xz" version="3.20.0"
+ hash="sha256:82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/glade-1-18.patch"; strip="1"/>
</branch>
<dependencies>
@@ -188,91 +158,23 @@ 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.14/gtksourceview-3.14.3.tar.xz"
- version="3.14.3" hash="sha256:7bbe8b603ed7346669911fa074fe69388a4c89c1b15317befc3aa212b3d01a7b">
+ <branch module="gtksourceview/3.24/gtksourceview-3.24.1.tar.xz"
+ version="3.24.1" hash="sha256:7bbe8b603ed7346669911fa074fe69388a4c89c1b15317befc3aa212b3d01a7b">
</branch>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-gtk3"/>
</after>
</autotools>
-
- <autotools id="libIDL" autogen-sh="configure">
- <branch module="libIDL/0.8/libIDL-0.8.14.tar.bz2" version="0.8.14"
- hash="sha256:c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220"/>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-core"/>
- <dep package="meta-gtk-osx-gtk3"/>
- </after>
- </autotools>
-
- <autotools id="ORBit2" autogen-sh="autoreconf">
- <branch module="ORBit2/2.14/ORBit2-2.14.19.tar.bz2" version="2.14.19"
- hash="sha256:55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550">
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Patch-Orbit-2.14.19-to-master-for-current-GLib.patch";
strip="1"/>
- </branch>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- </after>
- <dependencies>
- <dep package="libIDL"/>
- </dependencies>
- </autotools>
-
- <autotools id="dbus" autogen-sh='configure'
- autogenargs="--disable-selinux --without-x --disable-launchd
- --with-session-socket-dir=/var/tmp">
- <branch module="dbus/dbus-1.6.8.tar.gz" version="1.6.8"
- repo="dbus.freedesktop.org">
- </branch>
- </autotools>
-<!-- NB: dbus support is now built into glib -->
- <autotools id="dbus-glib" autogenargs="--disable-selinux">
- <branch module="dbus-glib/dbus-glib-0.100.tar.gz" version="0.100"
- repo="dbus.freedesktop.org"/>
- <dependencies>
- <dep package="dbus"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-core"/>
- </after>
- </autotools>
-
- <!-- Note: -disable-defaults-service removes dependency on "PolicyKit"
- which is available only through svn or from Linux distros -->
- <autotools id="gconf" autogen-sh="configure"
- autogenargs="--disable-defaults-service">
- <branch module="GConf/3.2/GConf-3.2.6.tar.xz" version="3.2.6"
- hash="sha256:1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c"/>
- <dependencies>
- <dep package="ORBit2"/>
- <dep package="dbus-glib"/>
- </dependencies>
- </autotools>
-<!-- Still having issues with GConf and gdbus on OSX, this is the last
- release of GConf that uses glib-dbus. -->
- <autotools id="gconf2" autogen-sh="configure"
- autogenargs="--disable-defaults-service">
- <branch module="GConf/2.28/GConf-2.28.1.tar.bz2" version="2.28.1"
- hash="sha256:53c477f9086057b0c84816a1c979e01537b862fbcacb6af4b62f8cffec4b3000"/>
- <dependencies>
- <dep package="ORBit2"/>
- <dep package="dbus-glib"/>
- </dependencies>
- </autotools>
-
<autotools id="lcms" autogen-sh="configure">
- <branch module="lcms/lcms2-2.4.tar.gz" version="2.4" repo="sourceforge"
+ <branch module="lcms/lcms2-2.8.tar.gz" version="2.8" repo="sourceforge"
/>
</autotools>
<autotools id="shared-mime-info" autogen-sh="configure"
supports-non-srcdir-builds="no" >
- <branch module="shared-mime-info-1.3.tar.xz" version="1.3"
+ <branch module="shared-mime-info-1.7.tar.xz" version="1.7"
repo="hadess">
- <!--patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-70255-Build-fails-with-glib-2.38.patch";
strip="1"/-->
</branch>
<dependencies>
<dep package="glib"/>
@@ -281,9 +183,9 @@ Libglade itself is deprecated. This is the last release. -->
<autotools id="gsettings-desktop-schemas" autogen-sh="configure"
autogenargs="--enable-introspection=yes">
- <branch module="gsettings-desktop-schemas/3.16/gsettings-desktop-schemas-3.16.1.tar.xz"
- version="3.16.1"
- hash="sha256:74fe9fdad510c8a6666febeceb7ebafc581ef990b3afcc8c1e8b5d90b24b3461"/>
+ <branch module="gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz"
+ version="3.24.0"
+ hash="sha256:f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90"/>
<dependencies>
<dep package="gobject-introspection"/>
</dependencies>
@@ -293,8 +195,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.14.tar.bz2" version="2.8.14"
- md5sum="233c948203383fa078434cc3f8f925cb" repo="gimp">
+ <branch module="gimp/v2.8/gimp-2.8.20.tar.bz2" version="2.8.20"
+ md5sum="d405640c426b234d6efc36fb4f5bae57" repo="gimp">
<patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch"; strip="1"
/>
</branch>
<after>
@@ -309,20 +211,20 @@ Libglade itself is deprecated. This is the last release. -->
</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"/>
+ <branch module="json-glib/1.2/json-glib-1.2.8.tar.xz" version="1.2.8"
+ hash="sha256:fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a"/>
</autotools>
<autotools id="babl" >
- <branch repo="ftp.gtk.org" version="0.1.10"
- module="babl/0.1/babl-0.1.10.tar.bz2">
+ <branch repo="ftp.gtk.org" version="0.1.24"
+ module="babl/0.1/babl-0.1.24.tar.bz2">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/Bug-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.2.0"
- module="gegl/0.2/gegl-0.2.0.tar.bz2"/>
+ <branch repo="ftp.gtk.org" version="0.3.14"
+ module="gegl/0.3/gegl-0.3.14.tar.bz2"/>
<dependencies>
<dep package="babl"/>
<dep package="json-glib"/>
@@ -331,7 +233,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.20.5.tar.gz" version="0.20.5"
+ <branch module="poppler-0.53.0.tar.gz" version="0.53.0"
repo="poppler.freedesktop.org"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
@@ -342,7 +244,7 @@ Libglade itself is deprecated. This is the last release. -->
<!-- SQLite3 is provided by MacOSX in /usr/lib/libsqlite.3.dylib -->
<autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe"
autogen-sh="configure">
- <branch module="sqlite-autoconf-3071401.tar.gz" version='3.7.14'
+ <branch module="2017/sqlite-autoconf-3180000.tar.gz" version='3.18.0'
repo="sqlite"/>
</autotools>
@@ -377,7 +279,7 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<autotools id="hunspell" autogen-sh="configure">
- <branch module="hunspell/hunspell-1.3.2.tar.gz" version="1.3.2"
+ <branch module="hunspell/hunspell-1.3.3.tar.gz" version="1.3.3"
repo="sourceforge"/>
</autotools>
@@ -404,8 +306,8 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<autotools id="gtkspell3" autogen-sh="configure">
- <branch module="gtkspell/gtkspell3-3.0.7.tar.gz" repo="sourceforge"
- version="3.0.7">
+ <branch module="gtkspell/gtkspell3-3.0.9.tar.gz" repo="sourceforge"
+ version="3.0.9">
<patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Enable-use-of-XDG_DATA_DIRS-for-locating-iso-code-fi.patch";
strip="1"/>
</branch>
<dependencies>
@@ -415,35 +317,31 @@ Libglade itself is deprecated. This is the last release. -->
</autotools>
<autotools id="libgsf" autogenargs="--without-python">
- <branch module="libgsf/1.14/libgsf-1.14.28.tar.xz" version="1.14.28"
- hash="sha256:ea94914f1fdaa5d4eb49149f0228ae6e41a54bdeb8caf52a7dd8acaa329fcbe4">
+ <branch module="libgsf/1.14/libgsf-1.14.41.tar.xz" version="1.14.41"
+ hash="sha256:150b98586a1021d5c49b3d4d065d0aa3e3674ae31db131af5372499d2d3f08d3">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gsf-memmove.patch"; strip="1"/>
</branch>
</autotools>
<autotools id="gmp">
- <!--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">
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gmp-cc-for-build-needs-cflags.patch";
strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gmp-4.3.2-stddef.patch"; strip="1"/>
+ <branch repo="ftp.gnu.org" module="gmp/gmp-6.1.2.tar.bz2" version="6.1.2">
</branch>
</autotools>
<autotools id="libunistring" autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.3.tar.gz"
- version="0.9.3">
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/libunistring-clang.patch"; strip="1"/>
+ <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.7.tar.gz"
+ version="0.9.7">
</branch>
</autotools>
<autotools id="libatomic-ops">
<branch repo="github.com" module="ivmai/libatomic_ops"
- revision="libatomic_ops-7_2f"/>
+ revision="libatomic_ops-7_4_4"/>
</autotools>
<autotools id="bdw-gc" autogen-template="pushd %(srcdir)s && ./autogen.sh && automake-1.10
-ac && popd && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
- <branch repo="github.com" module="ivmai/bdwgc" revision="gc7_2f" />
+ <branch repo="github.com" module="ivmai/bdwgc" revision="gc7_6_0" />
<dependencies>
<dep package="libatomic-ops"/>
</dependencies>
@@ -459,8 +357,8 @@ 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.12.tar.gz"
- version="2.0.12">
+ <branch repo="ftp.gnu.org" module="guile/guile-2.0.14.tar.gz"
+ version="2.0.14">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/guild-shell.patch"; strip="1"/>
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/guile-clocktime.patch"; strip="1"/>
</branch>
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index 8884ac0..7a4d727 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -53,8 +53,8 @@
</autotools>
<autotools id="adwaita-icon-theme" autogen-sh="configure">
- <branch module="adwaita-icon-theme/3.16/adwaita-icon-theme-3.16.0.tar.xz"
- version="3.16.0" hash="sha256:a3c8ad3b099ca571b423811a20ee9a7a43498cfa04d299719ee43cd7af6f6eb1"/>
+ <branch module="adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz"
+ version="3.24.0" hash="sha256:ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a"/>
<dependencies>
<dep package="librsvg"/>
<dep package="hicolor-icon-theme"/>
@@ -64,8 +64,8 @@
<autotools id="gnome-themes-standard" autogen-sh="configure"
autogenargs='--disable-gtk2-engine'>
- <branch module="gnome-themes-standard/3.16/gnome-themes-standard-3.16.0.tar.xz"
- version="3.16.0" hash="sha256:4ce9cbac71c74d1426b73ad8ca37a29b3267c66f94d2fb4de5e619fab25bd94f"/>
+ <branch module="gnome-themes-standard/3.22/gnome-themes-standard-3.22.3.tar.xz"
+ version="3.22.3" hash="sha256:61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"/>
<dependencies>
<dep package="librsvg"/>
<dep package="adwaita-icon-theme"/>
@@ -86,8 +86,8 @@
</autotools>
<autotools id="librsvg" autogenargs="--disable-Bsymbolic">
- <branch module="librsvg/2.40/librsvg-2.40.5.tar.xz" version="2.40.5"
- hash="sha256:d14d7b3e25023ce34302022fd7c9b3a468629c94dff6c177874629686bfc71a7"/>
+ <branch module="librsvg/2.41/librsvg-2.41.0.tar.xz" version="2.41.0"
+ hash="sha256:a13573cb4efe3678eaf8709ae3533d79b17d33d29ca78a1e03e81b6235577140"/>
<dependencies>
<dep package="libcroco"/>
<dep package="meta-gtk-osx-freetype"/>
@@ -96,8 +96,8 @@
<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"/>
+ <branch module="libcroco/0.6/libcroco-0.6.12.tar.xz" version="0.6.12"
+ hash="sha256:ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860"/>
</autotools>
<autotools id="libccss" autogenargs="--disable-examples">
@@ -118,11 +118,4 @@
</after>
</autotools>
- <autotools id="gtk-quartz-engine" autogen-sh="autogen.sh">
- <branch module="gtk-osx/gtk-quartz-engine-0.2.tar.gz"
- repo="sourceforge" version="0.2" />
- <after>
- <dep package="meta-gtk-osx-core"/>
- </after>
- </autotools>
</moduleset>
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index aa440c8..4f5882a 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -4,11 +4,11 @@
<moduleset>
<repository type="tarball" name="ftp.gnome.org" default="yes"
href="http://ftp.gnome.org/pub/GNOME/sources/"/>
- <repository type='tarball' name='ftp.gnupg.org' href="ftp://ftp.gnupg.org/"; />
+ <repository type='tarball' name='gnupg.org' href="https://gnupg.org/ftp/"; />
<repository type="tarball" name="iso-codes"
href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
- <repository type='tarball' name='libproxy.google.com'
- href='http://libproxy.googlecode.com/files/'/>
+ <repository type='tarball' name='github-tarball'
+ href='https://github.com/'/>
<repository type="tarball" name="curl.haxx.se"
href="http://curl.haxx.se/download/"/>
<repository type="tarball" name="p11-glue"
@@ -30,14 +30,14 @@
</autotools>
<autotools id="iso-codes" autogen-sh="configure">
- <branch module="iso-codes-3.57.tar.xz" version="3.57"
+ <branch module="iso-codes-3.74.tar.xz" version="3.74"
repo="iso-codes"/>
</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.23.2"
+ module="p11-kit-0.23.2.tar.gz">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/p11-kit-dirfd.patch";
strip="1"/>
</branch>
@@ -47,8 +47,8 @@
</autotools>
<cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
- <branch version='0.4.10' module='libproxy-0.4.10.tar.gz'
- repo='libproxy.google.com'>
+ <branch version='0.4.14' module='libproxy/libproxy/releases/download/0.4.14/libproxy-0.4.14.tar.xz'
+ repo='github-tarball'>
</branch>
<dependencies>
</dependencies>
@@ -56,8 +56,8 @@
<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 module="libgnome-keyring/3.12/libgnome-keyring-3.12.0.tar.xz"
+ version="3.12.0" hash="sha256:c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783">
</branch>
<dependencies>
<dep package="glib"/>
@@ -66,12 +66,12 @@
<dep package="dbus"/>
</dependencies>
</autotools>
-
+/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
<autotools id="libgpg-error" autogen-sh="autogen.sh"
autogenargs="--disable-doc"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s
%(autogenargs)s">
- <branch repo="ftp.gnupg.org" version="1.17"
- module="gcrypt/libgpg-error/libgpg-error-1.17.tar.bz2">
+ <branch repo="gnupg.org" version="1.27"
+ module="gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2">
<patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/libgpg-error-cflags-for-cc-for-build.patch";
strip="1"/>
</branch>
@@ -80,8 +80,8 @@
<autotools id="libgcrypt" autogen-sh="configure"
autogenargs="--disable-asm --disable-doc"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s
%(autogenargs)s">
- <branch repo="ftp.gnupg.org" version="1.6.3"
- module="gcrypt/libgcrypt/libgcrypt-1.6.3.tar.bz2">
+ <branch repo="gnupg.org" version="1.7.6"
+ module="gcrypt/libgcrypt/libgcrypt-1.7.6.tar.bz2">
<patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/libgcrypt-cflags-for-cc-for-build.patch";
strip="1"/>
</branch>
@@ -89,10 +89,4 @@
<dep package="libgpg-error" />
</dependencies>
</autotools>
-
- <!-- 10.5 has 7.16.3, which is too old for some things, and also doesn't
- provide a pkgconfig file. Otherwise can be skipped. -->
- <autotools id="libcurl" autogen-sh="configure">
- <branch repo="curl.haxx.se" module="curl-7.47.1.tar.bz2" version="7.47.1"/>
- </autotools>
-</moduleset>
+</moduleset>
\ No newline at end of file
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 539525f..3a0c3ab 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -15,6 +15,7 @@
<repository type="tarball" name="freedesktop"
href="ftp://ftp.freedesktop.org/pub/"/>
<repository type="git" name="github" href="git://github.com/"/>
+ <repository type="tarball" name="github-tarball" href="https://github.com/"/>
<!-- This module set works a bit differently than for example the
GNOME ones do. It's split up in seperate pieces:
@@ -76,14 +77,14 @@
<autotools id="glib" autogen-sh="autoreconf"
autogenargs="--with-pcre=internal">
- <branch module="glib/2.48/glib-2.48.0.tar.xz" version="2.48.0"
- hash="sha256:744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34">
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Fix-g_get_monotonic_time-on-non-Intel-Darwin.patch";
strip="1"/>
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-724590-GSlice-slab_stack-corruption.patch";
strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gio-in-reserved-in-gcc-48.patch";
strip="1"/>
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch";
strip="1"/>
+ <branch module="glib/2.52/glib-2.52.1.tar.xz" version="2.42.1"
+ hash="sha256:948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f">
+ <!--patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Fix-g_get_monotonic_time-on-non-Intel-Darwin.patch";
strip="1"/-->
+ <!--patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-724590-GSlice-slab_stack-corruption.patch";
strip="1"/-->
+ <!--patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gio-in-reserved-in-gcc-48.patch";
strip="1"/-->
+ <!--patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch";
strip="1"/-->
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/glib-gint64-long-long.patch";
strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/glib-bug-772454-disable-kqueue.patch";
strip="1"/>
+ <!--patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/glib-bug-772454-disable-kqueue.patch"; strip="1"/-->
</branch>
<dependencies>
<dep package="libffi"/>
@@ -100,24 +101,26 @@
</autotools>
<autotools id="xorg-util-macros">
- <branch repo="freedesktop" version="1.19.0"
- module="xorg/individual/util/util-macros-1.19.0.tar.bz2"/>
+ <branch repo="freedesktop" version="1.19.1"
+ module="xorg/individual/util/util-macros-1.19.1.tar.bz2"/>
</autotools>
<!-- There is no stable release yet that works here, but commit
06fd4a27 breaks the build for gtk-osx, tag v1.3.1 builds
fine. -->
- <autotools id="libepoxy">
- <branch repo="github" module="anholt/libepoxy" revision="v1.3.1"/>
+anholt/libepoxy/releases/download/1.4.1/libepoxy-1.4.1.tar.xz
+ <autotools id="libepoxy" autogen-sh="configure">
+ <branch repo="github-tarball" version="v1.4.1"
+ module="anholt/libepoxy/releases/download/1.4.1/libepoxy-1.4.1.tar.xz" />
<dependencies>
<dep package="xorg-util-macros"/>
</dependencies>
</autotools>
<autotools id="gobject-introspection" autogen-sh="configure">
- <branch module="gobject-introspection/1.48/gobject-introspection-1.48.0.tar.xz"
- version="1.48.0"
- hash="sha256:fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877">
+ <branch module="gobject-introspection/1.52/gobject-introspection-1.52.1.tar.xz"
+ version="1.52.1"
+ hash="sha256:2ed0c38d52fe1aa6fc4def0c868fe481cb87b532fc694756b26d6cfab29faff4">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/girscanner-objc.patch"; strip="1"/>
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gi_cairo_library_path.patch";
strip="1"/>
</branch>
@@ -136,8 +139,8 @@
</autotools>
<autotools id="pango" autogen-sh="autoreconf">
- <branch version="1.38.1" module="pango/1.38/pango-1.38.1.tar.xz"
- hash="sha256:1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7">
+ <branch version="1.40.5" module="pango/1.40/pango-1.40.5.tar.xz"
+ hash="sha256:24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9">
</branch>
<dependencies>
<dep package="glib"/>
@@ -151,8 +154,8 @@
</autotools>
<autotools id="atk" autogen-sh="configure">
- <branch module="atk/2.20/atk-2.20.0.tar.xz" version="2.20.0"
- hash="sha256:493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0"/>
+ <branch module="atk/2.24/atk-2.24.0.tar.xz" version="2.24.0"
+ hash="sha256:bb2daa9a808c73a7a79d2983f333e0ba74be42fc51e3ba1faf2551a636487a49"/>
<dependencies>
</dependencies>
<after>
@@ -163,8 +166,8 @@
</autotools>
<autotools id="gdk-pixbuf" autogen-sh="configure">
- <branch module="gdk-pixbuf/2.34/gdk-pixbuf-2.34.0.tar.xz" version="2.34.0"
- hash="sha256:d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879"/>
+ <branch module="gdk-pixbuf/2.36/gdk-pixbuf-2.36.6.tar.xz" version="2.36.6"
+ hash="sha256:455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c"/>
<after>
<dep package="pango"/>
<dep package="gobject-introspection"/>
@@ -173,8 +176,8 @@
<autotools id="gtk+" autogen-sh="autoreconf"
autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection">
- <branch module="gtk+/2.24/gtk+-2.24.30.tar.xz" version="2.24.30"
- hash="sha256:0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50">
+ <branch module="gtk+/2.24/gtk+-2.24.31.tar.xz" version="2.24.31"
+ hash="sha256:68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658">
<!--patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch";
strip="1"/-->
<patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch";
strip="1"/>
<patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch";
strip="1"/>
@@ -192,31 +195,12 @@
</after>
</autotools>
- <autotools id="gtk+-3.14" autogen-sh="autogen.sh"
- autogenargs="--enable-quartz-backend --enable-quartz-relocation">
- <branch module="gtk+/3.14/gtk+-3.14.15.tar.xz" version="3.14.15"
- hash="sha256:3ac87659112ced9e5ee5bd55d055faa881aafd040f26ca40b0d8ba0fa6509c83">
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-707945-GTK2-Quartz-typeahead-find-in-GtkTreeView.patch";
strip="1"/>
- <!-- https://bugzilla.gnome.org/show_bug.cgi?id=763779 -->
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gtk-quartz-fix-pixelated-image-surfaces-in-retina-hidpi-.patch";
strip="1"/>
- </branch>
- <dependencies>
- <dep package="glib"/>
- <dep package="pango"/>
- <dep package="atk"/>
- <dep package="cairo"/>
- <dep package="gdk-pixbuf"/>
- <dep package="gobject-introspection"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- </after>
- </autotools>
-
<autotools id="gtk+-3.0" autogen-sh="autogen.sh"
autogenargs="--enable-quartz-backend --enable-quartz-relocation">
- <branch module="gtk+/3.20/gtk+-3.20.9.tar.xz" version="3.20.9"
- hash="sha256:83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17">
+ <branch module="gtk+/3.22/gtk+-3.22.12.tar.xz" version="3.22.12"
+ hash="sha256:84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c">
+ <!--patch
href="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-781118-gtk-3.22.12-quartz-backend-s.patch";
strip="1"/-->
+ <patch
file="file:///Users/john/Development/GTK-OSX/gtk-osx-build/patches/0001-Bug-781118-gtk-3.22.12-quartz-backend-s.patch"
strip="1"/>
</branch>
<dependencies>
<dep package="glib"/>
@@ -247,9 +231,9 @@
dependency. -->
<autotools id="cairo" autogen-sh="configure"
autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
- <branch module="cairo-1.14.6.tar.xz" version="1.14.6"
+ <branch module="cairo-1.14.8.tar.xz" version="1.14.8"
repo="cairographics"
- hash="sha1:0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5">
+ hash="sha1:c6f7b99986f93c9df78653c3e6a3b5043f65145e">
</branch>
<dependencies>
<dep package="pixman"/>
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index 1c38358..678336e 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -18,6 +18,8 @@
href="https://chromium.googlesource.com/"/>
<repository name="webkit.org" type="tarball"
href="http://www.webkitgtk.org/releases/"/>
+ <repository name="webkit-git" type="git"
+ href="git://git.webkit.org"/>
<!-- Builds last version of WebKitGTK that supported GTK 2.x -->
<metamodule id="meta-gtk-osx-webkit">
@@ -40,8 +42,8 @@
<autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl
%(autogenargs)s"
makeinstallargs="install_sw" supports-non-srcdir-builds="no">
- <branch module="openssl-1.0.2f.tar.gz" version="1.0.2f" repo="openssl"
- hash="sha256:932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c"/>
+ <branch module="openssl-1.0.2k.tar.gz" version="1.0.2k" repo="openssl"
+ hash="sha256:6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"/>
</autotools>
<!-- Rudely demands TeX to build documentation -->
@@ -49,9 +51,7 @@
<autotools id="libnettle"
autogenargs="--disable-documentation --disable-assembler"
autogen-template="autoreconf -fis && %(srcdir)s/configure --prefix %(prefix)s
%(autogenargs)s">
- <!-- gnutls 3.3.x does not support nettle 3.0 -->
- <branch repo="lysator" module="nettle/nettle.git"
- tag="nettle_2.7_release_20130424"/>
+ <branch repo="lysator" module="nettle/nettle.git" />
<dependencies>
<dep package="gmp"/>
<dep package="openssl"/>
@@ -61,14 +61,14 @@
<autotools id="libtasn1" supports-non-srcdir-builds="no">
<!-- Git repository is missing files required to build libtasn1
<branch repo="git.gnu.org" /> -->
- <branch repo="ftp.gnu.org" version="4.4"
- module="libtasn1/libtasn1-4.4.tar.gz"/>
+ <branch repo="ftp.gnu.org" version="4.10"
+ module="libtasn1/libtasn1-4.10.tar.gz"/>
</autotools>
<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"/>
+ <branch repo="sourceforge" version="1.2.11"
+ module="libpng/zlib-1.2.11.tar.xz"/>
</autotools>
<!-- Building from git does not work because they have checked in a bunch of
@@ -77,15 +77,21 @@
<autotools id="gnutls" autogen-sh="configure"
autogenargs="--disable-gtk-doc-html --without-p11-kit">
<!--branch repo="gitlab" module="gnutls/gnutls"/-->
- <branch repo="gnutls" version="3.3.12"
- module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
+ <branch repo="gnutls" version="3.5.9"
+ module="gcrypt/gnutls/v3.5/gnutls-3.5.9.tar.xz"/>
<dependencies>
+ <dep package="libunistring"/>
<dep package="libnettle"/>
<dep package="libtasn1"/>
<dep package="zlib"/>
</dependencies>
</autotools>
+ <autotools id="libgcrypt" autogen-sh="configure">
+ <branch repo="gnutls" version="1.7.6"
+ module="gcrypt/libgcrypt/libgcrypt-1.7.6.tar.gz"/>
+ </autotools>
+
<autotools id="glib-networking"
autogenargs="--without-ca-certificates set_more_warnings=no">
<branch/>
@@ -97,6 +103,7 @@
<autotools id="libsoup" autogenargs="set_more_warnings=no">
<branch/>
<dependencies>
+ <dep package="vala"/>
<dep package="sqlite"/>
<dep package="glib"/>
<dep package="glib-networking"/>
@@ -179,9 +186,9 @@
USE_LIBNOTIFY: Requires libnotify. No module for this yet.
USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
-->
- <cmake id="webkit2gtk3"
- cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
- <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
+ <!--cmake id="webkit2gtk3"
+ cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'"-->
+ <!--branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch";
strip="1"/>
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144560-platform-fixes.patch";
@@ -192,12 +199,16 @@
strip="1"/>
<patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148607-include-stub-for-plugin-permission-request.patch";
strip="1"/>
- </branch>
+ </branch-->
+ <cmake id="webkit2gtk3"
+ cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_INTROSPECTION=OFF
-DENABLE_OPENGL=OFF -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF
-DENABLE_TOUCH_EVENTS=OFF -DCMAKE_CXX_FLAGS="$CXX_FLAGS -stdlib=libc++"'>
+ <branch repo="webkit-git" module= "WebKit.git" />
<dependencies>
<dep package="libwebp"/>
<dep package="enchant"/>
<dep package="icu"/>
<dep package="libsoup"/>
+ <dep package="libgcrypt"/>
<dep package="meta-gtk-osx-freetype"/>
</dependencies>
<after>
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index e117fba..1bb5549 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -25,7 +25,7 @@
<repository type="cvs" name="gtkspell"
cvsroot=":pserver:anonymous gtkspell cvs sourceforge net:/cvsroot/gtkspell"
password=""/>
- <repository type="git" name="savannah" href="git://git.sv.gnu/org/"/>
+ <repository type="git" name="savannah" href="git://git.sv.gnu.org/"/>
<repository type="tarball" name="boehm"
href="http://www.hboem.info/"/>
<repository type="svn" name="exiv2.org"
@@ -85,10 +85,15 @@
</autotools>-->
<!-- vala-bootstrap is stuck at 0.16, so use a tarball for the time being.-->
<autotools id="vala" autogen-sh="configure">
- <branch repo="ftp.gnome.org" version="0.28.0"
- module="vala/0.28/vala-0.28.0.tar.xz"
- hash="sha256:0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f"/>
+ <branch repo="ftp.gnome.org" version="0.36.1"
+ module="vala/0.36/vala-0.36.1.tar.xz"
+ hash="sha256:13f4a3f99d983bf76e8d9dd736021ecc95f53ec1f9582423aa4b4be87455aa07"/>
+ <after>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
</autotools>
+
<!-- Vala is written in vala, so you need vala to build it. If you
want to work on vala itself or need the bleeding edge for some
reason, then you need vala-git. Otherwise, stick with vala. -->
@@ -318,16 +323,15 @@
<!-- 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.2.tar.bz2" version="4.3.2">
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gmp-cc-for-build-needs-cflags.patch";
strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gmp-4.3.2-stddef.patch"; strip="1"/>
-
+ <branch repo="ftp.gnu.org" module="gmp/gmp-6.1.2.tar.bz2" version="6.1.2">
</branch>
</autotools>
+<!-- libunistring's autogen.sh is borked so use the tarball. -->
<autotools id="libunistring" autogen-sh="configure">
- <branch repo="savannah" module="libunistring.git" tag="v0.9.3"/>
+ <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.7.tar.gz"
+ version="0.9.7">
+ </branch>
</autotools>
<autotools id="bdw-gc" autogen-template="pushd %(srcdir)s && ./autogen.sh && automake-1.10
-ac && popd && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
diff --git a/patches/0001-Bug-781118-gtk-3.22.12-quartz-backend-s.patch
b/patches/0001-Bug-781118-gtk-3.22.12-quartz-backend-s.patch
new file mode 100644
index 0000000..58fbdee
--- /dev/null
+++ b/patches/0001-Bug-781118-gtk-3.22.12-quartz-backend-s.patch
@@ -0,0 +1,43 @@
+From 9b5a92f5cc968193ae938c51df72c7beeca121d8 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Mon, 10 Apr 2017 16:38:26 -0700
+Subject: [PATCH] Save Changes Bug 781118 - gtk 3.22.12 quartz backend segfault
+
+Calling 'width' on an NSValue won't work, must call sizeValue on it.
+---
+ gdk/quartz/gdkscreen-quartz.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
+index e9bf684..586f7af 100644
+--- a/gdk/quartz/gdkscreen-quartz.c
++++ b/gdk/quartz/gdkscreen-quartz.c
+@@ -76,11 +76,10 @@ static void
+ gdk_quartz_screen_init (GdkQuartzScreen *quartz_screen)
+ {
+ GdkScreen *screen = GDK_SCREEN (quartz_screen);
+- NSScreen *nsscreen;
++ NSDictionary *dd = [[[NSScreen screens] objectAtIndex:0] deviceDescription];
++ NSSize size = [[dd valueForKey:NSDeviceResolution] sizeValue];
+
+- nsscreen = [[NSScreen screens] objectAtIndex:0];
+- _gdk_screen_set_resolution (screen,
+- [[nsscreen deviceDescription][NSDeviceResolution] width]);
++ _gdk_screen_set_resolution (screen, size.width);
+
+ gdk_quartz_screen_calculate_layout (quartz_screen);
+
+@@ -336,7 +335,9 @@ static gint
+ get_mm_from_pixels (NSScreen *screen, int pixels)
+ {
+ const float mm_per_inch = 25.4;
+- float dpi = [[screen deviceDescription][NSDeviceResolution] width];
++ NSDictionary *dd = [[[NSScreen screens] objectAtIndex:0] deviceDescription];
++ NSSize size = [[dd valueForKey:NSDeviceResolution] sizeValue];
++ float dpi = size.width;
+ return (pixels / dpi) * mm_per_inch;
+ }
+
+--
+2.2.2
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
