[geany/geany-osx] 5cc0c2: Update modulesets - Commits

12 Oct 2021


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Tue, 12 Oct 2021 14:19:22 UTC
Commit:      5cc0c28f1e01fe8b7a6750f1eeb5d8c8211e922d
             https://github.com/geany/geany-osx/commit/5cc0c28f1e01fe8b7a6750f1eeb5d8c821...
Log Message:
-----------
Update modulesets
Modified Paths:
--------------
    modulesets-stable/bootstrap.modules
    modulesets-stable/gtk-osx-bootstrap.modules
    modulesets-stable/gtk-osx-gstreamer.modules
    modulesets-stable/gtk-osx-gtkmm.modules
    modulesets-stable/gtk-osx-javascript.modules
    modulesets-stable/gtk-osx-network.modules
    modulesets-stable/gtk-osx-obsolete.modules
    modulesets-stable/gtk-osx-python.modules
    modulesets-stable/gtk-osx-random.modules
    modulesets-stable/gtk-osx-themes.modules
    modulesets-stable/gtk-osx-unsupported.modules
    modulesets-stable/gtk-osx.modules
Modified: modulesets-stable/bootstrap.modules
93 lines changed, 49 insertions(+), 44 deletions(-)
===================================================================
@@ -1,14 +1,10 @@
 <?xml version="1.0" standalone="no"?> <!--*- mode: nxml -*-->
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-  <repository type="tarball" name="ftp.gnome.org" default="yes"
-              href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
   <repository type="tarball" name="ftp.gnu.org"
               href="https://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="pkgconfig"
               href="http://pkgconfig.freedesktop.org/releases/"/>
-  <repository type="tarball" name="python"
-              href="http://www.python.org/ftp/python/%22/%3E
   <repository type="tarball" name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="tukaani.org"
@@ -18,96 +14,105 @@
   <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-8.0.tar.gz"
-            hash="sha256:e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461"
-            version="8.0">
-    </branch>
-  </autotools>
+  <repository type="tarball" name="github" href="https://github.com"/>
<autotools id="xz" autogen-sh="configure" bootstrap="true">
-    <branch repo="tukaani.org" module="xz/xz-5.2.5.tar.bz2" version="5.2.5"/>
+    <branch repo="tukaani.org" module="xz/xz-5.2.5.tar.bz2" version="5.2.5"
+            hash="sha256:5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df"/>
   </autotools>
-
   <!-- gnu make 4.xx, needed to unbreak parallel builds for the webkit -->
-  <autotools id="gnumake" autogen-sh="configure"
+  <autotools id="gnumake" autogen-sh="configure"  bootstrap="true"
              autogenargs="--disable-dependency-tracking">
     <branch repo="ftp.gnu.org"
-            module="make/make-4.2.1.tar.bz2" version="4.2.1" hash="sha256:d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589">
+            module="make/make-4.3.tar.gz" version="4.3"
+            hash="sha256:e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19">
     </branch>
   </autotools>
+
   <autotools id="gettext" autogen-sh="configure"
-             autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">
+             autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco"
+             hash="sha256:d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192">
     <branch repo="ftp.gnu.org"
-            module="gettext/gettext-0.20.2.tar.xz" version="0.20.2">
+            module="gettext/gettext-0.21.tar.xz" version="0.21">
     </branch>
   </autotools>
<!-- cmakes ./configure is picky about invalid flags so we manually set it -->
-  <autotools id="cmake" autogen-sh="bootstrap"
+  <autotools id="cmake" autogen-sh="bootstrap"  bootstrap="true"
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
-    <branch repo="cmake" module="v3.17/cmake-3.17.2.tar.gz" version="3.17.2">
+    <branch repo="cmake" module="v3.20/cmake-3.20.0.tar.gz" version="3.20.0">
+    </branch>
+  </autotools>
+  <!-- The version of m4 provided with Xcode is now too old, see
+       https://savannah.gnu.org/support/index.php?110397 -->
+  <autotools id="m4" autogen-sh="configure" bootstrap="true">
+    <branch repo="ftp.gnu.org"
+            module="m4/m4-1.4.18.tar.xz" version="1.4.18"
+            hash="sha256:f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07">
+      <patch file="vasnprintf.patch" strip="1"/>
     </branch>
   </autotools>
<autotools id="autoconf" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
-            module="autoconf/autoconf-2.69.tar.xz" version="2.69"/>
+            module="autoconf/autoconf-2.71.tar.xz" version="2.71"
+            hash="shas56:f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4"/>
     <dependencies>
+      <dep package="m4"/>
       <dep package="xz"/>
     </dependencies>
   </autotools>
-  <autotools id="autoconf-archive" autogen-sh="configure">
+  <autotools id="autoconf-archive" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
-            module="autoconf-archive/autoconf-archive-2019.01.06.tar.xz"
-            version="2019-01-06"/>
+            module="autoconf-archive/autoconf-archive-2021.02.19.tar.xz"
+            version="2021-02-19"
+            hash="sha256:e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd"/>
   </autotools>
<autotools id="libtool" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
-            module="libtool/libtool-2.4.6.tar.gz" version="2.4.6"/>
+            module="libtool/libtool-2.4.6.tar.gz" version="2.4.6"
+            hash="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"/>
   </autotools>
<autotools id="automake" autogen-sh="configure" bootstrap="true">
-    <branch repo="ftp.gnu.org" version="1.16"
-            module="automake/automake-1.16.2.tar.xz"/>
+    <branch repo="ftp.gnu.org" version="1.16.3"
+            module="automake/automake-1.16.3.tar.xz"
+            hash="sha256:ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a"/>
     <dependencies>
       <dep package="autoconf"/>
     </dependencies>
   </autotools>
-  <autotools id="pkg-config" autogen-sh="configure"
+  <autotools id="pkg-config" autogen-sh="configure" bootstrap="true"
              autogenargs="--with-internal-glib">
     <branch repo="pkgconfig"
-            module="pkg-config-0.29.2.tar.gz" version="0.29.2"/>
+            module="pkg-config-0.29.2.tar.gz" version="0.29.2"
+            hash="sha256:6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"/>
   </autotools>
<!-- 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.6.tar.xz"
-            version="3.6">
+    <branch repo="ftp.gnu.org" module="bison/bison-3.7.6.tar.xz"
+            version="3.7.6"
+            hash="sha256:67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf">
     </branch>
     <dependencies>
       <dep package='flex'/>
     </dependencies>
   </autotools>
-  
-  <!-- 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" />
+
+  <!-- As of 29 March 2021 Flex hasn't had an update since May 2017. -->
+  <autotools id="flex" autogen-sh="configure" autogenargs="--disable-libfl">
+    <branch module="westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz"
+            repo="github" version="2.6.4"
+            hash="sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995"/>
   </autotools>
-  <autotools id="expat" autogen-sh="configure">
-    <branch module="expat/expat-2.2.9.tar.bz2" version="2.2.9"
-            repo="sourceforge"/>
-  </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,
@@ -117,14 +122,15 @@
   -->
   <autotools id="gtk-osx-docbook" autogen-sh="configure"
              supports-non-srcdir-builds="no" >
-    <branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.2.tar.bz2"
-            version="1.2"/>
+   <branch repo="github" module="jralls/gtk-osx-docbook/releases/download/gtk-osx-docbook-1.3/gtk-osx-docbook-1.3.tar.xz"
+            version="1.3"
+            hash="sha256:fcf497688a1d531b192301bd09c55adefda5a662729a58eb8a895166e38ef219"/>
   </autotools>
<autotools id="intltool" autogen-sh="configure">
     <branch repo="intltool" module="0.51.0/+download/intltool-0.51.0.tar.gz"
             version="0.51.0"
-            hash="md5:12e517cac2b57a0121cda351570f1e63"/>
+            hash="sha256:67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"/>
     <!--dependencies>
       <dep package="perl-xml-parser"/>
     </dependencies-->
@@ -135,7 +141,6 @@
       <dep package="xz"/>
       <dep package="gettext" /> <!-- Needed for 64-bit -->
       <dep package="cmake"/>
-      <dep package="autoconf" />
       <dep package="autoconf-archive" />
       <dep package="libtool" />
       <dep package="automake"/>
Modified: modulesets-stable/gtk-osx-bootstrap.modules
78 lines changed, 23 insertions(+), 55 deletions(-)
===================================================================
@@ -4,7 +4,7 @@
 <moduleset>
<repository type="tarball" name="ftp.gnome.org" default="yes"
-              href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
+              href="http://download.gnome.org/sources/%22/%3E
   <repository type="tarball" name="ftp.gnu.org" href="https://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"/>
@@ -20,14 +20,6 @@
               href="https://gitlab.gnome.org/GNOME%22/%3E
   <repository type="tarball" name="itstool" href="http://files.itstool.org/"/>
   <repository type="tarball" name="github-tarball" href="https://github.com/"/>
-  <repository type="tarball" name="ragel"
-              href="http://www.colm.net/files/ragel/%22/%3E
-
-  <autotools id='readline' autogen-sh="configure">
-    <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.37" module="libpng/libpng-1.6.37.tar.xz"
@@ -40,15 +32,15 @@
<autotools id="libjpeg" autogen-sh="configure">
     <branch module="jpegsrc.v9d.tar.gz" version="9d"
-            repo="jpeg"
-            checkoutdir="jpeg-9d">
+            repo="jpeg" checkoutdir="jpeg-9d"
+            hash="sha256:6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee">
     </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">
+    <branch version="4.2.0" module="libtiff/tiff-4.2.0.tar.gz"
+            repo="libtiff"
+            hash="sha256:eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb">
    <patch file="https://raw.githubusercontent.com/totaam/gtk-osx-build/master/patches/tiff-nohtml.patch" strip="1" />
     </branch>
     <dependencies>
@@ -64,11 +56,13 @@
<autotools id="libxml2" autogen-sh="configure"
              autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
-    <branch version="2.9.9" module="libxml2-2.9.9.tar.gz"
-            hash="sha256:94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"
-	    repo="xmlsoft.org"/>
+    <branch version="2.9.10" module="libxml2-2.9.10.tar.gz"
+            repo="xmlsoft.org"
+            hash="sha256:aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f">
+      <patch file="libxml2.9.10-conditional-parentheses.patch" strip="1"/>            
+    </branch>
     <after>
-      <dep package="python"/>
+      <dep package="python2"/>
       <dep package="python3"/>
     </after>
   </autotools>
@@ -84,67 +78,41 @@
<autotools id="itstool" autogen-sh="configure">
     <branch module="itstool/itstool-2.0.6.tar.bz2" version="2.0.6n"
