[geany/geany-osx] 777ff4: Update to the latest gtk-osx modulesets which seem to work - Commits

10 Oct 2020


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Sat, 10 Oct 2020 22:03:01 UTC
Commit:      777ff47ae6edb75087a5cd68e4acbd21b0066d0e
             https://github.com/geany/geany-osx/commit/777ff47ae6edb75087a5cd68e4acbd21b0...
Log Message:
-----------
Update to the latest gtk-osx modulesets which seem to work
Modified Paths:
--------------
    modulesets-stable/bootstrap.modules
    modulesets-stable/gtk-osx-bootstrap.modules
    modulesets-stable/gtk-osx-gstreamer.modules
    modulesets-stable/gtk-osx-network.modules
    modulesets-stable/gtk-osx-python.modules
    modulesets-stable/gtk-osx-random.modules
    modulesets-stable/gtk-osx-themes.modules
    modulesets-stable/gtk-osx.modules
Modified: modulesets-stable/bootstrap.modules
46 lines changed, 17 insertions(+), 29 deletions(-)
===================================================================
@@ -14,19 +14,20 @@
   <repository type="tarball" name="tukaani.org"
               href="http://tukaani.org/"/>
   <repository type="tarball" name="cmake"
-              href="http://www.cmake.org/files/%22/%3E
+              href="https://cmake.org/files/%22/%3E
   <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/" />
   <repository type="tarball" name="intltool"
               href="http://launchpad.net/intltool/trunk/"/>
<autotools id='readline' autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
-      version="7.0">
+    <branch repo="ftp.gnu.org" module="readline/readline-8.0.tar.gz"
+            hash="sha256:e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461"
+            version="8.0">
     </branch>
   </autotools>
<autotools id="xz" autogen-sh="configure" bootstrap="true">
-    <branch repo="tukaani.org" module="xz/xz-5.2.4.tar.bz2" version="5.2.4"/>
+    <branch repo="tukaani.org" module="xz/xz-5.2.5.tar.bz2" version="5.2.5"/>
   </autotools>
@@ -37,19 +38,17 @@
             module="make/make-4.2.1.tar.bz2" version="4.2.1" hash="sha256:d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589">
     </branch>
   </autotools>
-  <autotools id="gettext-tools" autogen-sh="configure"
+  <autotools id="gettext" autogen-sh="configure"
              autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">
-    <branch repo="ftp.gnu.org" source-subdir="gettext-tools"
-            module="gettext/gettext-0.19.8.tar.xz" version="0.19.8">
-      <!-- upstream bug: https://savannah.gnu.org/bugs/index.php?49560 -->
-      <patch file="https://savannah.gnu.org/bugs/download.php?file_id=38908" strip="1"/>
+    <branch repo="ftp.gnu.org"
+            module="gettext/gettext-0.20.2.tar.xz" version="0.20.2">
     </branch>
   </autotools>
<!-- cmakes ./configure is picky about invalid flags so we manually set it -->
   <autotools id="cmake" autogen-sh="bootstrap"
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
-    <branch repo="cmake" module="v3.14/cmake-3.14.5.tar.gz" version="3.14.5">
+    <branch repo="cmake" module="v3.17/cmake-3.17.2.tar.gz" version="3.17.2">
     </branch>
   </autotools>
@@ -63,8 +62,8 @@
<autotools id="autoconf-archive" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
-            module="autoconf-archive/autoconf-archive-2018.03.13.tar.xz"
-            version="2018-03-13"/>
+            module="autoconf-archive/autoconf-archive-2019.01.06.tar.xz"
+            version="2019-01-06"/>
   </autotools>
<autotools id="libtool" autogen-sh="configure" bootstrap="true">
@@ -75,7 +74,7 @@
<autotools id="automake" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org" version="1.16"
-            module="automake/automake-1.16.1.tar.xz"/>
+            module="automake/automake-1.16.2.tar.xz"/>
     <dependencies>
       <dep package="autoconf"/>
     </dependencies>
@@ -90,34 +89,25 @@
   <!-- 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.4.tar.xz"
-            version="3.0.4">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/bison-3.0.4-vasnprintf.patch" strip="1"/>
+    <branch repo="ftp.gnu.org" module="bison/bison-3.6.tar.xz"
+            version="3.6">
     </branch>
     <dependencies>
       <dep package='flex'/>
     </dependencies>
   </autotools>
-  <!-- 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. -->
+  <!-- As of 9 May 2020 Flex hasn't had an update since November 2015. -->
   <autotools id="flex" autogen-sh="configure">
     <branch module="flex/flex-2.6.0.tar.xz" version="2.6.0"
             repo="sourceforge" />
   </autotools>
<autotools id="expat" autogen-sh="configure">
-    <branch module="expat/expat-2.2.5.tar.bz2" version="2.2.5"
+    <branch module="expat/expat-2.2.9.tar.bz2" version="2.2.9"
             repo="sourceforge"/>
   </autotools>
-  <!-- Needed for building Gnome apps from the repository -->
-  <autotools id="gnome-common">
-    <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
        uses the real docbook source from upstream, feel free to do so,
@@ -136,15 +126,14 @@
             version="0.51.0"
             hash="md5:12e517cac2b57a0121cda351570f1e63"/>
     <!--dependencies>
-      <dep package="gnome-common"/>
       <dep package="perl-xml-parser"/>
     </dependencies-->
   </autotools>
<metamodule id="meta-bootstrap">
     <dependencies>
       <dep package="xz"/>
-      <dep package="gettext-tools" /> <!-- Needed for 64-bit -->
+      <dep package="gettext" /> <!-- Needed for 64-bit -->
       <dep package="cmake"/>
       <dep package="autoconf" />
       <dep package="autoconf-archive" />
@@ -154,7 +143,6 @@
       <dep package="bison"/>
       <dep package="flex"/>
       <dep package="gtk-osx-docbook"/>
-      <dep package="gnome-common"/>
       <dep package="intltool"/>
       <dep package="gnumake"/>
     </dependencies>
Modified: modulesets-stable/gtk-osx-bootstrap.modules
103 lines changed, 21 insertions(+), 82 deletions(-)
===================================================================
@@ -12,46 +12,42 @@
               href="http://www.ijg.org/files/%22/%3E
   <repository type="tarball" name="libtiff"
          href="http://download.osgeo.org/"/>
-  <repository type="tarball" name="fontconfig"
-	      href="http://www.freedesktop.org/software/fontconfig/release/%22/%3E
   <repository type="tarball" name="icon-theme"
          href="http://icon-theme.freedesktop.org/releases/"/>
   <repository type="tarball" name="xmlsoft.org"
          href="ftp://xmlsoft.org/libxml2/"/>
   <repository type="git" name="git.gnome.org"
               href="https://gitlab.gnome.org/GNOME"/>
-  <repository type="tarball" name="harfbuzz"
-              href="http://www.freedesktop.org/software/harfbuzz/release/%22/%3E
   <repository type="tarball" name="itstool" href="http://files.itstool.org/"/>
-  <repository type="tarball" name="icu"
-              href="http://download.icu-project.org/files/%22/%3E
+  <repository type="tarball" name="github-tarball" href="https://github.com/"/>
   <repository type="tarball" name="ragel"
               href="http://www.colm.net/files/ragel/"/>
<autotools id='readline' autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
-      version="7.0">
+    <branch repo="ftp.gnu.org" module="readline/readline-8.0.tar.gz"
+      version="8.0">
     </branch>
   </autotools>
<autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="1.6.34" module="libpng/libpng-1.6.34.tar.xz"
-            hash="sha256:2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"
+    <branch version="1.6.37" module="libpng/libpng-1.6.37.tar.xz"
+            hash="sha256:505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"
             repo="sourceforge"/>
     <dependencies>
       <dep package="zlib"/>
     </dependencies>
   </autotools>
<autotools id="libjpeg" autogen-sh="configure">
-    <branch module="jpegsrc.v9c.tar.gz" version="9c"
+    <branch module="jpegsrc.v9d.tar.gz" version="9d"
             repo="jpeg"
-            checkoutdir="jpeg-9c">
+            checkoutdir="jpeg-9d">
     </branch>
   </autotools>
<autotools id="libtiff" autogen-sh="configure" autogenargs="--without-x">
     <branch version="4.1.0" module="libtiff/tiff-4.1.0.tar.gz"
+	    hash="sha156:5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634"
        repo="libtiff">
    <patch file="https://raw.githubusercontent.com/totaam/gtk-osx-build/master/patches/tiff-nohtml.patch" strip="1" />
     </branch>
@@ -68,7 +64,8 @@
<autotools id="libxml2" autogen-sh="configure"
              autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
-    <branch version="2.9.8" module="libxml2-2.9.8.tar.gz"
+    <branch version="2.9.9" module="libxml2-2.9.9.tar.gz"
+            hash="sha256:94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"
        repo="xmlsoft.org"/>
     <after>
       <dep package="python"/>
@@ -77,8 +74,8 @@
   </autotools>
<autotools id="libxslt" autogen-sh="configure">
-    <branch version="1.1.32" module="libxslt-1.1.32.tar.gz"
-      hash="sha256:526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"
+    <branch version="1.1.34" module="libxslt-1.1.34.tar.gz"
+            hash="sha256:98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
        repo="xmlsoft.org"/>
     <dependencies>
       <dep package="libxml2"/>
@@ -96,8 +93,8 @@
   </autotools>
<autotools id="yelp-xsl">
-    <branch version="3.20.1" module="yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz"
-            hash="sha256:dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"/>
+    <branch version="3.36.0" module="yelp-xsl/3.36/yelp-xsl-3.36.0.tar.xz"
+            hash="sha256:4fe51c0233b79a4c204c68498d45f09b342c30ed02c4e418506c0e35f0904ec3"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
@@ -106,8 +103,8 @@
   </autotools>
<autotools id="yelp-tools">
-    <branch version="3.18.0" module="yelp-tools/3.18/yelp-tools-3.18.0.tar.xz"
-            hash="sha256:c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"/>
+    <branch version="3.32.2" module="yelp-tools/3.32/yelp-tools-3.32.2.tar.xz"
+            hash="sha256:183856b5ed0b0bb2c05dd1204af023946ed436943e35e789afb0295e5e71e8f9"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
@@ -117,8 +114,8 @@
   </autotools>
<autotools id="gtk-doc" autogen-sh="configure">
-    <branch version="1.30" module="gtk-doc/1.30/gtk-doc-1.30.tar.xz"
-            hash="sha256:a4f6448eb838ccd30d76a33b1fd095f81aea361f03b12c7b23df181d21b7069e"/>
+    <branch version="1.32" module="gtk-doc/1.32/gtk-doc-1.32.tar.xz"
+            hash="sha256:de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
@@ -131,49 +128,9 @@
<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="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.10.tar.gz" version="6.10">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/ragel-6.9-setiosflags.patch" strip="1"/>
-    </branch>
-  </autotools>
-
-  <autotools id="harfbuzz" autogen-sh="configure"
-             autogenargs="--with-coretext --with-icu">
-    <branch repo="harfbuzz" module="harfbuzz-2.5.3.tar.xz" version="2.5.3">
-    </branch>
-    <dependencies>
-      <dep package="ragel"/>
-      <dep package="glib"/>
-      <dep package="icu"/>
-    </dependencies>
-    <after>
-      <dep package="icu55"/>
-    </after>
-  </autotools>
-
-  <autotools id="freetype" autogen-sh="configure"
-             skip-autogen="never"
-             autogenargs="--without-bzip2 --without-harfbuzz">
-    <branch module="freetype/freetype-2.9.1.tar.gz" version="2.9.1"
-            repo="sourceforge">
-    </branch>
-    <dependencies>
-      <dep package="zlib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="fontconfig" autogen-sh="autoreconf"
-             autogenargs="--disable-docs '--with-add-fonts=/System/Library/Fonts,/Library/Fonts,~/Library/Fonts'">
-    <branch repo="fontconfig" version="2.13.1" module="fontconfig-2.13.1.tar.bz2">
-    </branch>
-    <dependencies>
-      <dep package="freetype"/>
-    </dependencies>
+    <branch repo="github-tarball" version="66.1" checkoutdir="icu"
+            module="unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz"
+            hash="sha256:52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e"/>
   </autotools>