-            repo="itstool">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/itstool-config-python.patch" strip="1"/>
+            repo="itstool"
+            hash="sha256:6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9">
+      <patch file="itstool-config-python.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
-  <autotools id="yelp-xsl">
-    <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"/>
-      <dep package="itstool"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="yelp-tools">
-    <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"/>
-      <dep package="itstool"/>
-      <dep package="yelp-xsl"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gtk-doc" autogen-sh="configure">
-    <branch version="1.32" module="gtk-doc/1.32/gtk-doc-1.32.tar.xz"
-            hash="sha256:de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"/>
+  <meson id="gtk-doc" mesonargs="-Dyelp_manual=false -Dtests=false">
+    <branch version="1.33.2" module="gtk-doc/1.33/gtk-doc-1.33.2.tar.xz"
+            hash="sha256:cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
       <dep package="itstool"/>
     </dependencies>
     <after>
       <dep package="python3"/>
+      <dep package="pygments"/>
     </after>
-  </autotools>
+  </meson>
<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="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"
-	     supports-non-srcdir-builds="no">
-    <branch module="hicolor-icon-theme-0.15.tar.xz" repo="icon-theme"
-            version="0.15"/>
+    <branch repo="github-tarball" version="68.2" checkoutdir="icu"
+            module="unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz"
+            hash="sha256:c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"/>
   </autotools>
<metamodule id="meta-gtk-osx-bootstrap">
     <dependencies>
       <dep package="libpng"/>
       <dep package="libjpeg"/>
       <dep package="libtiff"/>
-      <dep package="hicolor-icon-theme"/>
       <dep package="gtk-doc"/>
     </dependencies>
   </metamodule>
Modified: modulesets-stable/gtk-osx-gstreamer.modules
103 lines changed, 57 insertions(+), 46 deletions(-)
===================================================================
@@ -6,97 +6,108 @@
               href="http://gstreamer.freedesktop.org/src/%22/%3E
   <repository type="tarball" name="sourceforge"
               href="http://iweb.dl.sf.net/project/"/>
+  <repository type="tarball" name="ffmpeg"
+              href="https://ffmpeg.org/releases/%22/%3E
+  <repository type="tarball" name="nasm"
+              href="https://www.nasm.us/pub/nasm/releasebuilds/%22/%3E
-  <autotools id="liborc" autogen-sh="configure">
-    <branch module="orc/orc-0.4.28.tar.xz" version="0.4.28"
-            hash="sha256:bfcd7c6563b05672386c4eedfc4c0d4a0a12b4b4775b74ec6deb88fc2bcd83ce"/>
-  </autotools>
+  <meson id="liborc" mesonargs="-Dgtk_doc=disabled -Dbenchmarks=disabled -Dexamples=disabled -Dtests=disabled">
+    <branch module="orc/orc-0.4.32.tar.xz" version="0.4.32"
+            hash="sha256:a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0"/>
+  </meson>
<autotools id="faad2" autogen-sh="autoreconf"
              autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">
     <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.16.2.tar.xz" version="1.16.2"
-            hash="sha256:e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e">
+  <autotools id="nasm" autogen-sh="configure">
+    <branch repo="nasm" version="2.15.05"
+            module="2.15.05/nasm-2.15.05.tar.xz"
+            hash="sha256:3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f"/>
+  </autotools>
+
+  <autotools id="ffmpeg" autogen-sh="configure"
+             autogenargs="--enable-gpl --enable-version3 --enable-shared --disable-static --disable-runtime-cpudetect --disable-programs --disable-ffplay --disable-ffprobe --disable-doc"
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s"
+>
+    <branch repo="ffmpeg" version="4.3.2"
+            module="ffmpeg-4.3.2.tar.xz"
+            hash="sha256:46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"/>
+    <dependencies>
+      <dep package="nasm"/>
+    </dependencies>
+  </autotools>
+
+  <meson id="gstreamer">
+    <branch module="gstreamer/gstreamer-1.18.4.tar.xz" version="1.18.4"
+            hash="sha256:9aeec99b38e310817012aa2d1d76573b787af47f8a725a65b833880a094dfbc5">
     </branch>
     <after>
       <dep package="glib"/>
     </after>
-  </autotools>
+  </meson>
-  <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.16.2.tar.xz"
-            version="1.16.2"
-            hash="sha256:b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a"/>
+  <meson id="gst-plugins-base" mesonargs="-Dexamples=disabled -Ddoc=disabled">
+    <branch module="gst-plugins-base/gst-plugins-base-1.18.4.tar.xz"
+            version="1.18.4"
+            hash="sha256:29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="liborc"/>
     </dependencies>
     <after>
     </after>
-  </autotools>
+  </meson>
-  <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.16.2.tar.xz"
-            version="1.16.2"
-            hash="sha256:40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319">
+  <meson id="gst-plugins-good">
+    <branch module="gst-plugins-good/gst-plugins-good-1.18.4.tar.xz"
+            version="1.18.4"
+            hash="sha256:b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0">
     </branch>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
-  </autotools>
+  </meson>
-  <autotools id="gst-plugins-ugly" autogenargs="--disable-tests"
-             supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS="
-             autogen-sh="configure">
-    <branch version="1.16.2"
-            module="gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz"
-            hash="sha256:5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca"/>
+  <meson id="gst-plugins-ugly">
+    <branch version="1.18.4"
+            module="gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz"
+            hash="sha256:218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
-  </autotools>
+  </meson>
-  <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.16.2"
-            module="gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz"
-            hash="sha256:f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74"/>
+  <meson id="gst-plugins-bad">
+    <branch version="1.18.4"
+            module="gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz"
+            hash="sha256:74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="faad2"/>
       <dep package='openssl'/>
     </dependencies>
-  </autotools>
+  </meson>
-  <!-- disable-yasm: gst-libav's version of libav requires yasm 0.8.0 or nasm
-  2.0.3; OSX 10.9 has nasm 0.98.40 -->
-  <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.16.2"
-             module="gst-libav/gst-libav-1.16.2.tar.xz"
-             hash="sha256:c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"/>
+  <meson id="gst-libav">
+     <branch version="1.18.4"
+             module="gst-libav/gst-libav-1.18.4.tar.xz"
+             hash="sha256:344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
+      <dep package="ffmpeg"/>
     </dependencies>
-  </autotools>
+  </meson>
-  <metamodule id="meta-gstreamer">
+  <metamodule id="meta-gtk-osx-gstreamer">
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
Modified: modulesets-stable/gtk-osx-gtkmm.modules
154 lines changed, 96 insertions(+), 58 deletions(-)
===================================================================
@@ -9,104 +9,142 @@
   <repository type="tarball" name="cairographics"
               href="http://cairographics.org/releases/"/>
-  <metamodule id="meta-gtk-osx-gtkmm">
-    <dependencies>
-      <dep package="gtkmm"/>
-    </dependencies>
-  </metamodule>
-  <metamodule id="meta-gtk-osx-gtkmm3">
+  <meson id="mm-common">
+    <branch module="mm-common/1.0/mm-common-1.0.2.tar.xz" version="1.0.2"
+            hash="sha256:a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d"/>
+  </meson>
+
+  <!-- Libsigc++ was rewritten to use C++17 variadic templates for version 3, and adopting that has created substantial API breaks for the whole "mm" stack. gtkmm2 and gtkmm3 use the older versions, gtkmm4 the new ones.
+       Note that C++17 is supported only on macOS-10.13 and later.
+  -->
+ <meson id="cairomm-1.14">
+   <branch module="cairomm-1.14.2.tar.xz" version="1.14.2"
+           repo="cairographics"
+           hash="sha256:0126b9cc295dc36bc9c0860d5b720cb5469fd78d5620c8f10cc5f0c07b928de3"/>
     <dependencies>
-      <dep package="gtkmm3"/>
+      <dep package="cairo"/>
     </dependencies>
-  </metamodule>
-
-  <autotools id="mm-common" autogen-sh="configure">
-    <branch module="mm-common/0.9/mm-common-0.9.12.tar.xz" version="0.9.12"
-            hash="sha256:ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b"/>
-  </autotools>
+ </meson>
-  <!-- Cairomm 1.15 has been around since the end of 2016 but they
-       renamed their pc files because of an ABI change and neither
-       pangomm nor gtkmm have adopted the new pc files, so stay with
-       cairomm-1.13. -->
-  <autotools id="cairomm" autogen-sh="configure">
-    <branch module="cairomm-1.13.1.tar.gz" version="1.13.1"
-	    hash="sha1:63cd9eab40686f368a8edd3e6912ac18b3048ecf"
-            repo="cairographics">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/cairomm-Bug-100894-Cairomm-compile-failure-if-no-cairo-ft.patch" strip="1"/>
-    </branch>
+  <meson id="cairomm">
+    <branch module="cairomm-1.16.0.tar.xz" version="1.16.0"
+            repo="cairographics"
+            hash="sha256:7e881492c5f9f546688c31160deb742c166fc4c68b6b8eb9920c00a0f0f144f9"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
-  </autotools>
+  </meson>
-  <autotools id="glibmm" autogen-sh="autoreconf">
+ <autotools id="glibmm-2.4" autogen-sh="autoreconf">
     <branch module="glibmm/2.60/glibmm-2.60.0.tar.xz" version="2.60.0"
-            hash="sha256:a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc">
-    </branch>
+            hash="sha256:a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsigc++2"/>
       <dep package="mm-common"/>
     </dependencies>
-  </autotools>
+ </autotools>
+ 
+ <meson id="glibmm">
+    <branch module="glibmm/2.68/glibmm-2.68.0.tar.xz" version="2.68.0"
+            hash="sha256:c1f38573191dceed85a05600888cf4cf4695941f339715bd67d51c2416f4f375">
+    </branch>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsigc++3"/>
+      <dep package="mm-common"/>
+    </dependencies>
+  </meson>
-  <autotools id="pangomm" autogen-sh="configure">
-    <branch module="pangomm/2.42/pangomm-2.42.0.tar.xz" version="2.42.0"
-            hash="sha256:ca6da067ff93a6445780c0b4b226eb84f484ab104b8391fb744a45cbc7edbf56"/>
+   <meson id="pangomm-1.4">
+     <branch module="pangomm/2.42/pangomm-2.42.2.tar.xz" version="2.42.2"
+             hash="sha256:1b24c92624ae1275ccb57758175d35f7c39ad3342d8c0b4ba60f0d9849d2d08a"/>
+     <dependencies>
+      <dep package="glibmm-2.4"/>
+      <dep package="cairomm-1.14"/>
+      <dep package="pango"/>
+    </dependencies>
+   </meson>
+
+  <meson id="pangomm">
+    <branch module="pangomm/2.48/pangomm-2.48.0.tar.xz" version="2.48.0"
+            hash="sha256:9e0ed474c33f8c2002ca9e2b61ca0d1f3d8e409e09e99f4d8c19eeafccf55b78"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
       <dep package="pango"/>
     </dependencies>