<autotools id="hicolor-icon-theme" autogen-sh="configure"
@@ -182,32 +139,14 @@
             version="0.15"/>
   </autotools>
-  <autotools id="gettext-runtime" autogen-sh="configure"
-	     autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp">
-    <branch repo="ftp.gnu.org" source-subdir="gettext-runtime"
-            module="gettext/gettext-0.19.8.tar.xz" version="0.19.8">
-      <!-- upstream bug: https://savannah.gnu.org/bugs/index.php?49560 -->
-      <patch file="https://savannah.gnu.org/bugs/download.php?file_id=38908" strip="1"/>
-    </branch>
-  </autotools>
-
   <metamodule id="meta-gtk-osx-bootstrap">
     <dependencies>
       <dep package="libpng"/>
       <dep package="libjpeg"/>
       <dep package="libtiff"/>
-      <dep package="gettext-runtime"/>
       <dep package="hicolor-icon-theme"/>
       <dep package="gtk-doc"/>
     </dependencies>
   </metamodule>
-  <metamodule id="meta-gtk-osx-freetype">
-    <dependencies>
-      <dep package="freetype"/>
-      <dep package="fontconfig"/>
-      <dep package="harfbuzz"/>
-    </dependencies>
-  </metamodule>
-
 </moduleset>
Modified: modulesets-stable/gtk-osx-gstreamer.modules
43 lines changed, 22 insertions(+), 21 deletions(-)
===================================================================
@@ -14,27 +14,28 @@
<autotools id="faad2" autogen-sh="autoreconf"
              autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">
-    <branch repo="sourceforge" version="2.7"
-            module="faac/faad2-src/faad2-2.7/faad2-2.7.tar.bz2">
+    <branch repo="sourceforge" version="2.8.6"
+            module="faac/faad2-src/faad2-2.8.0/faad2-2.8.6.tar.gz"
+            hash="sha256:654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21">
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/faad2-2.7-ac-config-headers.patch" strip="1"/>
     </branch>
   </autotools>
<autotools id="gstreamer" autogenargs="--disable-tests" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gstreamer/gstreamer-1.12.4.tar.xz" version="1.12.4"
-            hash="sha256:5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674">
+    <branch module="gstreamer/gstreamer-1.16.2.tar.xz" version="1.16.2"
+            hash="sha256:e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e">
     </branch>
     <after>
       <dep package="glib"/>
     </after>
   </autotools>
-  <autotools id="gst-plugins-base" autogenargs="--disable-tests --disable-x --disable-xvideo" supports-non-srcdir-builds="no"
+  <autotools id="gst-plugins-base" autogenargs="--disable-tests --disable-x --disable-xvideo --disable-examples" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-base/gst-plugins-base-1.12.4.tar.xz"
-            version="1.12.4"
-            hash="sha256:4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282"/>
+    <branch module="gst-plugins-base/gst-plugins-base-1.16.2.tar.xz"
+            version="1.16.2"
+            hash="sha256:b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="liborc"/>
@@ -43,11 +44,11 @@
     </after>
   </autotools>
-  <autotools id="gst-plugins-good" autogenargs="--disable-tests --disable-x --disable-xvideo --disable-osx-video" supports-non-srcdir-builds="no"
+  <autotools id="gst-plugins-good" autogenargs="--disable-tests --disable-x --disable-xvideo --disable-osx-video --disable-vpx" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-good/gst-plugins-good-1.12.4.tar.xz"
-            version="1.12.4"
-            hash="sha256:649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957">
+    <branch module="gst-plugins-good/gst-plugins-good-1.16.2.tar.xz"
+            version="1.16.2"
+            hash="sha256:40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319">
     </branch>
     <dependencies>
       <dep package="gstreamer"/>
@@ -58,9 +59,9 @@
   <autotools id="gst-plugins-ugly" autogenargs="--disable-tests"
              supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS="
              autogen-sh="configure">
-    <branch version="1.12.4"
-            module="gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz"
-            hash="sha256:1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522"/>
+    <branch version="1.16.2"
+            module="gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz"
+            hash="sha256:5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -70,9 +71,9 @@
   <autotools id="gst-plugins-bad" supports-non-srcdir-builds="no"
              autogenargs="--disable-tests --disable-x --disable-xvid"
              makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch version="1.12.4"
-            module="gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz"
-            hash="sha256:0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08"/>
+    <branch version="1.16.2"
+            module="gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz"
+            hash="sha256:f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -86,9 +87,9 @@
   <autotools id="gst-libav" supports-non-srcdir-builds="no"
              autogen-sh="configure"
              autogenargs="--disable-tests --disable-mmx --with-libav-extra-configure='--disable-yasm'">
-     <branch version="1.12.4"
-            module="gst-libav/gst-libav-1.12.4.tar.xz"
-            hash="sha256:2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62"/>
+     <branch version="1.16.2"
+             module="gst-libav/gst-libav-1.16.2.tar.xz"
+             hash="sha256:c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
Modified: modulesets-stable/gtk-osx-network.modules
71 lines changed, 35 insertions(+), 36 deletions(-)
===================================================================
@@ -6,16 +6,15 @@
               href="http://ftp.gnome.org/pub/GNOME/sources/%22/%3E
   <repository name="openssl" type="tarball"
               href="https://www.openssl.org/source/"/>
-  <repository name="ftp.gnu.org" type="tarball" href="https://ftp.gnu.org/gnu/"/>
+  <repository name="ftp.gnu.org" type="tarball"
+              href="https://ftp.gnu.org/gnu/%22/%3E
   <repository name="sourceforge" type="tarball"
               href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository name="gnutls" type="tarball" href="https://www.gnupg.org/ftp/"/>
   <repository name="webm" type="tarball"
               href="http://downloads.webmproject.org/releases/"/>
   <repository name="webkit.org" type="tarball"
               href="http://www.webkitgtk.org/releases/"/>
-  <repository type="tarball" name="icu"
-              href="http://download.icu-project.org/files/%22/%3E
   <repository type="tarball" name="github-tarball" href="https://github.com/"/>
<!-- Builds last version of WebKitGTK that supported GTK 2.x -->
@@ -39,17 +38,17 @@
   <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.1.1c.tar.gz" version="1.1.1c" repo="openssl"
-            hash="sha256:f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90"/>
+    <branch module="openssl-1.1.1g.tar.gz" version="1.1.1g" repo="openssl"
+            hash="sha256:ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46"/>
   </autotools>
<!-- Rudely demands TeX to build documentation -->
-  <!-- Assembler files are missing md5-compress.asm for x86_64 -->
   <autotools id="libnettle" autogen-sh="configure"
-             autogenargs="--disable-documentation --disable-assembler">
-    <branch repo="ftp.gnu.org" version="3.3"
-            module="nettle/nettle-3.3.tar.gz">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libnettle-cc-for-build-needs-cflags.patch" strip="1"/>
+             autogenargs="--disable-documentation">
+    <branch repo="ftp.gnu.org" version="3.5.1"
+            module="nettle/nettle-3.5.1.tar.gz"
+            hash="sha256:75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419">
+      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libnettle-cc-for-build-return.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="gmp"/>
@@ -59,9 +58,9 @@
<autotools id="libtasn1" supports-non-srcdir-builds="no"
              autogen-sh="configure">
-    <branch repo="ftp.gnu.org" version="4.12"
-            module="libtasn1/libtasn1-4.12.tar.gz"
-            hash="sha256:6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753" />
+    <branch repo="ftp.gnu.org" version="4.15.0"
+            module="libtasn1/libtasn1-4.15.0.tar.gz"
+            hash="sha256:dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" />
   </autotools>
<autotools id="zlib" autogen-sh="configure" skip-autogen="never"
@@ -71,10 +70,12 @@
   </autotools>
<!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
-  <autotools id="gnutls" autogen-sh="configure"
+  <autotools id="gnutls" autogen-sh="autoreconf"
              autogenargs="--disable-gtk-doc-html --without-p11-kit">
-    <branch repo="gnutls" version="3.5.18"
-            module="gcrypt/gnutls/v3.5/gnutls-3.5.18.tar.xz"/>
+    <branch repo="gnutls" version="3.6.14"
+            hash="sha256:5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63"
+            module="gcrypt/gnutls/v3.6/gnutls-3.6.14.tar.xz">
+    </branch>
     <dependencies>
       <dep package="libunistring"/>
       <dep package="libnettle"/>
@@ -84,30 +85,30 @@
   </autotools>
<autotools id="libgcrypt" autogen-sh="configure">
-    <branch repo="gnutls" version="1.7.6"
-            module="gcrypt/libgcrypt/libgcrypt-1.7.6.tar.gz"/>
+    <branch repo="gnutls" version="1.8.6"
+            hash="sha256:626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc"
+            module="gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2"/>
   </autotools>
-  <autotools id="glib-networking" autogen-sh="configure"
-             autogenargs="--without-ca-certificates set_more_warnings=no">
-    <branch module="glib-networking/2.50/glib-networking-2.50.0.tar.xz"
-            hash="sha256:3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"
-            version="2.50.0"/>
+  <meson id="glib-networking" mesonargs="-Dopenssl=enabled">
+         <branch module="glib-networking/2.65/glib-networking-2.65.1.tar.xz"
+            hash="sha256:45a4a22651f0268b45c26ab4a16282f06f2995fdaf5aa8d221e535099cdd7783"
+            version="2.65.1"/>
     <dependencies>
       <dep package="gnutls"/>
       <dep package="glib"/>
     </dependencies>
-  </autotools>
+  </meson>
<autotools id="libpsl" autogen-sh='configure'>
-    <branch repo="github-tarball" version="0.20.2"
-            module="rockdaboot/libpsl/releases/download/libpsl-0.20.2/libpsl-0.20.2.tar.gz" />
+    <branch repo="github-tarball" version="0.21.0"
+            hash="sha256:41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12"
+            module="rockdaboot/libpsl/releases/download/libpsl-0.21.0/libpsl-0.21.0.tar.gz"/>
   </autotools>
-  <autotools id="libsoup" autogen-sh="configure"
-             autogenargs="set_more_warnings=no --enable-introspection=no">
-    <branch module="libsoup/2.64/libsoup-2.64.2.tar.xz" version="2.64.2"
-            hash="sha256:75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6">
+  <meson id="libsoup" mesonargs="-Dvapi=disabled">
+    <branch module="libsoup/2.68/libsoup-2.68.4.tar.xz" version="2.68.4"
+            hash="sha256:2d50b12922cc516ab6a7c35844d42f9c8a331668bbdf139232743d82582b3294">
     </branch>
     <dependencies>
       <dep package="libpsl"/>