-  </autotools>
+  </meson>
-  <autotools id="atkmm" autogen-sh="configure">
-    <branch module="atkmm/2.28/atkmm-2.28.0.tar.xz" version="2.28.0"
-	    hash="sha256:4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a"/>
+  <meson id="atkmm-1.6">
+    <branch module="atkmm/2.28/atkmm-2.28.1.tar.xz" version="2.28.1"
+            hash="sha256:116876604770641a450e39c1f50302884848ce9cc48d43c5dc8e8efc31f31bad"/>
+    <dependencies>
+      <dep package="glibmm-2.4"/>
+      <dep package="cairomm-1.14"/>
+      <dep package="pangomm-1.4"/>
+      <dep package="atk"/>
+    </dependencies>
+  </meson>
+
+  <meson id="atkmm">
+    <branch module="atkmm/2.36/atkmm-2.36.0.tar.xz" version="2.36.0"
+	    hash="sha256:c93fa9f3876536391b54c307a923b7788e79796ace69a5e9141d67398c019973"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atk"/>
     </dependencies>
-  </autotools>
+  </meson>
-<!-- libsigc++ depends on doxygen for documentation, but doxygen
-     doesn't build correctly under gtk-osx. It builds fine on its own,
-     of course, and there are OSX binaries available on their
-     website. If you want the docs, install it separately and renable
-     documentation in your jhbuildrc-custom. -->
-  <autotools id="libsigc++2" autogen-sh="configure"
-	     autogenargs="--disable-documentation">
-    <branch module="libsigc++/2.10/libsigc++-2.10.2.tar.xz" version="2.10.2"
-            hash="sha256:b1ca0253379596f9c19f070c83d362b12dfd39c0a3ea1dd813e8e21c1a097a98"/>
+  <meson id="libsigc++2" >
+    <branch module="libsigc++/2.10/libsigc++-2.10.6.tar.xz" version="2.10.6"
+            hash="sha256:dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b"/>
+  </meson>
+
+  <meson id="libsigc++3" >
+    <branch module="libsigc++/3.0/libsigc++-3.0.6.tar.xz" version="3.0.6"
+            hash="sha256:b70edcf4611651c54a426e109b17196e1fa17da090592a5000e2d134c03ac5ce"/>
+  </meson>
+
+  <autotools id="gtkmm2" autogen-sh="configure">
+    <branch module="gtkmm/2.24/gtkmm-2.24.5.tar.xz" version="2.24.5"
+            hash="sha256:0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"/>
+    <dependencies>
+      <dep package="glibmm-2.4"/>
+      <dep package="cairomm-1.14"/>
+      <dep package="pangomm-1.4"/>
+      <dep package="atkmm-1.6"/>
+      <dep package="gtk+-2.0"/>
+    </dependencies>
   </autotools>
-  <autotools id="gtkmm3" autogen-sh="configure">
-    <branch module="gtkmm/3.24/gtkmm-3.24.1.tar.xz" version="3.24.1"
-            hash="sha256:ddfe42ed2458a20a34de252854bcf4b52d3f0c671c045f56b42aa27c7542d2fd">
+  <meson id="gtkmm3" >
+    <branch module="gtkmm/3.24/gtkmm-3.24.4.tar.xz" version="3.24.4"
+            hash="sha256:9beb71c3e90cfcfb790396b51e3f5e7169966751efd4f3ef9697114be3be6743">
+      <patch file="gtkmm-3-bad-const-property-background.patch" strip="1"/>
     </branch>
     <dependencies>
-      <dep package="glibmm"/>
-      <dep package="cairomm"/>
-      <dep package="pangomm"/>
-      <dep package="atkmm"/>
+      <dep package="glibmm-2.4"/>
+      <dep package="cairomm-1.14"/>
+      <dep package="pangomm-1.4"/>
+      <dep package="atkmm-1.6"/>
       <dep package="gtk+-3.0"/>
     </dependencies>
-  </autotools>
+  </meson>
-  <autotools id="gtkmm" autogen-sh="configure">
-    <branch module="gtkmm/2.24/gtkmm-2.24.5.tar.xz" version="2.24.5"
-            hash="sha256:0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"/>
+  <meson id="gtkmm4">
+    <branch module="gtkmm/4.0/gtkmm-4.0.1.tar.xz" version="4.0.1"
+            hash="sha256:8973d9bc7848e02cb2051e05f3ee3a4baffe2feb4af4a5487f0e3132eec03884"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
-      <dep package="gtk+"/>
+      <dep package="gtk-4.0"/>
     </dependencies>
-  </autotools>
+  </meson>
</moduleset>
Modified: modulesets-stable/gtk-osx-javascript.modules
45 lines changed, 24 insertions(+), 21 deletions(-)
===================================================================
@@ -5,7 +5,8 @@
<repository type="tarball" name="ftp.gnome.org" default="yes"
               href="http://ftp.gnome.org/pub/GNOME/sources/"/>
-  <repository type="tarball" name="mozilla" href="ftp://ftp.mozilla.org/pub/"/>
+  <repository type="tarball" name="mozilla"
+              href="https://ftp.mozilla.org/pub/%22/%3E
<metamodule id="meta-gtk-osx-javascript">
     <dependencies>
@@ -18,38 +19,40 @@
     </after>
   </metamodule>
-  <autotools id="gjs" autogenargs="--enable-installed-tests">
-    <branch version="1.48.1" module="gjs/1.48/gjs-1.48.1.tar.xz"
-            hash="sha256:21198950472c3c8f4a4679b0292c663faed04b07ee5de026bfd19eaa4ed15a84">
+  <meson id="gjs" mesonargs="-Dinstalled_tests=true -Dskip_dbus_tests=true -Dskip_gtk_tests=true" >
+    <branch version="1.68.0" module="gjs/1.68/gjs-1.68.0.tar.xz"
+            hash="sha256:f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef">
+      <!-- Code coverage depends on a non-existant function in a non-existant header. -->
+      <patch file="gjs-remove-js::CodeCoverage.patch" strip="1"/>
+
     </branch>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="js24"/>
+      <dep package="spidermonkey"/>
     </dependencies>
-  </autotools>
+  </meson>
-  <autotools id="js24" autogen-sh="configure"
-             autogenargs="--with-system-nspr --with-system-zlib --enable-system-ffi --enable-threadsafe">
-    <branch repo="mozilla" module="js/mozjs-24.2.0.tar.bz2" version="24.2.0"
-            checkoutdir="js24-24.2.0" source-subdir="js/src"
-            hash="sha1:ce779081cc11bd0c871c6f303fc4a0091cf4fe66"/>
+  <autotools id="spidermonkey" autogen-sh="configure"
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s"
+             autogenargs="--with-system-nspr --with-system-icu --disable-jemalloc --with-intl-api --enable-optimize --enable-coverage">
+    <branch repo="mozilla" version="78.1.0" 
+            checkoutdir="firefox-78.1.0" source-subdir="js/src"
+            module="firefox/releases/78.1.0esr/firefox-78.1.0esr.source.tar.xz" 
+            hash="sha256:3600a396d9312c5e9f637b267926ca4771d84a56b26b960cc7d72e98683b64a2">
+      <patch file="firefox78-rust-manifest-and-max-sdk.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libffi"/>
+      <dep package="icu"/>
       <dep package="nspr"/>
     </dependencies>
-    <after>
-      <dep package="python"/>
-      <dep package="zlib"/>
-    </after>
   </autotools>
-  <autotools id="nspr" autogen-sh="mozilla/nsprpub/configure"
+  <autotools id="nspr" autogen-sh="configure"
              autogenargs="--enable-64bit" check-target="false">
-    <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"/>
+    <branch repo="mozilla" version="4.30" source-subdir="nspr"
+            module="nspr/releases/v4.30/src/nspr-4.30.tar.gz"
+            href="sha256:8d4cd8f8409484dc4c3d31e180354bfc506573eccf86cd691106a1ef7edc913b">
     </branch>
   </autotools>
Modified: modulesets-stable/gtk-osx-network.modules
259 lines changed, 128 insertions(+), 131 deletions(-)
===================================================================
@@ -10,21 +10,13 @@
               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='gnupg.org' type='tarball' href="https://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="github-tarball" href="https://github.com/"/>
-  <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
-  <metamodule id="meta-gtk-osx-webkit">
-    <dependencies>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="webkit"/>
-    </dependencies>
-  </metamodule>
-
   <!-- Builds latest stable version of WebKitGTK for GTK 3.x -->
   <metamodule id="meta-gtk-osx-webkit-gtk3">
     <dependencies>
@@ -38,77 +30,146 @@
   <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.1g.tar.gz" version="1.1.1g" repo="openssl"
-            hash="sha256:ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46"/>
+    <branch module="openssl-1.1.1k.tar.gz" version="1.1.1k" repo="openssl"
+            hash="sha256:892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5"/>
   </autotools>
<!-- Rudely demands TeX to build documentation -->
   <autotools id="libnettle" autogen-sh="configure"
              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 repo="ftp.gnu.org" version="3.7.2"
+            module="nettle/nettle-3.7.2.tar.gz"
+            hash="sha256:8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162">
     </branch>
     <dependencies>
       <dep package="gmp"/>
       <dep package="openssl"/>
     </dependencies>
   </autotools>
-  <autotools id="libtasn1" supports-non-srcdir-builds="no"
-             autogen-sh="configure">
-    <branch repo="ftp.gnu.org" version="4.15.0"
-            module="libtasn1/libtasn1-4.15.0.tar.gz"
-            hash="sha256:dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" />
+  <autotools id="libtasn1" autogen-sh="configure">
+    <branch repo="ftp.gnu.org" version="4.17.0"
+            module="libtasn1/libtasn1-4.17.0.tar.gz"
+            hash="sha256:ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5">
+      <patch file="libtasn1-inline-fix.patch" strip="1"/>
+    </branch>
   </autotools>
<autotools id="zlib" autogen-sh="configure" skip-autogen="never"
              supports-non-srcdir-builds="no">
     <branch repo="sourceforge" version="1.2.11"
-            module="libpng/zlib-1.2.11.tar.xz"/>
+            module="libpng/zlib-1.2.11.tar.xz"
+            hash="sha256:4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"/>
   </autotools>
-  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
-  <autotools id="gnutls" autogen-sh="autoreconf"
-             autogenargs="--disable-gtk-doc-html --without-p11-kit">
-    <branch repo="gnutls" version="3.6.14"
-            hash="sha256:5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63"
-            module="gcrypt/gnutls/v3.6/gnutls-3.6.14.tar.xz">
+  <autotools id="p11-kit" autogen-sh="configure"
+             autogenargs="--without-trust-paths">
+    <branch repo="github-tarball" version="0.23.22"
+            module="p11-glue/p11-kit/releases/download/0.23.22/p11-kit-0.23.22.tar.xz"
+            hash="sha256:8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6">
     </branch>
     <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.8.6"
-            hash="sha256:626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc"
-            module="gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2"/>
+  <if condition-unset="pre-Mavericks">
+    <autotools id="gnutls" autogen-sh="autoreconf"
+               autogenargs="--disable-gtk-doc-html --with-included-unistring">
+      <branch repo="gnupg.org" version="3.7.1"
+              module="gcrypt/gnutls/v3.7/gnutls-3.7.1.tar.xz"
+              hash="sha256:3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f">
+      </branch>
+      <dependencies>
+        <dep package="libnettle"/>
+        <dep package="libtasn1"/>
+        <dep package="zlib"/>
+        <dep package="p11-kit"/>
+      </dependencies>
+    </autotools>
+  </if>
+
+  <autotools id="libgpg-error" autogen-sh="autoreconf"
+             autogenargs="--disable-doc">
+    <branch repo="gnupg.org" version="1.42"
+            module="gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2"
+            hash="sha256:fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23">
+    </branch>
+  </autotools>
+
+ <autotools id="libgcrypt" autogen-sh="configure">
+    <branch repo="gnupg.org" version="1.9.2"
+            module="gcrypt/libgcrypt/libgcrypt-1.9.2.tar.bz2"
+            hash="sha256:b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a"/>
+    <dependencies>
+      <dep package="libgpg-error"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gpg" autogen-sh='configure'>
+    <branch repo="gnupg.org" version="2.2.27"
+            module="gcrypt/gnupg/gnupg-2.2.27.tar.bz2"
+            />
+    <dependencies>
+      <dep package="libgpg-error"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </autotools>
+  
+  <meson id="libsecret" mesonargs="-Dvapi=disabled -Dgtk_doc=disabled">
+    <branch version="0.20.4"
+            module="libsecret/0.20/libsecret-0.20.4.tar.xz"
+            />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </meson>
+
+  <meson id="gcr">
+    <branch version="3.38"
+            module="gcr/3.38/gcr-3.38.1.tar.xz"
+            />
+    <dependencies>
+      <dep package="p11-kit"/>
+      <dep package="gpg"/>
+      <dep package="libsecret"/>
+      <dep package="glib"/>
+    </dependencies>
+  </meson>
+  
+  <autotools id="gnome-keyring"
+             autogenargs="--disable-pam --without-root-certs">
+    <branch module="gnome-keyring/40/gnome-keyring-40.0.tar.xz"
+            version="40.0"
+            />
+    <dependencies>
+      <dep package="libgcrypt"/>
+      <dep package="gcr"/>
+    </dependencies>
   </autotools>
<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"/>
+    <branch module="glib-networking/2.68/glib-networking-2.68.0.tar.xz"
+            version="2.68.0"
+            hash="sha256:0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e"/>
     <dependencies>
-      <dep package="gnutls"/>
+      <if condition-unset="pre-Mavericks">
+        <dep package="gnutls"/>
+      </if>
       <dep package="glib"/>
     </dependencies>
   </meson>
<autotools id="libpsl" autogen-sh='configure'>
     <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"/>
+            module="rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz"
+            hash="sha256:ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c"/>
   </autotools>
<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 module="libsoup/2.72/libsoup-2.72.0.tar.xz" version="2.72.0"
+            hash="sha256:170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387">
     </branch>
     <dependencies>
       <dep package="libpsl"/>
@@ -121,114 +182,50 @@
   </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"/>
-  </autotools>
-
-  <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="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.
-    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
-    disable-credential-storage: Requires libsecret. No module for this yet.
-    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
-    disable-video, disable-web-audio: Requires gstreamer. If you want video and
-      audio, add this to your .jhbuildrc:
-      append_autogenargs('WebKit', '&#45;-enable-video')
-      append_autogenargs('WebKit', '&#45;-enable-web-audio')
-      -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
-
-   It has some issues with ICU 58 so we keep it on ICU55. Note that
-   you can't install both, so if you need to build this webkit add icu
-   to your skip-list.
-  -->
-  <autotools id="webkit" autogen-sh="autoreconf"
-             autogenargs="--enable-quartz-target --with-gtk=2.0 --disable-webkit2 --disable-credential-storage --disable-geolocation --disable-video --disable-web-audio CXXFLAGS='-stdlib=libc++'">
-
-    <branch repo="webkit.org" module="webkitgtk-2.4.11.tar.xz" version="2.4.11">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/webkit-140167-disable-netscape-api.patch" strip="1"/>
-      <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
-      it's left in -->
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/webkit-133293-cfi-clang-failure.patch" strip="1"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/WebKit-2.4.11-fixups.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libwebp"/>
-      <dep package="enchant"/>
-      <dep package="icu55"/>
-      <dep package="libsoup"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-gtk"/>
-      <dep package="meta-gstreamer"/>
-    </after>
+    <branch repo="webm" module="webp/libwebp-1.2.0.tar.gz" version="1.2.0"
+            hash="sha256:2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c"/>
   </autotools>
-  <!-- This is WebKitGTK 2.4.x as above, but for gtk3.  -->
-  <autotools id="webkit1gtk3" autogen-sh="autoreconf"
-             autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 --disable-credential-storage --disable-geolocation --disable-video --disable-web-audio CXXFLAGS='-stdlib=libc++'"
-             makeargs="-j1" >
-    <branch repo="webkit.org" module="webkitgtk-2.4.11.tar.xz" version="2.4.11">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/webkit-140167-disable-netscape-api.patch" strip="1"/>
-      <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
-      it's left in -->
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/webkit-133293-cfi-clang-failure.patch" strip="1"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/WebKit-2.4.11-fixups.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libwebp"/>
-      <dep package="enchant"/>
-      <dep package="icu55"/>
-      <dep package="libsoup"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-gtk3.14"/>
-      <dep package="meta-gstreamer"/>
-    </after>
-  </autotools>
<!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
-      the WebKit2 API (most applications do.)
+      the WebKit2 API.
     ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
       library is working correctly: run "jhbuild run MiniBrowser".
-    ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
-      supported.
+    USE_SYSTEMD: macOS doesn't have systemd.
     ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
       audio, fix this in your .jhbuildrc-custom. You may need some extra
       patches, this is untested.
-    ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
-    ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
-    ENABLE_OPENGL: Known to not work with Quartz.
-    USE_LIBNOTIFY: Requires libnotify. No module for this yet.
-    USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
-  -->
+    ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this.
+    ENABLE_GEOLOCATION: Requires geoclue. No module for this.
+    ENABLE_GRAPHICS_CONTEXT_GL: Known to not work with quartz.
+    ENABLE_GAMEPAD: Requires an extra dependency, libmannette.
+    USE_LIBNOTIFY: Requires libnotify. No module for this.
+    USE_LIBHYPHEN: Requires libhyphen. No module for this.
+    USE_LIBSECRET: Requires libsecret. No module for this.
+    ENABLE_TOUCH_EVENTS: Seems not to be needed.
+    USE_OPENJPEG: Requires openjpeg. No module for this.
+    USE_WOFF2: Requires Woff2. No module for this
+    USE_WPE_RENDERER: For embedded systems, not Macs.  -->
   <cmake id="webkit2gtk3"
-         cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_INTROSPECTION=OFF  -DENABLE_OPENGL=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF -DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF -DENABLE_TOUCH_EVENTS=OFF  -DUSE_OPENJPEG=OFF -DUSE_WOFF2=OFF -DUSE_WPE_RENDERER=OFF -DENABLE_GRAPHICS_CONTEXT_GL=OFF -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_MACOSX_RPATH=OFF'>
-    <branch repo="webkit.org" module="webkitgtk-2.28.2.tar.xz" version="2.28.2">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-webkit2gtk-macports.diff" strip="0"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-webkit2gtk-272-macports.diff" strip="0"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-webkit2gtk-2282-unprotected-egl-changes.diff" strip="0"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-webkit2gtk-2282-os-log-availability.diff" strip="0"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/patch-bundle-link-webcore.diff" strip="0"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/webkit-clang-fixes.patch" strip="0"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/0001-Prevent-WebKitWebProcess-from-being-in-the-dock-or-p.patch" strip="1"/>
+         cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_MINIBROWSER=ON -DENABLE_INTROSPECTION=ON  -DUSE_SYSTEMD=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF -DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF -DENABLE_TOUCH_EVENTS=OFF  -DUSE_OPENJPEG=OFF -DUSE_WOFF2=OFF -DUSE_WPE_RENDERER=OFF -DENABLE_GRAPHICS_CONTEXT_GL=OFF -DENABLE_GAMEPAD=OFF -DUSE_APPLE_ICU=NO -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_MACOSX_RPATH=OFF'>
+    <branch repo="webkit.org" module="webkitgtk-2.32.0.tar.xz" version="2.32.0"
+            hash="sha256:9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0">
+      <patch file="WebKit2Gtk3-2.32.0-cumulative.patch" strip="1"/>
+      <patch file="WebKit2Gtk3-2.30.1-Disable-AUDIT_TOKEN-for-Gtk-builds.patch" strip="1"/>
+      <patch file="WebKit2Gtk3-2.30.1-Fix-Socket-signal-defines-for-Darwin-and-maybe-BSD.patch" strip="1"/>
+      <patch file="WebKit2Gtk3-2.32.0-color-components-correct-math-header.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="libwebp"/>
       <dep package="enchant"/>
       <dep package="icu"/>
       <dep package="libsoup"/>
       <dep package="libgcrypt"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-gtk3.14"/>
-      <dep package="meta-gstreamer"/>
+      <dep package="meta-gtk-osx-gstreamer"/>
     </after>
   </cmake>
+ 
 </moduleset>