@@ -117,7 +118,7 @@
       <dep package="sqlite"/>
       <dep package="vala"/>
     </dependencies>
-  </autotools>
+  </meson>
<autotools id="libwebp" autogen-sh="configure"  autogenargs="--enable-libwebpmux --enable-libwebpdecoder">
     <branch repo="webm" module="webp/libwebp-1.0.0.tar.gz" version="1.0.0"/>
@@ -126,8 +127,9 @@
   <autotools id="icu55" 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="github-tarball" version="55.2" checkoutdir="icu"
+            module="unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
+            hash="sha256:eda2aa9f9c787748a2e2d310590720ca8bcc6252adf6b4cfb03b65bef9d66759"/>
   </autotools>
<!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
@@ -159,7 +161,6 @@
       <dep package="enchant"/>
       <dep package="icu55"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk"/>
@@ -183,7 +184,6 @@
       <dep package="enchant"/>
       <dep package="icu55"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk3"/>
@@ -222,7 +222,6 @@
       <dep package="icu"/>
       <dep package="libsoup"/>
       <dep package="libgcrypt"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk3"/>
Modified: modulesets-stable/gtk-osx-python.modules
22 lines changed, 10 insertions(+), 12 deletions(-)
===================================================================
@@ -79,13 +79,12 @@
   <autotools id="python" autogenargs="--enable-shared"
         supports-non-srcdir-builds="no" autogen-sh="autoreconf">
        <branch repo="python"
-              module="2.7.16/Python-2.7.16.tar.xz" version="2.7.16"
-              hash="sha256:f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7">
+               module="2.7.17/Python-2.7.17.tgz" version="2.7.17"
+               hash="sha256:f22059d09cdf9625e0a7284d24a13062044f5bf59d93a7f3382190dfa94cecde">
   <!-- related to https://bugs.python.org/issue11445 -->
   <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/python-ldflags.patch" strip="1"/>
     </branch>
     <dependencies>
-      <dep package="gettext-runtime"/>
       <dep package='readline'/>
     </dependencies>
     <after>
@@ -94,12 +93,11 @@
     </after>
   </autotools>
-  <autotools id="python3" autogenargs="--enable-shared" autogen-sh="autoreconf">
-    <branch repo="python" module="3.6.8/Python-3.6.8.tar.xz" version="3.6.8">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Python3.6-stack-size-flag.patch" strip="1"/>
-    </branch>
+  <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
+    <branch repo="python" module="3.8.5/Python-3.8.5.tar.xz" version="3.8.5"
+            hash="md5:35b5a3d0254c1c59be9736373d429db7"
+            />
     <dependencies>
-      <dep package="gettext-runtime"/>
       <dep package='readline'/>
       <dep package="openssl"/> <!-- For hashlib -->
     </dependencies>
@@ -118,7 +116,7 @@
     </after>
   </distutils>
-  <distutils id="pycairo" autogen-sh="configure" python-command="python3">
+  <meson id="pycairo">
     <branch module="/pygobject/pycairo/releases/download/v1.18.1/pycairo-1.18.1.tar.gz" repo="github-tarball"
             version="1.18.1"
        hash="sha256:70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786"/>
@@ -132,7 +130,7 @@
       <dep package="meta-gtk-osx-gtk3.14"/>
       <dep package="meta-gtk-osx-core"/>
     </after>
-  </distutils>
+  </meson>
<!-- PyGObject 2.28 is the last series for Gtk+-2; for co-installation
      with later versions it installs as pygobject2 and PyGObject 3
@@ -155,7 +153,7 @@
     </after>
   </autotools>
-   <distutils id="pygobject3" >
+   <meson id="pygobject3" >
     <branch version="3.32.2" module="pygobject/3.32/pygobject-3.32.2.tar.xz"
        hash="sha256:c39ca2a28364b57fa00549c6e836346031e6b886c3ceabfd8ab4b4fed0a83611"/>
     <dependencies>
@@ -165,7 +163,7 @@
       <dep package="python"/>
       <dep package="python3"/>
     </after>
-   </distutils>
+   </meson>
<!-- Pygtk is discontinued, this is the last release -->
  <autotools id="pygtk" autogen-sh="configure"
Modified: modulesets-stable/gtk-osx-random.modules
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -254,7 +254,7 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
-  <autotools id="gtkspell3" autogen-sh="configure">
+  <autotools id="gtkspell3" autogen-sh="configure" autogenargs="--enable-vala=no">
     <branch module="gtkspell/gtkspell3-3.0.9.tar.xz" repo="sourceforge"
             version="3.0.9">
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/0001-Enable-use-of-XDG_DATA_DIRS-for-locating-iso-code-fi.patch" strip="1"/>
Modified: modulesets-stable/gtk-osx-themes.modules
41 lines changed, 0 insertions(+), 41 deletions(-)
===================================================================
@@ -24,13 +24,6 @@
     </dependencies>
   </metamodule>
-  <metamodule id="meta-gtk-osx-gtk3-core-themes">
-    <dependencies>
-      <dep package="icon-naming-utils"/>
-      <dep package="adwaita-icon-theme"/>
-    </dependencies>
-  </metamodule>
-
   <autotools id="icon-naming-utils" autogen-sh="configure">
     <branch repo="tango.freedesktop.org"  version="0.8.90"
             module="icon-naming-utils-0.8.90.tar.bz2"
@@ -51,16 +44,6 @@
     </dependencies>
   </autotools>
-  <autotools id="adwaita-icon-theme" autogen-sh="configure">
-    <branch module="adwaita-icon-theme/3.32/adwaita-icon-theme-3.32.0.tar.xz"
-            version="3.32.0" hash="sha256:698db6e407bb987baec736c6a30216dfc0317e3ca2403c7adf3a5aa46c193286"/>
-    <dependencies>
-      <dep package="librsvg"/>
-      <dep package="hicolor-icon-theme"/>
-      <dep package="icon-naming-utils"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtk-engines" autogen-sh="configure">
     <branch module="gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"
             version="2.20.2" hash="sha256:15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"/>
@@ -74,28 +57,4 @@
        hash="sha256:e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912"/>
   </autotools>
-  <!-- librsvg is converting to the Rust language. This requires
-       substantial infrastructure that's resistant to installing with
-       jhbuild, so we'll freeze at the 2.40 branch. -->
-  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
-    <branch module="librsvg/2.40/librsvg-2.40.17.tar.xz" version="2.40.17"
-	    hash="sha256:e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc"/>
-    <dependencies>
-      <dep package="libcroco"/>
-      <dep package="meta-gtk-osx-freetype"/>
-    </dependencies>
-    <after>
-<!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
-      <dep package="gtk+"/>
-      <dep package="gtk+-3.0"/>
-      <dep package="gtk+-3.14"/>
-    </after>
-  </autotools>
-
-  <autotools id="libcroco" autogenargs="--disable-Bsymbolic"
-	     autogen-sh="configure">
-    <branch module="libcroco/0.6/libcroco-0.6.13.tar.xz" version="0.6.13"
-	    hash="sha256:767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"/>
-  </autotools>
- 
 </moduleset>
Modified: modulesets-stable/gtk-osx.modules
256 lines changed, 171 insertions(+), 85 deletions(-)
===================================================================
@@ -10,39 +10,39 @@
               href="https://www.cairographics.org/releases/%22/%3E
   <repository type="tarball" name="ftp.gnu.org"
               href="https://ftp.gnu.org/gnu/"/>
-  <repository type="tarball" name="sourceware.org"
-              href="ftp://sourceware.org/pub/"/>
   <repository type="tarball" name="freedesktop"
               href="ftp://ftp.freedesktop.org/pub/"/>
+  <repository type="tarball" name="fontconfig"
+	      href="http://www.freedesktop.org/software/fontconfig/release/%22/%3E
   <repository type="git" name="github" href="git://github.com/"/>
   <repository type="tarball" name="github-tarball" href="https://github.com/"/>
   <repository type="system" name="system"/>
<!-- This module set works a bit differently than for example the
        GNOME ones do. It's split up in seperate pieces:
-       - gtk-osx-bootstrap: contains bootstrap-like modules that you
-         don't want to rebuild all the time.
+- gtk-osx-bootstrap: contains bootstrap-like modules that you
+don't want to rebuild all the time.
-       - gtk-osx.modules: contains the core GTK+ stack. This does not
-         have a hard dependency on the bootstrap modules, in order to
-         make it easy to rebuild the whole core stack without redoing
-         the bootstrap parts. They have a soft, "after", depencency.
+- gtk-osx.modules: contains the core GTK+ stack. This does not
+have a hard dependency on the bootstrap modules, in order to
+make it easy to rebuild the whole core stack without redoing
+the bootstrap parts. They have a soft, "after", depencency.
-       The remaining modules are mostly for testing and might not work
-       all the time:
+The remaining modules are mostly for testing and might not work
+all the time:
-       - gtk-osx-python.modules: self explaining.
-       - gtk-osx-gtkmm.modules: self explaining.
-       - gtk-osx-javascript.modules: GJS, associated tools, and the Mozilla JS
-         library it depends on.
-       - gtk-osx-gstreamer.modules: self explaining.
-       - gtk-osx-themes.modules: self explaining.
-       - gtk-osx-network.modules: The network/crypto stack and various
-         configurations of WebKit.
+- gtk-osx-python.modules: self explaining.
+- gtk-osx-gtkmm.modules: self explaining.
+- gtk-osx-javascript.modules: GJS, associated tools, and the Mozilla JS
+library it depends on.
+- gtk-osx-gstreamer.modules: self explaining.
+- gtk-osx-themes.modules: self explaining.
+- gtk-osx-network.modules: The network/crypto stack and various
+configurations of WebKit.
-       - gtk-osx-random.modules: "random stuff", has apps for testing GTK+.
-       - gtk-osx-unsupported.modules: more testing stuff, competely unsupported.
+- gtk-osx-random.modules: "random stuff", has apps for testing GTK+.
+- gtk-osx-unsupported.modules: more testing stuff, competely unsupported.
   -->
<include href="gtk-osx-bootstrap.modules"/>
@@ -55,6 +55,11 @@
   <include href="gtk-osx-themes.modules"/>
   <include href="gtk-osx-unsupported.modules"/>
+  <!-- Dummy meson module to shut up a jhbuild warning. -->
+  <systemmodule id="meson">
+    <branch repo="system"/>
+  </systemmodule>
+
   <metamodule id="meta-gtk-osx-core">
     <dependencies>
       <dep package="gtk+"/>
@@ -69,6 +74,7 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
+      <dep package="adwaita-icon-theme"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -79,44 +85,108 @@
     <dependencies>
       <dep package="gtk+-3.14"/>
       <dep package="gtk-mac-integration"/>