Modified: modulesets-stable/gtk-osx-obsolete.modules
264 lines changed, 264 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="tarball" name="ftp.gnome.org" default="yes"
+              href="http://download.gnome.org/sources/%22/%3E
+  <repository type="tarball" name="tango.freedesktop.org"
+              href="http://tango.freedesktop.org/releases/%22/%3E
+  <repository type="tarball" name="icon-theme.freedesktop.org"
+	      href="http://icon-theme.freedesktop.org/releases%22/%3E
+
+  <!--
+      OBSOLETE PACKAGES
+
+      The following packages are no longer maintained and are provided
+      solely to support projects that have failed to
+      modernize. Developers/packagers using these modules are advised
+      to copy this moduleset into their project because this file
+      along with all of these modules will be removed at the next
+      regular update.
+
+      These modules successfully built on macOS at one point, but they
+      are no longer tested and may or may not build on newer macOS
+      versions or with newer compilers. If you use them you're on your
+      own for working out patches needed to keep building them in your
+      environment.
+  -->
+
+  <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
+  <metamodule id="meta-gtk-osx-webkit-gtk2">
+    <dependencies>
+      <dep package="meta-gtk-osx-gtk2"/>
+      <dep package="webkit1gtk2"/>
+    </dependencies>
+  </metamodule>
+
+  <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="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.
+    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
+    disable-credential-storage: Requires libsecret. No module for this yet.
+    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
+    disable-video, disable-web-audio: Requires gstreamer. If you want video and
+      audio, add this to your .jhbuildrc:
+      append_autogenargs('WebKit', '&#45;-enable-video')
+      append_autogenargs('WebKit', '&#45;-enable-web-audio')
+      -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
+
+   It has some issues with ICU 58 so we keep it on ICU55. Note that
+   you can't install both, so if you need to build this webkit add icu
+   to your skip-list.
+  -->
+  <autotools id="webkit1gtk2" autogen-sh="autoreconf"
+             autogenargs="--enable-quartz-target --with-gtk=2.0 --disable-webkit2 --disable-credential-storage --disable-geolocation --disable-video --disable-web-audio CXXFLAGS='-stdlib=libc++'">
+
+    <branch repo="webkit.org" module="webkitgtk-2.4.11.tar.xz" version="2.4.11"
+            hash="sha256:588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7">
+      <patch file="webkit-140167-disable-netscape-api.patch" strip="1"/>
+      <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
+      it's left in -->
+      <patch file="webkit-133293-cfi-clang-failure.patch" strip="1"/>
+      <patch file="WebKit-2.4.11-fixups.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="libwebp"/>
+      <dep package="enchant"/>
+      <dep package="icu55"/>
+      <dep package="libsoup"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-gtk2
+"/>
+      <dep package="meta-gstreamer"/>
+    </after>
+  </autotools>
+  <autotools id="libunique" autogen-sh="configure"
+             autogenargs="--without-x --disable-dbus">
+    <branch module="libunique/3.0/libunique-3.0.2.tar.bz2" version="3.0.2"
+            hash="sha256:a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038">
+      <patch file="libunique-663913-sockaddr-un.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="gtk+-2.0"/>
+    </dependencies>
+  </autotools>
+
+<!-- PyGObject 2.28 is the last series for Gtk+-2; for co-installation
+     with later versions it installs as pygobject2 and PyGObject 3
+     installs as pygobject3. Introspection is disabled here, because
+     gir-scanner isn't smart enough to co-install them. -->
+  <autotools id="pygobject2" autogen-sh="configure"
+	     autogenargs="--disable-introspection"
+	     supports-non-srcdir-builds="no">
+    <branch version="2.28.7" module="pygobject/2.28/pygobject-2.28.7.tar.xz"
+            hash="sha256:bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a">
+      <!-- remove all references to the missing gdestktopappinfo -->
+      <patch file="pygobject-gdesktopappinfo-missing.patch"
+                     strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="meta-gtk-osx-gtk2"/>
+    </dependencies>
+    <after>
+      <dep package="python2"/>
+    </after>
+  </autotools>
+
+<!-- Libglade's functions are now part of Gtk+ with different names and
+Libglade itself is deprecated. This is the last release. It's required by pygtk, another obsolete package.-->
+  <autotools id="libglade" autogen-sh='autoreconf'>
+    <branch module="libglade/2.6/libglade-2.6.4.tar.bz2" version="2.6.4"
+            hash="sha256:64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec">
+      <patch file="libglade-gmodule.patch" strip="1"/>
+    </branch>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-gtk2"/>
+    </after>
+  </autotools>
+
+<!-- Pygtk is discontinued, this is the last release -->
+ <autotools id="pygtk" autogen-sh="configure"
+	     autogenargs="CFLAGS=&quot;$CFLAGS -xobjective-c&quot; lt_cv_sys_global_symbol_pipe=&quot;'sed -n -e '''s/^.*[ ]([BCDEGRST][BCDEGRST]*)[ ][ ]*_([_A-Za-z][_A-Za-z0-9]*)$/\1 _\2 \2/p''' | sed '''/ __gnu_lto/d''''&quot;">
+    <branch version="2.24.0" module="pygtk/2.24/pygtk-2.24.0.tar.bz2"
+            hash="sha256:cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912">
+      <patch file="pygtk-libtool.patch" strip="1"/>
+      <patch file="pygtk-pango1.4x.patch" strip="1"/>
+      <patch file="pygtk-pango-decls.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="pygobject"/>
+      <dep package="meta-gtk-osx-gtk2"/>
+      <dep package="pycairo"/>
+    </dependencies>
+    <after>
+      <dep package="libglade"/>
+    </after>
+  </autotools>
+
+<!-- This is, I think, the last Gtk+2 version -->
+  <autotools id="devhelp" autogen-sh="autogen.sh">
+    <branch module="devhelp/2.32/devhelp-2.32.0.tar.bz2" version="2.32.0"
+            hash="sha256:61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4">
+      <patch file="devhelp-663789-gtkosxapplication.patch" strip="1"/>
+      <patch file="devhelp-646962-variable-name.patch" strip="1"/>
+    </branch>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-themes"/>
+      <dep package="meta-gtk-osx-gtk2"/>
+    </after>
+    <dependencies>
+      <dep package="webkit1gtk2"/>
+      <dep package="libunique"/>
+    </dependencies>
+  </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.5.tar.xz" version="3.8.5"
+            hash="sha256:58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735">
+      <patch file="Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch" strip="1"/>
+    </branch>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-themes"/>
+      <dep package="meta-gtk-osx-gtk2"/>
+    </after>
+  </autotools>
+
+  <!-- gtksourceview-2.10.5 is the last version that supports Gtk+-2 -->
+  <autotools id="gtksourceview" autogen-sh="configure">
+    <branch module="gtksourceview/2.10/gtksourceview-2.10.5.tar.bz2"
+            version="2.10.5" hash="sha256:c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e">
+      <patch file="gtksourceview-664511-gtkosxapplication.patch" strip="1"/>
+    </branch>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-gtk2"/>
+    </after>
+  </autotools>
+
+<!-- Goocanvas-1 is for gtk+-2. -->
+  <autotools id="goocanvas" autogen-sh="configure">
+    <branch module="goocanvas/1.0/goocanvas-1.0.0.tar.bz2" version="1.0.0"
+	    hash="sha256:1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e"/>
+    <dependencies>
+      <dep package="gtk+-2.0"/>
+    </dependencies>
+  </autotools>
+
+<!-- Libart_lgpl is deprecated by gnome. This is probably the last release. -->
+  <autotools id="libart_lgpl">
+    <branch   module="libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2"
+	      version="2.3.21" hash="sha256:fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-gtk2"/>
+    </after>
+  </autotools>
+
+  <autotools id="gtkspell" autogen-sh="configure">
+    <branch module="gtkspell/gtkspell-2.0.16.tar.gz" repo="sourceforge"
+	    version="2.0.16"/>
+    <dependencies>
+      <dep package="enchant"/>
+    </dependencies>
+  </autotools>
+
+    <metamodule id="meta-gtk-osx-themes">
+    <dependencies>
+      <dep package="tango-icon-theme"/>
+      <dep package="icon-naming-utils"/>
+      <dep package="gtk-engines"/>
+    </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"
+            hash="md5:dd8108b56130b9eedc4042df634efa66"/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+    </after>
+  </autotools>
+
+  <autotools id="hicolor-icon-theme" autogen-sh="configure"
+	     supports-non-srcdir-builds="no">
+    <branch module="hicolor-icon-theme-0.17.tar.xz" repo="icon-theme"
+            version="0.17"/>
+  </autotools>
+
+  <autotools id="tango-icon-theme" autogenargs="--disable-icon-framing"
+             autogen-sh="configure">
+    <branch repo="tango.freedesktop.org" version="0.8.90"
+            module="tango-icon-theme-0.8.90.tar.gz"
+            hash="md5:0795895d2f20eddcbd2bffe94ed431a6"/>
+    <dependencies>
+      <dep package="icon-naming-utils"/>
+      <dep package="hicolor-icon-theme"/>
+    </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"/>
+    <after>
+      <dep package="meta-gtk-osx-gtk2"/>
+    </after>
+  </autotools>
+
+  <autotools id="murrine-engine" autogen-sh="configure">
+    <branch module="murrine/0.98/murrine-0.98.1.1.tar.bz2" version="0.98.1.1"
+	    hash="sha256:e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912"/>
+  </autotools>
+
+</moduleset>
Modified: modulesets-stable/gtk-osx-python.modules
156 lines changed, 53 insertions(+), 103 deletions(-)
===================================================================
@@ -16,19 +16,19 @@
   <repository type="tarball" name="github-tarball"
               href="https://github.com"/>
-  <metamodule id="meta-gtk-osx-python">
+  <metamodule id="meta-gtk-osx-python2-gtk2">
     <dependencies>
       <dep package="pycairo"/>
-      <dep package="pygobject"/>
+      <dep package="pygobject2"/>
       <dep package="pygtk"/>
       <dep package="gtk-mac-integration-python"/>
     </dependencies>
   </metamodule>
-  <metamodule id="meta-gtk-osx-python-gtk3">
+  <metamodule id="meta-gtk-osx-python2-gtk3">
     <dependencies>
       <dep package="pycairo"/>
-      <dep package="pygobject3"/>
+      <dep package="pygobject3-2"/>
       <dep package="gtk-mac-integration-python"/>
     </dependencies>
     <after>
@@ -49,145 +49,95 @@
     </after>
   </metamodule>