-      <dep package="meta-gtk-osx-gtk3-core-themes"/>
+      <dep package="adwaita-icon-theme"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </metamodule>
-  <systemmodule id="meson">
-    <branch repo="system" version="0.49.2"/>
-    <systemdependencies>
-      <dep type="path" name="meson"/>
-    </systemdependencies>
-  </systemmodule>
+  <autotools id="libffi" autogenargs="--disable-builddir"
+             autogen-sh="configure">
+    <branch module="libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz"
+            repo="github-tarball" version="3.3"/>
+  </autotools>
+
+  <meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=disabled">
+    <branch module="glib/2.66/glib-2.66.0.tar.xz"  version="2.66.0"
+            hash="sha256:c5a66bf143065648c135da4c943d2ac23cce15690fc91c358013b2889111156c">
+    </branch>
+    <dependencies>
+      <dep package="libffi"/>
+    </dependencies>
+  </meson>
+
+  <!-- To build Freetype *with* harfbuzz requires harfbuzz to be built
+       with freetype so we first have to build it *without* harfbuzz,
+       then build harfbuzz without cairo because cairo requires
+       harfbuzz. -->
+  <cmake id="freetype-no-harfbuzz" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
+    <branch module="freetype/freetype-2.10.2.tar.gz" version="2.10.2"
+            repo="sourceforge"/>
+    <dependencies>
+      <dep package="zlib"/>
+    </dependencies>
+  </cmake>
-  <meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=false">
-    <branch module="glib/2.62/glib-2.62.4.tar.xz"  version="2.62.4"
-            hash="sha256:4c84030d77fa9712135dfa8036ad663925655ae95b1d19399b6200e869925bbc">
+  <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Ddocs=disabled">
+    <branch repo="github-tarball" version="2.7.1"
+            module="harfbuzz/harfbuzz/releases/download/2.7.1/harfbuzz-2.7.1.tar.xz" 
+            hash="sha256:e95ee43b6bd0d3d1307e2aacf0f9c0050e5baceb21988b367b833028114aa569">
     </branch>
     <dependencies>
-        <dep package="libffi"/>
+      <dep package="glib"/>
+      <dep package="freetype-no-harfbuzz"/>
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="icu"/>
+      <dep package="icu55"/>
     </after>
   </meson>
-  <autotools id="libffi" autogenargs="--disable-builddir"
+  <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
+    <branch module="freetype/freetype-2.10.2.tar.gz" version="2.10.2"
+            repo="sourceforge"/>
+    <dependencies>
+      <dep package="harfbuzz-no-cairo"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </cmake>
+
+  <autotools id="fontconfig" autogen-sh="configure"
+             autogenargs="--disable-docs">
+    <branch repo="fontconfig" version="2.13.1"
+            module="fontconfig-2.13.1.tar.bz2"/>
+    <dependencies>
+      <dep package="freetype"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx"
              autogen-sh="configure">
-    <branch module="libffi/libffi-3.2.1.tar.gz" repo="sourceware.org"
-            version="3.2.1"/>
+    <branch version="0.40.0" module="pixman-0.40.0.tar.gz"
+            repo="cairographics"
+            hash="sha512:063776e132f5d59a6d3f94497da41d6fc1c7dca0d269149c78247f0e0d7f520a25208d908cf5e421d1564889a91da44267b12d61c0bd7934cd54261729a7de5f">
+    </branch>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+    </after>
+  </autotools>
+
+  <!-- cairo doesn't really need fontconfig, but if Pango finds
+       freetype it insists that it has to have fontconfig too and that
+       they are both built into cairo. -->
+  <autotools id="cairo"  autogen-sh="autoreconf"
+             autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
+    <branch module="cairo-1.16.0.tar.xz"  version="1.16.0"
+            repo="cairographics"
+            hash="sha1:00e81842ae5e81bb0343108884eb5205be0eac14">
+      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/cairo-freetype-font-variations.patch" strip="1"/>
+      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/cairo-image-refcount.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="pixman"/>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="harfbuzz-no-cairo"/>
+      <dep package="fontconfig"/>
+    </dependencies>
   </autotools>
<meson id="gobject-introspection">
-    <branch module="gobject-introspection/1.60/gobject-introspection-1.60.2.tar.xz"
-            version="1.60.2"
-            hash="sha256:ffdfe2368fb2e34a547898b01aac0520d52d8627fdeb1c306559bcb503ab5e9c">
+    <branch module="gobject-introspection/1.64/gobject-introspection-1.64.1.tar.xz"
+            version="1.64.1"
+            hash="sha256:80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7">
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/girscanner-objc.patch" strip="1"/>
-            <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gi_cairo_library_path.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -127,34 +197,45 @@
     </after>
   </meson>
+  <meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Ddocs=disabled">
+    <branch repo="github-tarball" version="2.7.1"
+            module="harfbuzz/harfbuzz/releases/download/2.7.1/harfbuzz-2.7.1.tar.xz" 
+            hash="sha256:e95ee43b6bd0d3d1307e2aacf0f9c0050e5baceb21988b367b833028114aa569">
+    </branch>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="cairo"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </meson>
+
   <meson id="fribidi" mesonargs="-Ddocs=false">
-    <branch module="fribidi/fribidi/releases/download/v1.0.5/fribidi-1.0.5.tar.bz2"
-            repo="github-tarball" version="1.0.5"/>
+    <branch module="fribidi/fribidi/releases/download/v1.0.9/fribidi-1.0.9.tar.xz"
+            repo="github-tarball" version="1.0.9"/>
     <dependencies>
       <!--dep package="c2man"/ -->
     </dependencies>
   </meson>
<meson id="pango">
-    <branch version="1.44.7" module="pango/1.44/pango-1.44.7.tar.xz"
-            hash="sha256:66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f">
+    <branch version="1.46.2" module="pango/1.46/pango-1.46.2.tar.xz"
+            hash="sha256:d89fab5f26767261b493279b65cfb9eb0955cd44c07c5628d36094609fc51841">
     </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="fribidi"/>
       <dep package="harfbuzz"/>