-<!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so that the nice prepended to the command doesn't eat the cd. -->
-  <autotools id="berkeleydb" autogen-sh="configure"
-	     supports-non-srcdir-builds="no"  makeargs="-C build_unix"
-	     autogen-template="cd .;cd build_unix; ../dist/%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s"
-	     makeinstallargs="-C build_unix install">
-
-    <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
-        repo="oracle" >
-      <patch file="https://raw.githubusercontent.com/narkoleptik/os-x-berkeleydb-patch/master/atomic.patch" strip='1'/>
-    </branch>
-  </autotools>
-
-  <!-- For out-of-source-tree builds (i.e., builddir is defined either
-       in .jhbuildrc-custom or passed as an option on the
-       command-line, the normal berkeleydb module will build in its
-       srcdir/build_unix directory. If you want to build it in the
-       build directory with most of the other modules, use this module
-       instead. -->
-  <autotools id="berkeleydb-nonsrctree" autogen-sh="configure"
-         autogen-template="%(srcdir)s/dist/%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s" >
-
-    <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
-        repo="oracle" >
-      <patch file="https://github.com/narkoleptik/os-x-berkeleydb-patch/raw/master/atomic.patch" strip='1'/>
-    </branch>
-  </autotools>
-
-  <autotools id="python" autogenargs="--enable-shared"
+  <!-- Python 2 end-of-life was 31 December 2020 and 2.7.18 was the last release. -->
+  <autotools id="python2" autogenargs="--enable-shared"
         supports-non-srcdir-builds="no" autogen-sh="autoreconf">
        <branch repo="python"
-               module="2.7.17/Python-2.7.17.tgz" version="2.7.17"
-               hash="sha256:f22059d09cdf9625e0a7284d24a13062044f5bf59d93a7f3382190dfa94cecde">
+               module="2.7.18/Python-2.7.18.tgz" version="2.7.18"
+               hash="sha256:da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814">
   <!-- related to https://bugs.python.org/issue11445 -->
-  <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/python-ldflags.patch" strip="1"/>
+  <patch file="python-ldflags.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package='readline'/>
     </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-      <dep package="berkeleydb-nonsrctree"/>
-    </after>
   </autotools>
<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"
-            />
+    <branch repo="python" module="3.9.2/Python-3.9.2.tar.xz" version="3.9.2"
+            hash="sha256:3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d"/>
     <dependencies>
       <dep package='readline'/>
       <dep package="openssl"/> <!-- For hashlib -->
     </dependencies>
   </autotools>
-  <distutils id="pybsddb">
-    <branch module="8d/9b/c3b01ff14e19254b2e031d8ae5ebe472e5523a47acc6f7d49300960d406d/bsddb3-6.2.4.tar.gz"
-	    hash="md5:eec77d104c5981366701c6b0de585504" repo="pymodules"
-	    version="6.2.4"/>
-    <dependencies>
-      <dep package="python3"/>
-    </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-      <dep package="berkeleydb-nonsrctree"/>
-    </after>
-  </distutils>
-
   <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"/>
+    <branch module="/pygobject/pycairo/releases/download/v1.20.0/pycairo-1.20.0.tar.gz" repo="github-tarball"
+            version="1.20.0"
+	    hash="sha256:5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
     <after>
       <dep package="python3"/>
-      <dep package="python"/>
+      <dep package="python2"/>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-gtk3.14"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </meson>
-<!-- PyGObject 2.28 is the last series for Gtk+-2; for co-installation
-     with later versions it installs as pygobject2 and PyGObject 3
-     installs as pygobject3. Introspection is disabled here, because
-     gir-scanner isn't smart enough to co-install them. -->
-  <autotools id="pygobject" autogen-sh="configure"
-	     autogenargs="--disable-introspection"
-	     supports-non-srcdir-builds="no">
-    <branch version="2.28.7" module="pygobject/2.28/pygobject-2.28.7.tar.xz"
-            hash="sha256:bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a">
-      <!-- remove all references to the missing gdestktopappinfo -->
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/pygobject-gdesktop..."
-                     strip="1"/>
-    </branch>
+  <!-- PyGObject 3.36 is the last version of PyGObject that supports
+       Python2. It's provided here for those laggards who haven't yet
+       migrated their projects to Python3. Don't expect it to stay
+       forever, migrate now! -->
+
+   <meson id="pygobject3-2" >
+    <branch version="3.36.1" module="pygobject/3.36/pygobject-3.36.1.tar.xz"
+	    hash="sha256:d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"/>
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="pycairo"/>
     </dependencies>
     <after>
-      <dep package="python"/>
+      <dep package="python2"/>
+      <dep package="python3"/>
     </after>
-  </autotools>
+   </meson>
-   <meson id="pygobject3" >
-    <branch version="3.32.2" module="pygobject/3.32/pygobject-3.32.2.tar.xz"
-	    hash="sha256:c39ca2a28364b57fa00549c6e836346031e6b886c3ceabfd8ab4b4fed0a83611"/>
+  <!-- PyGObject 3.36 is the last version of PyGObject that supports
+       Python2. It's provided here for those laggards who haven't yet
+       migrated their projects to Python3. Don't expect it to stay
+       forever, migrate now! -->
+
+   <meson id="pygobject3-2" >
+    <branch version="3.36.1" module="pygobject/3.36/pygobject-3.36.1.tar.xz"
+	    hash="sha256:d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"/>
     <dependencies>
       <dep package="pycairo"/>
     </dependencies>
     <after>
-      <dep package="python"/>
+      <dep package="python2"/>
       <dep package="python3"/>
     </after>
    </meson>
-<!-- Pygtk is discontinued, this is the last release -->
- <autotools id="pygtk" autogen-sh="configure"
-	     autogenargs="CFLAGS=&quot;$CFLAGS -xobjective-c&quot; lt_cv_sys_global_symbol_pipe=&quot;'sed -n -e '''s/^.*[ ]([BCDEGRST][BCDEGRST]*)[ ][ ]*_([_A-Za-z][_A-Za-z0-9]*)$/\1 _\2 \2/p''' | sed '''/ __gnu_lto/d''''&quot;">
-    <branch version="2.24.0" module="pygtk/2.24/pygtk-2.24.0.tar.bz2"
-            hash="sha256:cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/pygtk-libtool.patch" strip="1"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/pygtk-pango1.4x.patch" strip="1"/>
-    </branch>
+   <meson id="pygobject3" >
+    <branch version="3.40.1" module="pygobject/3.40/pygobject-3.40.1.tar.xz"
+	    hash="sha256:00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035"/>
     <dependencies>
-      <dep package="pygobject"/>
-      <dep package="meta-gtk-osx-core"/>
       <dep package="pycairo"/>
     </dependencies>
     <after>
-      <dep package="libglade"/>
+      <dep package="python3"/>
     </after>
-  </autotools>
+   </meson>
<autotools id="gtk-mac-integration-python" autogen-sh="configure"
              autogenargs="--enable-python">
-    <branch module="gtk-mac-integration/2.1/gtk-mac-integration-2.1.3.tar.xz"
-            version="2.1.3"
-            hash="sha256:d5f72302daad1f517932194d72967a32e72ed8177cfa38aaf64f0a80564ce454">
+    <branch module="gtk-mac-integration/3.0/gtk-mac-integration-3.0.1.tar.xz"
+            version="3.0.1"
+            hash="sha256:f19e35bc4534963127bbe629b9b3ccb9677ef012fc7f8e97fd5e890873ceb22d">
+      <patch file="gtk-mac-integration-work-around-svg-locale-bug.patch" strip="1"/>
     </branch>
     <dependencies>
     </dependencies>
@@ -197,13 +147,13 @@
     </after>
   </autotools>
-  <autotools id="pygtk-extras" autogen-sh="configure">
-    <branch module="gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2"
-	    version="2.25.3"/>
+  <distutils id="pygments">
+    <branch repo="pymodules" version="2.9.0"
+            module="ba/6e/7a7c13c21d8a4a7f82ccbfe257a045890d4dbf18c023f985f565f97393e3/Pygments-2.9.0.tar.gz">
+    </branch>
     <dependencies>
-      <dep package="pygtk"/>
-      <dep package="gtkspell"/>
+      <dep package="python3"/>
     </dependencies>
-  </autotools>
-
+  </distutils>
+  
 </moduleset>
Modified: modulesets-stable/gtk-osx-random.modules
372 lines changed, 144 insertions(+), 228 deletions(-)
===================================================================
@@ -3,320 +3,236 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
   <repository type="tarball" name="ftp.gnome.org" default="yes"
-              href="http://ftp.gnome.org/pub/GNOME/sources/%22/%3E
-
-  <repository type="tarball" name="ftp.gtk.org"
-              href="https://ftp.gtk.org/pub/%22/%3E
-  <repository type="tarball" name="hadess"
-              href="http://freedesktop.org/~hadess/%22/%3E
+              href="http://download.gnome.org/sources/%22/%3E
+  <repository type="tarball" name="github-tarball" href="https://github.com/"/>
+  <repository type="tarball" name="ftp.gnu.org" href="https://ftp.gnu.org/gnu/"/>
+  <repository type="tarball" name="shared-mime-info"
+              href="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/%22/%3E
+  <repository type="tarball" name="iso-codes"
+              href="https://salsa.debian.org/iso-codes-team/iso-codes/uploads/%22/%3E
   <repository type="tarball" name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"/>
-  <repository type="git" name="github.com" href="git://github.com/"/>
-  <repository type="tarball" name="github-tarball" href="https://github.com/"/>
-  <repository type="tarball" name="dbus.freedesktop.org"
-              href="http://dbus.freedesktop.org/releases/%22/%3E
+  <repository type="tarball" name="graphviz"
+              href="https://gitlab.com/graphviz/graphviz/-/archive/%22/%3E
   <repository type="tarball" name="sqlite" href="http://www.sqlite.org/"/>
-  <repository type="tarball" name="oracle"
-	      href="http://download.oracle.com/%22/%3E
-  <repository type="tarball" name="ftp.gnu.org"
-	      href="https://ftp.gnu.org/gnu/%22/%3E
-  <repository type="tarball" name="gmplib.org"
-	      href="ftp://ftp.gmplib.org/pub/"/>
-  <repository type="git" name="git.gnome.org"
-              href="https://gitlab.gnome.org/GNOME%22/%3E
-  <repository type="tarball" name="itstool"
-	      href="http://files.itstool.org/%22/%3E
-  <repository type="tarball" name="abisource/enchant"
-              href="http://www.abisource.com/downloads/enchant/%22/%3E
-
-  <metamodule id="meta-gtk-osx-random">
+  <repository type="tarball" name="frodo"
+              href="http://frodo.looijaard.name/system/files/software/%22/%3E
+  <repository type="tarball" name="paguire" href="https://releases.pagure.org/"/> 
+  <repository type="tarball" name="pcre" href="https://ftp.pcre.org/pub/"/>
+
+  <cmake id="graphviz">
+    <branch module="2.47.0/graphviz-2.47.0.tar.bz2" version="2.47.0"
+            repo="graphviz" 
+            hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714">
+      <patch file="graphviz-remove-rpath.patch" strip="1"/>
+    </branch>
     <dependencies>
-      <dep package="devhelp"/>
-      <dep package="shared-mime-info"/>
-      <dep package="gossip"/>
-      <dep package="vala"/>
-      <dep package="glade3"/>
+      <dep package="pango"/>
       <dep package="librsvg"/>
     </dependencies>
-  </metamodule>
-
-<!-- Libglade's functions are now part of Gtk+ with different names and
-Libglade itself is deprecated. This is the last release. -->
-  <autotools id="libglade" autogen-sh='autoreconf'>
-    <branch module="libglade/2.6/libglade-2.6.4.tar.bz2" version="2.6.4"
-            md5sum="d1776b40f4e166b5e9c107f1c8fe4139" >
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libglade-gmodule.patch" strip="1"/>
-    </branch>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
-  </autotools>
+  </cmake>
<autotools id="vala" autogen-sh="configure">
-    <branch repo="ftp.gnome.org" version="0.36.1"
-            module="vala/0.36/vala-0.36.1.tar.xz"
-            hash="sha256:13f4a3f99d983bf76e8d9dd736021ecc95f53ec1f9582423aa4b4be87455aa07"/>
+    <branch repo="ftp.gnome.org" version="0.52.0"
+            module="vala/0.52/vala-0.52.0.tar.xz"
+            hash="sha256:1de26310db465aca525679d3b5a3c1d8db2e067c4cbc0e5ddd015cd938bac68b"/>
+    <dependencies>
+      <dep package="graphviz"/>
+    </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
-
-  <autotools id="libunique" autogen-sh="configure"
-             autogenargs="--without-x --disable-dbus">
-    <branch module="libunique/3.0/libunique-3.0.2.tar.bz2" version="3.0.2"
-            hash="sha256:a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libunique-663913-sockaddr-un.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="gtk+"/>
-    </dependencies>
+  <autotools id="expat" autogen-sh="configure">
+    <branch module="expat/expat-2.3.0.tar.bz2" version="2.3.0"
+            repo="sourceforge"
+            hash="sha256:f122a20eada303f904d5e0513326c5b821248f2d4d2afbf5c6f1339e511c0586"/>
   </autotools>
-<!-- This is, I think, the last Gtk+2 version -->
-  <autotools id="devhelp" autogen-sh="autogen.sh">
-    <branch module="devhelp/2.32/devhelp-2.32.0.tar.bz2" version="2.32.0"
-            hash="sha256:61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/devhelp-663789-gtkosxapplication.patch" strip="1"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/devhelp-646962-variable-name.patch" strip="1"/>
+  <meson id="amtk" >
+    <branch module="amtk/5.3/amtk-5.3.1.tar.xz" version="5.3.1"
+            hash="sha256:d5aa236c5d71dc41aa4674f345560a67a27f21c0efc97c9b3da09cb582b4638b">
+      <patch file="amtk-build-on-macOS.patch" strip="1"/>
     </branch>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
     <dependencies>
-      <dep package="WebKit"/>
-      <dep package="libunique"/>
+      <dep package="gtk+-3.0"/>
     </dependencies>
-  </autotools>
+  </meson>
-  <autotools id="devhelp-gtk3" autogen-sh="configure">
-    <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"/>
-      <dep package="meta-gtk-osx-gtk3"/>
-    </after>
-    <dependencies>
+  <meson id="devhelp-gtk3">
+    <branch module="devhelp/3.38/devhelp-3.38.1.tar.xz" version="3.38.1"
+            hash="sha256:4da8f5951b3a5920df73d057beab3ebe1855a75eae41208a9d89305a6b114a8f">
+      <patch file="devhelp-3-build-on-macOS.patch" strip="1"/>
+    </branch>
+  <dependencies>
       <dep package="webkit2gtk3"/>
+      <dep package="amtk"/>
       <dep package="gsettings-desktop-schemas"/>
       <!-- Without shared-mime-info, HTML documents display as plain text -->
       <dep package="shared-mime-info"/>
     </dependencies>
-  </autotools>
+  </meson>
-<!-- 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.5.tar.xz" version="3.8.5"
-            hash="sha256:58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch" strip="1"/>
-    </branch>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
-  </autotools>
-
-<!-- Glade 3.10 is the first stable series for Gtk+-3. Note the name
-     change back to just "glade"-->
-  <autotools id="glade" autogen-sh="configure"
-	     autogenargs='--disable-scrollkeeper --disable-introspection CPPFLAGS="$CPPFLAGS -xobjective-c"'>
-    <branch module="glade/3.22/glade-3.22.1.tar.xz" version="3.22.1"
-            hash="sha256:dff89a2ef2eaf000ff2a46979978d03cb9202cb04668e01d0ea5c5bb5547e39a">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/glade-3.22.1-xslproc.patch" strip="1"/>
+  <meson id="glade" mesonargs="-Dmac_bundle=true -Dman=false" >
+    <branch module="glade/3.38/glade-3.38.2.tar.xz" version="3.38.2"
+            hash="sha256:98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7">
     </branch>
     <dependencies>
       <dep package="itstool"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-themes"/>
       <dep package="meta-gtk-osx-gtk3"/>
-    </after>
-  </autotools>
-
-<!-- gtksourceview-2.10.5 is the last version that supports Gtk+-2 -->
-  <autotools id="gtksourceview" autogen-sh="configure">
-    <branch module="gtksourceview/2.10/gtksourceview-2.10.5.tar.bz2"
-            version="2.10.5" hash="sha256:c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtksourceview-664511-gtkosxapplication.patch" strip="1"/>
+    </dependencies>
+  </meson>
+
+  <!-- gtksourceview got a major version ahead: 4.x.x supports recent versions of gtk+-3 and 5.x.x is for gtk4.
+  -->
+  <meson id="gtksourceview3" mesonargs="-Dvapi=false">
+    <branch module="gtksourceview/4.8/gtksourceview-4.8.1.tar.xz"
+            version="4.8.1"
+            hash="sha256:d163d71b5fcafbc5b1eec6dd841edbdbcddd3a7511cd5fdcffd86b8bbfe69ac1">
     </branch>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
-  </autotools>
+    <dependencies>
+      <dep package="gtk+-3.0"/>
+    </dependencies>
+  </meson>
+
+  <autotools id="libpcre2" autogen-sh="configure">
+    <branch repo="pcre" version="20.36"
+            module="pcre/pcre2-10.36.tar.bz2"
+            hash="sha256:a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c"/>
+  </autotools>
+  
+  <meson id="gtksourceview4">
+    <branch module="gtksourceview/5.0/gtksourceview-5.0.0.tar.xz"
+            version="5.0.0"
+            hash="sha256:64826633c0c8d2c6a6eb4ec653215ef04e31e13a2d4156a09ca5fd9013acd9c3">
+    </branch>
+    <dependencies>
+      <dep package="gtk-4"/>
+      <dep package="libpcre2"/>
+    </dependencies>
+  </meson>
-  <autotools id="gtksourceview3" autogen-sh="configure">
-    <branch module="gtksourceview/3.24/gtksourceview-3.24.4.tar.xz"
-            version="3.24.4" hash="sha256:207fb1958087d89393521eafac05f6dd67448ef6edb43ec2c708a79f3b1aa793">
+  <autotools id="frodo-getopt" autogen-sh="configure"
+             supports-non-srcdir-builds="no">
+    <branch repo="frodo" version="1.1.6" module="getopt/getopt-1.1.6.tar.gz"
+            hash="sha256:d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe">
+       <patch file="frodo-getopt-autotools.patch" strip="1"/>
     </branch>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-gtk3"/>
-    </after>
   </autotools>
-
-  <autotools id="lcms" autogen-sh="configure">
-    <branch module="lcms/lcms2-2.9.tar.gz" version="2.9" repo="sourceforge" />
+  <autotools id="xmlto" autogen-sh="autoreconf">
+    <branch module="xmlto/xmlto-0.0.28.tar.bz2"
+            version="0.0.28" repo="paguire"
+            hash="sha256:1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276">
+      <patch file="xmlto-allow-net-access.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="frodo-getopt"/>
+    </dependencies>
   </autotools>
-  <autotools id="shared-mime-info"  autogen-sh="configure"
-             autogenargs="--disable-default-make-check ac_cv_func_fdatasync=no"
-             supports-non-srcdir-builds="no" >
-    <branch module="shared-mime-info-1.9.tar.xz" version="1.9"
-            repo="hadess">
+  <meson id="shared-mime-info" supports-non-srcdir-builds="no" >
+    <branch module="0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz"
+            repo="shared-mime-info" version="2.1"
+            hash="sha256:b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563">
     </branch>
     <dependencies>
       <dep package="glib"/>
+      <dep package="xmlto"/>
     </dependencies>
-  </autotools>
+  </meson>
-  <autotools id="gsettings-desktop-schemas" autogen-sh="configure"
-             autogenargs="--enable-introspection=yes">
-    <branch module="gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz"
-            version="3.24.0"
-            hash="sha256:f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90"/>
+  <meson id="gsettings-desktop-schemas">
+    <branch module="gsettings-desktop-schemas/40/gsettings-desktop-schemas-40.0.tar.xz"
+            version="40.0"
+            hash="sha256:f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685"/>
     <dependencies>
       <dep package="gobject-introspection"/>
     </dependencies>
-  </autotools>
+  </meson>
-<!-- SQLite3 is provided by MacOSX in /usr/lib/libsqlite.3.dylib -->
+<!-- SQLite3 is also available from the macOS SDK -->
   <autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe"
         autogen-sh="configure">
-    <branch module="2017/sqlite-autoconf-3180000.tar.gz" version='3.18.0'
-	    repo="sqlite"/>
-  </autotools>
-
-<!-- Goocanvas-1 is for gtk+-2. -->
-  <autotools id="goocanvas" autogen-sh="configure">
-    <branch module="goocanvas/1.0/goocanvas-1.0.0.tar.bz2" version="1.0.0"
-	    hash="sha256:1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e"/>
-    <dependencies>
-      <dep package="gtk+"/>
-    </dependencies>
+    <branch module="2021/sqlite-autoconf-3350400.tar.gz" version='3.35.4'
+            repo="sqlite"
+            hash="sha256:7771525dff0185bfe9638ccce23faa0e1451757ddbda5a6c853bb80b923a512d"/>
   </autotools>
<!-- Goocanvas2 is for gtk+-3. -->
<autotools id="goocanvas2" supports-non-srcdir-builds="no">
-    <branch module="goocanvas/2.0/goocanvas-2.0.2.tar.xz" version="2.0.2"
-	    hash="sha256:f20e5fbef8d1a2633033edbd886dd13146a1b948d1813a9c353a80a29295d1d0"/>
-    <branch repo="git.gnome.org" module="goocanvas" checkoutdir="goocanvas2"/>
+    <branch module="goocanvas/2.0/goocanvas-2.0.4.tar.xz" version="2.0.4"
+	    hash="sha256:c728e2b7d4425ae81b54e1e07a3d3c8a4bd6377a63cffa43006045bceaa92e90"/>
     <after>
       <dep package="gtk+-3.0"/>
-      <dep package="gtk+-3.14"/>
     </after>
   </autotools>
-<!-- Libart_lgpl is deprecated by gnome. This is probably the last release. -->
-  <autotools id="libart_lgpl">
-    <branch   module="libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2"
-	      version="2.3.21" hash="sha256:fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"/>
+<!-- Goocanvas3 is for gtk-4. -->
+
+  <autotools id="goocanvas3" supports-non-srcdir-builds="no">
+    <branch module="goocanvas/3.0/goocanvas-3.0.0.tar.xz" version="3.0.0"
+	    hash="sha256:670a7557fe185c2703a14a07506156eceb7cea3b4bf75076a573f34ac52b401a"/>
     <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="gtk-4"/>
     </after>
   </autotools>
<autotools id="hunspell" autogen-sh="autoreconf">
-    <branch module="hunspell/hunspell/archive/v1.6.1.tar.gz" version="1.6.1"
-	    repo="github-tarball" checkoutdir="hunspell-1.6.1"/>
+    <branch module="hunspell/hunspell/archive/v1.7.0.tar.gz" version="1.7.0"
+            repo="github-tarball" checkoutdir="hunspell-1.7.0"
+            rename-tarball="hunspell-1.7.0.tar.gz"
+            hash="sha256:bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a"/>
   </autotools>
<autotools id="enchant" autogen-sh="configure"
-             autogenargs="--with-myspell-dir=/Library/Dictionaries">
-    <branch module="1.6.0/enchant-1.6.0.tar.gz" version="1.6.0"
-            repo="abisource/enchant">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/enchant-gsize.patc..."
-             strip="1"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/enchant-env.patch"
-             strip="1"/>
+             autogenargs="--enable-relocatable" >
+    <branch module="AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz" 
+            repo="github-tarball" version="2.2.15"
+            hash="sha256:3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03">
     </branch>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="gtkspell" autogen-sh="configure">
-    <branch module="gtkspell/gtkspell-2.0.16.tar.gz" repo="sourceforge"
-	    version="2.0.16"/>
-    <dependencies>
-      <dep package="enchant"/>
-    </dependencies>
+    <after>
+      <dep package="hunspell"/>
+    </after>
   </autotools>
<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"/>
+    <branch module="gtkspell/gtkspell3-3.0.10.tar.xz" repo="sourceforge"
+            version="3.0.10"
+            hash="sha256:b040f63836b347eb344f5542443dc254621805072f7141d49c067ecb5a375732">
+      <patch file="0001-Enable-use-of-XDG_DATA_DIRS-for-locating-iso-code-fi.patch" strip="1"/>
+      <patch file="gtkspell-3-install.sh-wrong-sh-path.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="enchant"/>
       <dep package="iso-codes"/>
     </dependencies>
   </autotools>
-  <autotools id="libgsf" autogenargs="--without-python">
-    <branch  module="libgsf/1.14/libgsf-1.14.41.tar.xz" version="1.14.41"
-	     hash="sha256:150b98586a1021d5c49b3d4d065d0aa3e3674ae31db131af5372499d2d3f08d3">
-    </branch>
-  </autotools>
-
   <autotools id="gmp">
-    <branch repo="ftp.gnu.org" module="gmp/gmp-6.1.2.tar.bz2" version="6.1.2">
+    <branch repo="ftp.gnu.org" module="gmp/gmp-6.2.1.tar.bz2" version="6.2.1"
+            hash="sha256:eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c">
     </branch>
   </autotools>
-  <autotools id="libunistring" autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.7.tar.gz"
-	    version="0.9.7">
+  <autotools id='readline' autogen-sh="configure">
+    <branch repo="ftp.gnu.org" module="readline/readline-8.1.tar.gz"
+            version="8.1"
+            hash="sha256:f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02">
     </branch>
   </autotools>
-  <autotools id="libatomic-ops"
-             autogen-template="pushd %(srcdir)s &amp;&amp; ./%(autogen-sh)s &amp;&amp; popd &amp;&amp; %(srcdir)s/configure --prefix=%(prefix)s %(autogenargs)s">
-    <branch repo="github.com" module="ivmai/libatomic_ops"
-	    revision="libatomic_ops-7_4_4"/>
-  </autotools>
-
-  <autotools id="bdw-gc" autogen-template="pushd %(srcdir)s &amp;&amp; ./autogen.sh &amp;&amp; automake -ac &amp;&amp; popd &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s">
-    <branch repo="github.com" module="ivmai/bdwgc"  revision="gc7_6_0" />
-    <dependencies>
-      <dep package="libatomic-ops"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="guile" autogen-sh="configure"
-	     autogenargs="--disable-error-on-warning">
-    <branch repo="ftp.gnu.org" module="guile/guile-1.8.8.tar.gz"
-	    version="1.8.8"/>
-    <dependencies>
-      <dep package="gmp"/>
-    </dependencies>
-  </autotools>
-
-  <!-- Guile 2.0.14 crashes during build. Stay at 2.0.12 while this is investigated. -->
-  <autotools id="guile2" autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="guile/guile-2.0.11.tar.gz"
-	    version="2.0.11">
-      <!--patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/guild-shell.patch" strip="1"/>
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/guile-clocktime.patch" strip="1"/-->
-    </branch>
-    <dependencies>
-      <dep package="libunistring"/>
-      <dep package="gmp"/>
-      <dep package="libffi"/>
-      <dep package="bdw-gc"/>
-    </dependencies>
+  <autotools id="iso-codes" autogen-sh="configure">
+    <branch module="049ce6aac94d842be809f4063950646c/iso-codes-4.1.tar.xz"
+            version="4.1" repo="iso-codes"
+            hash="sha256:67117fb76f32c8fb5e37d2d60bce238f1f8e865cc7b569a57cbc3017ca15488a"/>
   </autotools>
</moduleset>
Modified: modulesets-stable/gtk-osx-themes.modules
60 lines changed, 0 insertions(+), 60 deletions(-)
===================================================================
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-  <repository type="tarball" name="ftp.gnome.org" default="yes"
-              href="http://ftp.gnome.org/pub/GNOME/sources/%22/%3E
-  <repository type="git" name="git.gnome.org"
-              href="https://gitlab.gnome.org/GNOME%22/%3E
-  <repository type="tarball" name="sourceforge"
-	      href="http://downloads.sourceforge.net/sourceforge/%22/%3E
-  <repository type="tarball" name="tango.freedesktop.org"
-              href="http://tango.freedesktop.org/releases/%22/%3E
-  <repository type="tarball" name="icon-theme.freedesktop.org"
-	      href="http://icon-theme.freedesktop.org/releases%22/%3E
-  <repository type="git" name="freedesktop.git"
-	      href="git://anongit.freedesktop.org/git/"/>
-
-  <metamodule id="meta-gtk-osx-themes">
-    <dependencies>
-      <dep package="tango-icon-theme"/>
-      <dep package="adwaita-icon-theme"/>
-      <dep package="icon-naming-utils"/>
-      <dep package="gtk-engines"/>
-    </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"
-            hash="md5:dd8108b56130b9eedc4042df634efa66"/>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-    </after>
-  </autotools>
-
-  <autotools id="tango-icon-theme" autogenargs="--disable-icon-framing"
-             autogen-sh="configure">
-    <branch repo="tango.freedesktop.org" version="0.8.90"
-            module="tango-icon-theme-0.8.90.tar.gz"
-            hash="md5:0795895d2f20eddcbd2bffe94ed431a6"/>
-    <dependencies>
-      <dep package="icon-naming-utils"/>
-      <dep package="hicolor-icon-theme"/>
-    </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"/>
-    <after>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
-  </autotools>
-
-  <autotools id="murrine-engine" autogen-sh="configure">
-    <branch module="murrine/0.98/murrine-0.98.1.1.tar.bz2" version="0.98.1.1"
-	    hash="sha256:e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912"/>
-  </autotools>
-
-</moduleset>
Modified: modulesets-stable/gtk-osx-unsupported.modules
104 lines changed, 0 insertions(+), 104 deletions(-)
===================================================================
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-  <repository type="tarball" name="ftp.gnome.org" default="yes"
-              href="http://ftp.gnome.org/pub/GNOME/sources/%22/%3E
-  <repository type='tarball' name='gnupg.org' href="https://gnupg.org/ftp/" />
-  <repository type="tarball" name="iso-codes"
-	      href="http://salsa.debian.org/iso-codes-team/iso-codes/-/archive/%22/%3E
-  <repository type='tarball' name='github-tarball'
-              href='https://github.com/%27/%3E
-  <repository type="tarball" name="curl.haxx.se"
-              href="http://curl.haxx.se/download/%22/%3E
-  <repository type="tarball" name="p11-glue"
-              href="http://p11-glue.freedesktop.org/releases/%22/%3E
-
-  <metamodule id="meta-gtk-osx-unsupported">
-    <dependencies>
-      <dep package="gnome-mime-data"/>
-      <dep package="iso-codes"/>
-    </dependencies>
-  </metamodule>
-
-  <autotools id="gnome-mime-data" autogen-sh="configure">
-   <branch module="gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"
-           version="2.18.0" md5sum="541858188f80090d12a33b5a7c34d42c"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <!-- Iso-codes >= 3.68 requires Python3, a dependency too far. -->
-  <autotools id="iso-codes" autogen-sh="configure">
-    <branch checkoutdir="iso-codes-iso-codes-3.67-080f941e075fef791b22feae659e8a510f57fe2c" module="iso-codes-3.67/iso-codes-3.67.tar.bz2" version="3.67"
-	    repo="iso-codes"/>
-  </autotools>
-
-  <autotools id="p11-kit" autogen-sh="configure"
-             autogenargs="--without-trust-paths">
-    <branch repo="p11-glue" version="0.23.2"
-	    module="p11-kit-0.23.2.tar.gz">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/p11-kit-dirfd.patc..."
-       strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libtasn1"/>
-    </dependencies>
-  </autotools>
-
-  <cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
-    <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>
-  </cmake>
-
-  <autotools id="libgnome-keyring" autogenargs="--disable-tests"
-	     autogen-sh="configure">
-    <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"/>
-      <dep package="libgcrypt"/>
-      <dep package="libtasn1"/>
-      <dep package="dbus"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgpg-error" autogen-sh="autoreconf"@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    