-     </dependencies>
+      <dep package="fribidi"/>
+    </dependencies>
     <after>
       <dep package="gobject-introspection"/>
-      <dep package="meta-gtk-osx-freetype"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </meson>
- <meson id="atk">
-    <branch module="atk/2.32/atk-2.32.0.tar.xz" version="2.32.0"
-            hash="sha256:cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc"/>
+  <meson id="atk">
+    <branch module="atk/2.36/atk-2.36.0.tar.xz" version="2.36.0"
+            hash="sha256:fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788"/>
     <dependencies>
     </dependencies>
     <after>
@@ -189,7 +270,7 @@
       <patch file="https://gitlab.gnome.org/GNOME/gtk/uploads/f0c19446b9cd1df467c4cc9050516d4b/0001-Bug-743717-Crashes-on-clipboard-operation-influence-.patch" strip="1"/>
       <!-- upstream bug: https://gitlab.gnome.org/GNOME/gtk/issues/580 -->
       <patch file="https://gitlab.gnome.org/GNOME/gtk/uploads/2a194d81de8e8346a81816870264b3bf/gdkimage.patch" strip="1"/>
-   </branch>
+    </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
@@ -208,8 +289,9 @@
   </autotools>
<meson id="libepoxy">
-    <branch repo="github-tarball" version="1.5.3"
-            module="anholt/libepoxy/releases/download/1.5.3/libepoxy-1.5.3.tar.xz"/>
+    <branch repo="github-tarball" version="1.5.4"
+            hash="sha256:0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2"
+            module="anholt/libepoxy/releases/download/1.5.4/libepoxy-1.5.4.tar.xz"/>
     <dependencies>
       <dep package="xorg-util-macros"/>
     </dependencies>
@@ -225,7 +307,7 @@
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtk3-14-get-scale-factor.patch" strip="1"/>
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtk-3.14-stylecontext-unnecessary-assert.patch" strip="1"/>
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtk-3.14-GDesktopAppInfo-not-implemented-on-Mac.patch" strip="1"/>
-   </branch>
+    </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
@@ -241,8 +323,8 @@
<autotools id="gtk+-3.0" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.24/gtk+-3.24.14.tar.xz" version="3.24.14"
-            hash="sha256:1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88">
+    <branch module="gtk+/3.24/gtk+-3.24.20.tar.xz" version="3.24.20"
+            hash="sha256:2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3">
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -257,51 +339,55 @@
     </after>
   </autotools>
-  <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx"
-             autogen-sh="configure">
-    <branch version="0.38.4" module="pixman-0.38.4.tar.gz"
-            repo="cairographics"
-            hash="sha1:8594e0a31c1802ae0c155d6b502c0953aa862baa">
-    </branch>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-    </after>
-  </autotools>
-
-  <!-- Cairo will automatically enable freetype and fontconfig if
-       meta-gtk-osx-freetype is built, so packages which require
-       cairoft or cairofc should have meta-gtk-osx-freetype as a
-       dependency. -->
-  <autotools id="cairo"  autogen-sh="autoreconf"
-             autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
-    <branch module="cairo-1.16.0.tar.xz"  version="1.16.0"
-            repo="cairographics"
-            hash="sha1:00e81842ae5e81bb0343108884eb5205be0eac14">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/cairo-freetype-font-variations.patch" strip="1"/>
+  <autotools id="gtk-mac-integration" autogen-sh="configure"
+             autogenargs="--disable-python">
+    <branch module="gtk-mac-integration/2.1/gtk-mac-integration-2.1.3.tar.xz"
+            version="2.1.3"
+            hash="sha256:d5f72302daad1f517932194d72967a32e72ed8177cfa38aaf64f0a80564ce454">
     </branch>
     <dependencies>
-      <dep package="pixman"/>
     </dependencies>
     <after>
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
+      <dep package="gtk+-3.14"/>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </after>
   </autotools>
-  <autotools id="gtk-mac-integration" autogen-sh="configure"
-             autogenargs="--disable-python">
-    <branch module="gtk-mac-integration/2.1/gtk-mac-integration-2.1.3.tar.xz"
-            version="2.1.3"
-            hash="sha256:d5f72302daad1f517932194d72967a32e72ed8177cfa38aaf64f0a80564ce454">
-    </branch>
+  <autotools id="libcroco" autogenargs="--disable-Bsymbolic"
+             autogen-sh="configure">
+    <branch module="libcroco/0.6/libcroco-0.6.13.tar.xz" version="0.6.13"
+            hash="sha256:767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"/>
+  </autotools>
+
+  <!-- librsvg is converting to the Rust language. This requires
+       substantial infrastructure that's resistant to installing with
+       jhbuild, so we'll freeze at the 2.40 branch. -->
+  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
+    <branch module="librsvg/2.40/librsvg-2.40.17.tar.xz" version="2.40.17"
+            hash="sha256:e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc"/>
     <dependencies>
+      <dep package="libcroco"/>
+      <dep package="freetype"/>
     </dependencies>
     <after>
+      <!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
       <dep package="gtk+"/>
       <dep package="gtk+-3.0"/>
       <dep package="gtk+-3.14"/>
-      <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>
+  <autotools id="adwaita-icon-theme" autogen-sh="configure">
+    <branch module="adwaita-icon-theme/3.36/adwaita-icon-theme-3.36.1.tar.xz"
+            version="3.36.1" hash="sha256:e498518627044dfd7db7d79a5b3d437848caf1991ef4ef036a2d3a2ac2c1f14d"/>
+    <dependencies>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
+  <!-- Null metamodule, provided so as not to break modules that use it. -->
+  <metamodule id="meta-gtk-osx-freetype" />
+
 </moduleset>
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    