[geany/geany-osx] 484008: Update to latest version of gtk-osx modulesets

21 Mar 2023


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Tue, 21 Mar 2023 19:27:40 UTC
Commit:      48400887cf5a30abf852aea38e7a9262c607c383
             https://github.com/geany/geany-osx/commit/48400887cf5a30abf852aea38e7a9262c6...
Log Message:
-----------
Update to latest version of gtk-osx 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-python.modules
    modulesets-stable/gtk-osx-random.modules
    modulesets-stable/gtk-osx.modules
    patches/Cairo-quartz-surface-create-internal.patch
    patches/Quartz-version-detection-for-macOS-12.patch
    patches/cairo-1.17.6-snapshot-memory-leak.patch
    patches/cairo-freetype-font-variations.patch
    patches/cairo-image-refcount.patch
    patches/getopt-autotools.patch
    patches/girscanner-objc.patch
    patches/gnutls-pkg-config-pc.patch
    patches/gtk+-scale-absolute-value.patch
    patches/gtk-3-24-36-call-gdk-quartz-osx-version.patch
    patches/gtk-3-24-36-image-recolor-load-crash.patch
    patches/gtk-3-24-36-match-window-size.patch
    patches/libxml2-python-config.patch
    patches/libxml2.9.10-conditional-parentheses.patch
    patches/libxslt-python-config.patch
    patches/pango-coretext-fix-clang-build-failure.patch
    patches/tiff-nohtml.patch
Modified: modulesets-stable/bootstrap.modules
299 lines changed, 181 insertions(+), 118 deletions(-)
===================================================================
@@ -1,158 +1,221 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: nxml -*-->
+<?xml version="1.0" standalone="no"?>
+<!--*- mode: nxml -*-->
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-  <repository type="tarball" name="ftp.gnu.org"
-              href="https://ftp.gnu.org/gnu/%22/%3E
-  <repository type="tarball" name="pkgconfig"
-              href="http://pkgconfig.freedesktop.org/releases/%22/%3E
-  <repository type="tarball" name="sourceforge"
-              href="http://downloads.sourceforge.net/sourceforge/%22/%3E
-  <repository type="tarball" name="tukaani.org"
-              href="http://tukaani.org/%22/%3E
-  <repository type="tarball" name="cmake"
-              href="https://cmake.org/files/%22/%3E
-  <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/" />
-  <repository type="tarball" name="intltool"
-              href="http://launchpad.net/intltool/trunk/%22/%3E
-  <repository type="tarball" name="github" href="https://github.com"/>
+  <!--
+    Please format this file using https://github.com/htacg/tidy-html5
-  <autotools id="xz" autogen-sh="configure" bootstrap="true">
-    <branch repo="tukaani.org" module="xz/xz-5.2.5.tar.bz2" version="5.2.5"
-            hash="sha256:5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df"/>
+        tidy -config ../tidy.conf -m bootstrap.modules
+  -->
+  <repository name="ftp.gnu.org"
+              href="https://ftp.gnu.org/gnu/"
+              type="tarball" />
+  <repository name="pkgconfig"
+              href="http://pkgconfig.freedesktop.org/releases/"
+              type="tarball" />
+  <repository name="sourceforge"
+              href="http://downloads.sourceforge.net/sourceforge/"
+              type="tarball" />
+  <repository name="tukaani.org"
+              href="http://tukaani.org/"
+              type="tarball" />
+  <repository name="cmake"
+              href="https://cmake.org/files/"
+              type="tarball" />
+  <repository name="cpan"
+              href="http://search.cpan.org/CPAN/"
+              type="tarball" />
+  <repository name="intltool"
+              href="http://launchpad.net/intltool/trunk/"
+              type="tarball" />
+  <repository name="github"
+              href="https://github.com"
+              type="tarball" />
+  <!---->
+  <autotools id="xz"
+             autogen-sh="configure"
+             bootstrap="true">
+    <branch module="xz/xz-5.2.5.tar.bz2"
+            version="5.2.5"
+            hash="sha256:5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df"
+            repo="tukaani.org" />
   </autotools>
-
-  <!-- gnu make 4.xx, needed to unbreak parallel builds for the webkit -->
-  <autotools id="gnumake" autogen-sh="configure"  bootstrap="true"
-             autogenargs="--disable-dependency-tracking">
-    <branch repo="ftp.gnu.org"
-            module="make/make-4.3.tar.gz" version="4.3"
-            hash="sha256:e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19">
-    </branch>
+  <!--
+    gnu make 4.xx, needed to unbreak parallel builds for the webkit
+  -->
+  <autotools id="gnumake"
+             autogen-sh="configure"
+             autogenargs="--disable-dependency-tracking"
+             bootstrap="true">
+    <branch module="make/make-4.3.tar.gz"
+            version="4.3"
+            hash="sha256:e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19"
+            repo="ftp.gnu.org" />
   </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"
-             hash="sha256:d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192">
-    <branch repo="ftp.gnu.org"
-            module="gettext/gettext-0.21.tar.xz" version="0.21">
-    </branch>
+  <!---->
+  <autotools id="gettext"
+             autogen-sh="configure"
+             autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">
+
+    <branch module="gettext/gettext-0.21.tar.xz"
+            version="0.21"
+            hash="sha256:d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192"
+            repo="ftp.gnu.org" />
   </autotools>
-
-  <!-- cmakes ./configure is picky about invalid flags so we manually set it -->
-  <autotools id="cmake" autogen-sh="bootstrap"  bootstrap="true"
-             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
-    <branch repo="cmake" module="v3.20/cmake-3.20.0.tar.gz" version="3.20.0">
-    </branch>
+  <!--
+    cmakes ./configure is picky about invalid flags so we manually set it
+  -->
+  <autotools id="cmake"
+             autogen-sh="bootstrap"
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s"
+             bootstrap="true">
+    <branch module="v3.25/cmake-3.25.1.tar.gz"
+            version="3.25.1"
+            repo="cmake" />
   </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"/>
+  <!--
+    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 module="m4/m4-1.4.18.tar.xz"
+            version="1.4.18"
+            hash="sha256:f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07"
+            repo="ftp.gnu.org">
+      <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.71.tar.xz" version="2.71"
-            hash="shas56:f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4"/>
+  <!---->
+  <autotools id="autoconf"
+             autogen-sh="configure"
+             bootstrap="true">
+    <branch module="autoconf/autoconf-2.71.tar.xz"
+            version="2.71"
+            hash="shas56:f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4"
+            repo="ftp.gnu.org" />
     <dependencies>
-      <dep package="m4"/>
-      <dep package="xz"/>
+      <dep package="m4" />
+      <dep package="xz" />
     </dependencies>
   </autotools>
-
-  <autotools id="autoconf-archive" autogen-sh="configure" bootstrap="true">
-    <branch repo="ftp.gnu.org"
-            module="autoconf-archive/autoconf-archive-2021.02.19.tar.xz"
+  <!---->
+  <autotools id="autoconf-archive"
+             autogen-sh="configure"
+             bootstrap="true">
+    <branch module="autoconf-archive/autoconf-archive-2021.02.19.tar.xz"
             version="2021-02-19"
-            hash="sha256:e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd"/>
+            hash="sha256:e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd"
+            repo="ftp.gnu.org" />
   </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"
-            hash="sha256:e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3">
-      <patch file="libtool-apple-sort.patch" strip="1"/>
+  <!---->
+  <autotools id="libtool"
+             autogen-sh="configure"
+             bootstrap="true">
+    <branch module="libtool/libtool-2.4.6.tar.gz"
+            version="2.4.6"
+            hash="sha256:e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"
+            repo="ftp.gnu.org">
+      <patch file="libtool-apple-sort.patch"
+             strip="1" />
     </branch>
   </autotools>
-
-
-  <autotools id="automake" autogen-sh="configure" bootstrap="true">
-    <branch repo="ftp.gnu.org" version="1.16.3"
-            module="automake/automake-1.16.3.tar.xz"
-            hash="sha256:ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a"/>
+  <!---->
+  <autotools id="automake"
+             autogen-sh="configure"
+             bootstrap="true">
+    <branch module="automake/automake-1.16.3.tar.xz"
+            version="1.16.3"
+            hash="sha256:ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a"
+            repo="ftp.gnu.org" />
     <dependencies>
-      <dep package="autoconf"/>
+      <dep package="autoconf" />
     </dependencies>
   </autotools>
-
-  <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"
-            hash="sha256:6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"/>
+  <!---->
+  <autotools id="pkg-config"
+             autogen-sh="configure"
+             autogenargs="--with-internal-glib"
+             bootstrap="true">
+    <branch module="pkg-config-0.29.2.tar.gz"
+            version="0.29.2"
+            hash="sha256:6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"
+            repo="pkgconfig" />
   </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.7.6.tar.xz"
+  <!--
+    macOS provides 2.3 (presumably the last GPL2 version, gstreamer
+    requires 2.4.
+  -->
+  <autotools id="bison"
+             autogen-sh="configure">
+    <branch module="bison/bison-3.7.6.tar.xz"
             version="3.7.6"
-            hash="sha256:67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf">
-    </branch>
+            hash="sha256:67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf"
+            repo="ftp.gnu.org" />
     <dependencies>
-      <dep package='flex'/>
+      <dep package='flex' />
     </dependencies>
   </autotools>
-
-  <!-- As of 29 March 2021 Flex hasn't had an update since May 2017. -->
-  <autotools id="flex" autogen-sh="configure" autogenargs="--disable-libfl">
+  <!--
+    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"/>
+            version="2.6.4"
+            hash="sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995"
+            repo="github" />
   </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,
-       it used to be a huge amount of work, but might be easier these
-       days.
-
+  <!--
+    This is generated by tarring up the needed docbook stylesheets
+    for gtk-doc to work. If someone wants to work on a setup that
+    uses the real docbook source from upstream, feel free to do so,
+    it used to be a huge amount of work, but might be easier these
+    days.
   -->
-  <autotools id="gtk-osx-docbook" autogen-sh="configure"
-             supports-non-srcdir-builds="no" >
-   <branch repo="github" module="jralls/gtk-osx-docbook/releases/download/gtk-osx-docbook-1.3/gtk-osx-docbook-1.3.tar.xz"
+  <autotools id="gtk-osx-docbook"
+             autogen-sh="configure"
+             supports-non-srcdir-builds="no">
+    <branch 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"/>
+            hash="sha256:fcf497688a1d531b192301bd09c55adefda5a662729a58eb8a895166e38ef219"
+            repo="github" />
   </autotools>
-
-  <autotools id="intltool" autogen-sh="configure">
-    <branch repo="intltool" module="0.51.0/+download/intltool-0.51.0.tar.gz"
+  <!---->
+  <autotools id="intltool"
+             autogen-sh="configure">
+    <branch module="0.51.0/+download/intltool-0.51.0.tar.gz"
             version="0.51.0"
-            hash="sha256:67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"/>
-    <!--dependencies>
+            hash="sha256:67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
+            repo="intltool" />
+    <!--
+    <dependencies>
       <dep package="perl-xml-parser"/>
-    </dependencies-->
+    </dependencies>
+    -->
   </autotools>
-
+  <!---->
   <metamodule id="meta-bootstrap">
     <dependencies>
-      <dep package="xz"/>
-      <dep package="gettext" /> <!-- Needed for 64-bit -->
-      <dep package="cmake"/>
+      <dep package="xz" />
+      <!--
+        Needed for 64-bit
+      -->
+      <dep package="gettext" />
+      <dep package="cmake" />
       <dep package="autoconf-archive" />
       <dep package="libtool" />
-      <dep package="automake"/>
+      <dep package="automake" />
       <dep package="pkg-config" />
-      <dep package="bison"/>
-      <dep package="flex"/>
-      <dep package="gtk-osx-docbook"/>
-      <dep package="intltool"/>
-      <dep package="gnumake"/>
+      <dep package="bison" />
+      <dep package="flex" />
+      <dep package="gtk-osx-docbook" />
+      <dep package="intltool" />
+      <dep package="gnumake" />
     </dependencies>
   </metamodule>
-
+  <!---->
 </moduleset>
Modified: modulesets-stable/gtk-osx-bootstrap.modules
205 lines changed, 123 insertions(+), 82 deletions(-)
===================================================================
@@ -2,117 +2,158 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
+  <!--
+    Please format this file using https://github.com/htacg/tidy-html5
-  <repository type="tarball" name="ftp.gnome.org" default="yes"
-              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/%22/%3E
-  <repository type="tarball" name="jpeg"
-              href="http://www.ijg.org/files/%22/%3E
-  <repository type="tarball" name="libtiff"
-	      href="http://download.osgeo.org/%22/%3E
-  <repository type="tarball" name="icon-theme"
-	      href="http://icon-theme.freedesktop.org/releases/%22/%3E
-  <repository type="tarball" name="xmlsoft.org"
-	      href="ftp://xmlsoft.org/libxml2/"/>
-  <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/"/>
-  <repository type="tarball" name="github-tarball" href="https://github.com/"/>
-
-  <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="1.6.37" module="libpng/libpng-1.6.37.tar.xz"
-            hash="sha256:505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"
-            repo="sourceforge"/>
+        tidy -config ../tidy.conf -m gtk-osx-bootstrap.modules
+  -->
+  <repository name="download.gnome.org"
+              default="yes"
+              href="https://download.gnome.org/sources/"
+              type="tarball" />
+  <repository name="ftp.gnu.org"
+              href="https://ftp.gnu.org/gnu/"
+              type="tarball" />
+  <repository name="sourceforge"
+              href="http://downloads.sourceforge.net/sourceforge/"
+              type="tarball" />
+  <repository name="jpeg"
+              href="http://www.ijg.org/files/"
+              type="tarball" />
+  <repository name="libtiff"
+              href="http://download.osgeo.org/"
+              type="tarball" />
+  <repository name="icon-theme"
+              href="http://icon-theme.freedesktop.org/releases/"
+              type="tarball" />
+  <repository name="git.gnome.org"
+              href="https://gitlab.gnome.org/GNOME"
+              type="git" />
+  <repository name="itstool"
+              href="http://files.itstool.org/"
+              type="tarball" />
+  <repository name="github-tarball"
+              href="https://github.com/"
+              type="tarball" />
+  <!---->
+  <autotools id="libpng"
+             autogen-sh="configure"
+             autogenargs="--enable-shared">
+    <branch module="libpng/libpng-1.6.39.tar.xz"
+            version="1.6.39"
+            hash="sha256:1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937"
+            repo="sourceforge" />
     <dependencies>
-      <dep package="zlib"/>
+      <dep package="zlib" />
     </dependencies>
   </autotools>
-
-  <autotools id="libjpeg" autogen-sh="configure">
-    <branch module="jpegsrc.v9e.tar.gz" version="9e"
-            repo="jpeg" checkoutdir="jpeg-9e">
-    </branch>
+  <!---->
+  <autotools id="libjpeg"
+             autogen-sh="configure">
+    <branch module="jpegsrc.v9e.tar.gz"
+            version="9e"
+            checkoutdir="jpeg-9e"
+            repo="jpeg" />
   </autotools>
-
-  <autotools id="libtiff" autogen-sh="configure" autogenargs="--without-x">
-    <branch version="4.2.0" module="libtiff/tiff-4.2.0.tar.gz"
-            repo="libtiff"
-            hash="sha256:eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb">
-	<patch file="tiff-nohtml.patch" strip="1" />
+  <!---->
+  <autotools id="libtiff"
+             autogen-sh="configure"
+             autogenargs="--without-x">
+    <branch module="libtiff/tiff-4.5.0.tar.gz"
+            version="4.5.0"
+            hash="sha256:c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464"
+            repo="libtiff">
+      <patch file="tiff-nohtml.patch"
+             strip="1" />
     </branch>
     <dependencies>
-      <dep package="libjpeg"/>
+      <dep package="libjpeg" />
     </dependencies>
   </autotools>
-
-  <!-- The python package is in gtk-osx-python.modules. If you're
-       building "native" you can safely add python to the skip list, but
-       otherwise the links in the SDKs are messed up and libxml's python
-       module won't link. In case you're wondering, itstool
-       needs libxml2's python module. -->
-
-  <autotools id="libxml2" autogen-sh="autoreconf"
+  <!--
+    The python package is in gtk-osx-python.modules. If you're
+    building "native" you can safely add python to the skip list, but
+    otherwise the links in the SDKs are messed up and libxml's python
+    module won't link. In case you're wondering, itstool
+    needs libxml2's python module.
+  -->
+  <autotools id="libxml2"
+             autogen-sh="autoreconf"
              autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
-    <branch version="2.9.12" module="libxml2-2.9.12.tar.gz"
-            repo="xmlsoft.org"
-            hash="sha256:c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92">
-      <patch file="libxml2-python-config.patch" strip="1"/>
-    </branch>
+             
+    <branch module="libxml2/2.10/libxml2-2.10.3.tar.xz"
+            version="2.10.3"
+            hash="sha256:5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c">
+       <patch file="libxml2-python-config.patch"
+             strip="1" />
+   </branch>
     <after>
-      <dep package="python3"/>
+      <dep package="python3" />
     </after>
   </autotools>
-
-  <autotools id="libxslt" autogen-sh="configure">
-    <branch version="1.1.34" module="libxslt-1.1.34.tar.gz"
-            hash="sha256:98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
-	    repo="xmlsoft.org"/>
+  <!---->
+  <autotools id="libxslt"
+             autogen-sh="configure">
+    <branch module="libxslt/1.1/libxslt-1.1.37.tar.xz"
+            version="1.1.37"
+            hash="sha256:3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4">
+       <patch file="libxslt-python-config.patch"
+             strip="1" />
+    </branch>
     <dependencies>
-      <dep package="libxml2"/>
+      <dep package="libxml2" />
     </dependencies>
   </autotools>
-
-  <autotools id="itstool" autogen-sh="configure">
-    <branch module="itstool/itstool-2.0.6.tar.bz2" version="2.0.6n"
-            repo="itstool"
-            hash="sha256:6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9">
-      <patch file="itstool-config-python.patch" strip="1"/>
+  <!---->
+  <autotools id="itstool"
+             autogen-sh="configure">
+    <branch module="itstool/itstool-2.0.6.tar.bz2"
+            version="2.0.6n"
+            hash="sha256:6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9"
+            repo="itstool">
+      <patch file="itstool-config-python.patch"
+             strip="1" />
     </branch>
     <dependencies>
-      <dep package="libxml2"/>
+      <dep package="libxml2" />
     </dependencies>
   </autotools>
-
-  <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"/>
+  <!---->
+  <meson id="gtk-doc"
+         mesonargs="-Dyelp_manual=false -Dtests=false">
+    <branch module="gtk-doc/1.33/gtk-doc-1.33.2.tar.xz"
+            version="1.33.2"
+            hash="sha256:cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" />
     <dependencies>
-      <dep package="libxml2"/>
-      <dep package="libxslt"/>
-      <dep package="itstool"/>
+      <dep package="libxml2" />
+      <dep package="libxslt" />
+      <dep package="itstool" />
     </dependencies>
     <after>
-      <dep package="python3"/>
-      <dep package="pygments"/>
+      <dep package="python3" />
+      <dep package="pygments" />
     </after>
   </meson>
-
-  <autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
+  <!---->
+  <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="68.2" checkoutdir="icu"
-            module="unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz"
-            hash="sha256:c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"/>
-  </autotools>
+    <branch module="unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz"
+            version="68.2"
+            hash="sha256:c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"
+            checkoutdir="icu"
+            repo="github-tarball" />
+  </autotools>
+  <!---->
   <metamodule id="meta-gtk-osx-bootstrap">
     <dependencies>
-      <dep package="libpng"/>
-      <dep package="libjpeg"/>
-      <dep package="libtiff"/>
-      <dep package="gtk-doc"/>
+      <dep package="libpng" />
+      <dep package="libjpeg" />
+      <dep package="libtiff" />
+      <dep package="gtk-doc" />
     </dependencies>
   </metamodule>
-
+  <!---->
 </moduleset>
Modified: modulesets-stable/gtk-osx-gstreamer.modules
176 lines changed, 98 insertions(+), 78 deletions(-)
===================================================================
@@ -2,120 +2,140 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-  <repository type="tarball" name="gstreamer" default="yes"
-              href="http://gstreamer.freedesktop.org/src/%22/%3E
-  <repository type="tarball" name="sourceforge"
-              href="http://iweb.dl.sf.net/project/%22/%3E
-  <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
+  <!--
+    Please format this file using https://github.com/htacg/tidy-html5
-  <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>
+        tidy -config ../tidy.conf -m gtk-osx-gstreamer.modules
+  -->
+  <repository name="gstreamer"
+              default="yes"
+              href="http://gstreamer.freedesktop.org/src/"
+              type="tarball" />
+  <repository name="sourceforge"
+              href="http://downloads.sourceforge.net/sourceforge/"
+              type="tarball" />
+  <repository name="ffmpeg"
+              href="https://ffmpeg.org/releases/"
+              type="tarball" />
+  <repository name="nasm"
+              href="https://www.nasm.us/pub/nasm/releasebuilds/"
+              type="tarball" />
+  <!---->
+  <meson id="liborc"
+         mesonargs="-Dgtk_doc=disabled -Dbenchmarks=disabled -Dexamples=disabled -Dtests=disabled">
-  <autotools id="faad2" autogen-sh="autoreconf"
+    <branch module="orc/orc-0.4.33.tar.xz"
+            version="0.4.33"
+            hash="sha256:844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a" />
+  </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">
-    </branch>
-  </autotools>
-  <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"/>
+    <branch module="faac/faad2-src/faad2-2.8.0/faad2-2.8.6.tar.gz"
+            version="2.8.6"
+            hash="sha256:654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21"
+            repo="sourceforge" />
   </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"
+  <!---->
+  <autotools id="nasm"
+             autogen-sh="configure">
+    <branch module="2.16.01/nasm-2.16.01.tar.xz"
+            version="2.16.01"
+            hash="sha256:c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558"
+            repo="nasm" />
+  </autotools>
+  <!---->
+  <autotools id="ffmpeg"
+             autogen-sh="configure"
              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"/>
+             autogenargs="--enable-gpl --enable-version3 --enable-shared --disable-static --disable-runtime-cpudetect --disable-programs --disable-ffplay --disable-ffprobe --disable-doc">
+
+    <branch module="ffmpeg-4.3.2.tar.xz"
+            version="4.3.2"
+            hash="sha256:46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"
+            repo="ffmpeg" />
     <dependencies>
-      <dep package="nasm"/>
+      <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 module="gstreamer/gstreamer-1.22.0.tar.xz"
+            version="1.22.0"
+            hash="sha256:78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09">
     </branch>
     <after>
-      <dep package="glib"/>
+      <dep package="glib" />
     </after>
   </meson>
-
-  <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"/>
+  <!---->
+  <meson id="gst-plugins-base"
+         mesonargs="-Dexamples=disabled -Ddoc=disabled">
+    <branch module="gst-plugins-base/gst-plugins-base-1.22.0.tar.xz"
+            version="1.22.0"
+            hash="sha256:f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d" />
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="liborc"/>
+      <dep package="gstreamer" />
+      <dep package="liborc" />
     </dependencies>
-    <after>
-    </after>
+    <after></after>
   </meson>
-
+  <!---->
   <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 module="gst-plugins-good/gst-plugins-good-1.22.0.tar.xz"
+            version="1.22.0"
+            hash="sha256:582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0">
     </branch>
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer" />
+      <dep package="gst-plugins-base" />
     </dependencies>
   </meson>
-
+  <!---->
   <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"/>
+    <branch module="gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz"
+            version="1.22.0"
+            hash="sha256:a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c" />
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer" />
+      <dep package="gst-plugins-base" />
     </dependencies>
   </meson>
-
+  <!---->
   <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"/>
+    <branch module="gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz"
+            version="1.22.0"
+            hash="sha256:3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1" />
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="faad2"/>
-      <dep package='openssl'/>
+      <dep package="gstreamer" />
+      <dep package="gst-plugins-base" />
+      <dep package="faad2" />
+      <dep package='openssl' />
     </dependencies>
   </meson>
-
+  <!---->
   <meson id="gst-libav">
-     <branch version="1.18.4"
-             module="gst-libav/gst-libav-1.18.4.tar.xz"
-             hash="sha256:344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396"/>
+    <branch module="gst-libav/gst-libav-1.22.0.tar.xz"
+            version="1.22.0"
+            hash="sha256:0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1" />
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="ffmpeg"/>
+      <dep package="gstreamer" />
+      <dep package="gst-plugins-base" />
+      <dep package="ffmpeg" />
     </dependencies>
   </meson>
-
+  <!---->
   <metamodule id="meta-gtk-osx-gstreamer">
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
-      <dep package="gst-plugins-ugly"/>
-      <dep package="gst-plugins-bad"/>
-      <dep package="gst-libav"/>
+      <dep package="gstreamer" />
+      <dep package="gst-plugins-base" />
+      <dep package="gst-plugins-good" />
+      <dep package="gst-plugins-ugly" />
+      <dep package="gst-plugins-bad" />
+      <dep package="gst-libav" />
     </dependencies>
   </metamodule>
-
+  <!---->
 </moduleset>
Modified: modulesets-stable/gtk-osx-gtkmm.modules
230 lines changed, 129 insertions(+), 101 deletions(-)
===================================================================
@@ -2,149 +2,177 @@
 <!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="doxygen"
-              href="http://ftp.stack.nl/pub/users/dimitri/%22/%3E
-  <repository type="tarball" name="cairographics"
-              href="http://cairographics.org/releases/%22/%3E
-
+  <!--
+    Please format this file using https://github.com/htacg/tidy-html5
+        tidy -config ../tidy.conf -m gtk-osx-gtkmm.modules
+  -->
+  <repository name="download.gnome.org"
+              default="yes"
+              href="https://download.gnome.org/sources/"
+              type="tarball" />
+  <repository name="doxygen"
+              href="http://ftp.stack.nl/pub/users/dimitri/"
+              type="tarball" />
+  <repository name="cairographics"
+              href="http://cairographics.org/releases/"
+              type="tarball" />
+  <!---->
   <meson id="mm-common">
-    <branch module="mm-common/1.0/mm-common-1.0.2.tar.xz" version="1.0.2"
-            hash="sha256:a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d"/>
+    <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.
+  <!--
+    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"/>
+  <meson id="cairomm-1.14">
+    <branch module="cairomm-1.14.2.tar.xz"
+            version="1.14.2"
+            hash="sha256:0126b9cc295dc36bc9c0860d5b720cb5469fd78d5620c8f10cc5f0c07b928de3"
+            repo="cairographics" />
     <dependencies>
-      <dep package="cairo"/>
+      <dep package="cairo" />
     </dependencies>
- </meson>
-
+  </meson>
+  <!---->
   <meson id="cairomm">
-    <branch module="cairomm-1.16.0.tar.xz" version="1.16.0"
-            repo="cairographics"
-            hash="sha256:7e881492c5f9f546688c31160deb742c166fc4c68b6b8eb9920c00a0f0f144f9"/>
+    <branch module="cairomm-1.16.0.tar.xz"
+            version="1.16.0"
+            hash="sha256:7e881492c5f9f546688c31160deb742c166fc4c68b6b8eb9920c00a0f0f144f9"
+            repo="cairographics" />
     <dependencies>
-      <dep package="cairo"/>
+      <dep package="cairo" />
     </dependencies>
   </meson>
-
- <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"/>
+  <!---->
+  <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" />
     <dependencies>
-      <dep package="glib"/>
-      <dep package="libsigc++2"/>
-      <dep package="mm-common"/>
+      <dep package="glib" />
+      <dep package="libsigc++2" />
+      <dep package="mm-common" />
     </dependencies>
- </autotools>
- 
- <meson id="glibmm">
-    <branch module="glibmm/2.68/glibmm-2.68.0.tar.xz" version="2.68.0"
+  </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"/>
+      <dep package="glib" />
+      <dep package="libsigc++3" />
+      <dep package="mm-common" />
     </dependencies>
   </meson>
-
-   <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"/>
+  <!---->
+  <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>
+  <!---->
   <meson id="pangomm">
-    <branch module="pangomm/2.48/pangomm-2.48.0.tar.xz" version="2.48.0"
-            hash="sha256:9e0ed474c33f8c2002ca9e2b61ca0d1f3d8e409e09e99f4d8c19eeafccf55b78"/>
+    <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"/>
+      <dep package="glibmm" />
+      <dep package="cairomm" />
+      <dep package="pango" />
     </dependencies>
   </meson>
-
+  <!---->
   <meson id="atkmm-1.6">
-    <branch module="atkmm/2.28/atkmm-2.28.1.tar.xz" version="2.28.1"
-            hash="sha256:116876604770641a450e39c1f50302884848ce9cc48d43c5dc8e8efc31f31bad"/>
+    <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"/>
+      <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"/>
+    <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"/>
+      <dep package="glibmm" />
+      <dep package="cairomm" />
+      <dep package="pangomm" />
+      <dep package="atk" />
     </dependencies>
   </meson>
-
-  <meson id="libsigc++2" >
-    <branch module="libsigc++/2.10/libsigc++-2.10.6.tar.xz" version="2.10.6"
-            hash="sha256:dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b"/>
+  <!---->
+  <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 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"/>
+  <!---->
+  <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"/>
+      <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>
-
-  <meson id="gtkmm3" >
-    <branch module="gtkmm/3.24/gtkmm-3.24.4.tar.xz" version="3.24.4"
+  <!---->
+  <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"/>
+
+      <patch file="gtkmm-3-bad-const-property-background.patch"
+             strip="1" />
     </branch>
     <dependencies>
-      <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"/>
+      <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>
   </meson>
-
+  <!---->
   <meson id="gtkmm4">
-    <branch module="gtkmm/4.0/gtkmm-4.0.1.tar.xz" version="4.0.1"
-            hash="sha256:8973d9bc7848e02cb2051e05f3ee3a4baffe2feb4af4a5487f0e3132eec03884"/>
+    <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-4"/>
+      <dep package="glibmm" />
+      <dep package="cairomm" />
+      <dep package="pangomm" />
+      <dep package="atkmm" />
+      <dep package="gtk-4" />
     </dependencies>
   </meson>
-
+  <!---->
 </moduleset>
Modified: modulesets-stable/gtk-osx-javascript.modules
85 lines changed, 53 insertions(+), 32 deletions(-)
===================================================================
@@ -2,57 +2,78 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
+  <!--
+    Please format this file using https://github.com/htacg/tidy-html5
-  <repository type="tarball" name="ftp.gnome.org" default="yes"
-              href="http://ftp.gnome.org/pub/GNOME/sources/%22/%3E
-  <repository type="tarball" name="mozilla"
-              href="https://ftp.mozilla.org/pub/%22/%3E
-
+        tidy -config ../tidy.conf -m gtk-osx-javascript.modules
+  -->
+  <repository name="download.gnome.org"
+              default="yes"
+              href="https:////download.gnome.org/sources/"
+              type="tarball" />
+  <repository name="mozilla"
+              href="https://ftp.mozilla.org/pub/"
+              type="tarball" />
+  <!---->
   <metamodule id="meta-gtk-osx-javascript">
     <dependencies>
-      <dep package="gjs"/>
+      <dep package="gjs" />
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-gtk3" />
+      <dep package="meta-gtk-osx-bootstrap" />
     </after>
   </metamodule>
+  <!---->
+  <meson id="gjs"
+         mesonargs="-Dinstalled_tests=true -Dskip_dbus_tests=true -Dskip_gtk_tests=true">
-  <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"
+    <branch module="gjs/1.68/gjs-1.68.0.tar.xz"
+            version="1.68.0"
             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"/>
+      <!--
+        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="spidermonkey"/>
+      <dep package="gobject-introspection" />
+      <dep package="spidermonkey" />
     </dependencies>
   </meson>
-
-  <autotools id="spidermonkey" autogen-sh="configure"
+  <!---->
+  <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 module="firefox/releases/78.1.0esr/firefox-78.1.0esr.source.tar.xz"
+            version="78.1.0"
+            hash="sha256:3600a396d9312c5e9f637b267926ca4771d84a56b26b960cc7d72e98683b64a2"
+            checkoutdir="firefox-78.1.0"
+            repo="mozilla"
+            source-subdir="js/src">
+      <patch file="firefox78-rust-manifest-and-max-sdk.patch"
+             strip="1" />
     </branch>
     <dependencies>
-      <dep package="libffi"/>
-      <dep package="icu"/>
-      <dep package="nspr"/>
+      <dep package="libffi" />
+      <dep package="icu" />
+      <dep package="nspr" />
     </dependencies>
   </autotools>
-
-  <autotools id="nspr" autogen-sh="configure"
-             autogenargs="--enable-64bit" check-target="false">
-    <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 id="nspr"
+             autogen-sh="configure"
+             autogenargs="--enable-64bit"
+             check-target="false">
+    <branch module="nspr/releases/v4.30/src/nspr-4.30.tar.gz"
+            version="4.30"
+            href="sha256:8d4cd8f8409484dc4c3d31e180354bfc506573eccf86cd691106a1ef7edc913b"
+            repo="mozilla"
+            source-subdir="nspr" />
   </autotools>
-
+  <!---->
 </moduleset>
Modified: modulesets-stable/gtk-osx-network.modules
364 lines changed, 213 insertions(+), 151 deletions(-)
===================================================================
@@ -2,210 +2,264 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-  <repository name="ftp.gnome.org" type="tarball" default="yes"
-              href="http://ftp.gnome.org/pub/GNOME/sources/%22/%3E
-  <repository name="openssl" type="tarball"
-              href="https://www.openssl.org/source/%22/%3E
-  <repository name="ftp.gnu.org" type="tarball"
-              href="https://ftp.gnu.org/gnu/%22/%3E
-  <repository name="sourceforge" type="tarball"
-              href="http://downloads.sourceforge.net/sourceforge/%22/%3E
-  <repository name='gnupg.org' type='tarball' href="https://gnupg.org/ftp/" />
-  <repository name="webm" type="tarball"
-              href="http://downloads.webmproject.org/releases/%22/%3E
-  <repository name="webkit.org" type="tarball"
-              href="http://www.webkitgtk.org/releases/%22/%3E
-  <repository type="tarball" name="github-tarball" href="https://github.com/"/>
-  <repository type="tarball" name="zlib" href="https://www.zlib.net/"/>
+  <!--
+    Please format this file using https://github.com/htacg/tidy-html5
-  <!-- Builds latest stable version of WebKitGTK for GTK 3.x -->
+        tidy -config ../tidy.conf -m gtk-osx-network.modules
+  -->
+  <repository name="download.gnome.org"
+              default="yes"
+              href="https:////download.gnome.org/sources/"
+              type="tarball" />
+  <repository name="openssl"
+              href="https://www.openssl.org/source/"
+              type="tarball" />
+  <repository name="ftp.gnu.org"
+              href="https://ftp.gnu.org/gnu/"
+              type="tarball" />
+  <repository name="sourceforge"
+              href="http://downloads.sourceforge.net/sourceforge/"
+              type="tarball" />
+  <repository name='gnupg.org'
+              href="https://gnupg.org/ftp/"
+              type='tarball' />
+  <repository name="webm"
+              href="http://downloads.webmproject.org/releases/"
+              type="tarball" />
+  <repository name="webkit.org"
+              href="http://www.webkitgtk.org/releases/"
+              type="tarball" />
+  <repository name="github-tarball"
+              href="https://github.com/"
+              type="tarball" />
+  <repository name="zlib"
+              href="https://www.zlib.net/"
+              type="tarball" />
+  <!--
+    Builds latest stable version of WebKitGTK for GTK 3.x
+  -->
   <metamodule id="meta-gtk-osx-webkit-gtk3">
     <dependencies>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="webkit2gtk3"/>
+      <dep package="meta-gtk-osx-gtk3" />
+      <dep package="webkit2gtk3" />
     </dependencies>
   </metamodule>
-
-  <!-- of the many arguments such as prefix and libdir that jhbuild might pass
-  to configure, openssl only understands prefix, and only with =. -->
-  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared "
+  <!--
+    of the many arguments such as prefix and libdir that jhbuild might pass
+    to configure, openssl only understands prefix, and only with =.
+  -->
+  <autotools id="openssl"
+             autogen-sh="Configure"
              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.1n.tar.gz" version="1.1.1n" repo="openssl"
-            hash="sha256:40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a"/>
+             autogenargs="shared"
+             makeinstallargs="install_sw"
+             supports-non-srcdir-builds="no">
+    <branch module="openssl-1.1.1s.tar.gz"
+            version="1.1.1s"
+            hash="sha256:c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa"
+            repo="openssl" />
   </autotools>
-
-  <!-- Rudely demands TeX to build documentation -->
-  <!-- libnettle 3.7 doesn't have arm64 assembler support and the support that's added in master is for arm-64-neutron that's incompatible with Apple Silicon. -->
+  <!--
+    Rudely demands TeX to build documentation
+    libnettle 3.7 doesn't have arm64 assembler support and the support that's added in master
+    is for arm-64-neutron that's incompatible with Apple Silicon.
+  -->
   <if condition-set="arm64">
-    <autotools id="libnettle" autogen-sh="configure"
+    <autotools id="libnettle"
+               autogen-sh="configure"
                autogenargs="--disable-documentation --disable-assembler">
-      <branch repo="ftp.gnu.org" version="3.7.2"
-              module="nettle/nettle-3.7.2.tar.gz"
-              hash="sha256:8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162">
-      </branch>
+               
+      <branch module="nettle/nettle-3.7.3.tar.gz"
+              version="3.7.3"
+              hash="sha256:661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0"
+              repo="ftp.gnu.org" />
       <dependencies>
-        <dep package="gmp"/>
-        <dep package="openssl"/>
+        <dep package="gmp" />
+        <dep package="openssl" />
       </dependencies>
     </autotools>
   </if>
+  <!---->
   <if condition-unset="arm64">
-    <autotools id="libnettle" autogen-sh="configure"
+    <autotools id="libnettle"
+               autogen-sh="configure"
                autogenargs="--disable-documentation">
-      <branch repo="ftp.gnu.org" version="3.7.2"
-              module="nettle/nettle-3.7.2.tar.gz"
-              hash="sha256:8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162">
-      </branch>
+      <branch module="nettle/nettle-3.7.3.tar.gz"
+              version="3.7.3"
+              hash="sha256:661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0"
+              repo="ftp.gnu.org" />
       <dependencies>
-        <dep package="gmp"/>
-        <dep package="openssl"/>
+        <dep package="gmp" />
+        <dep package="openssl" />
       </dependencies>
     </autotools>
   </if>
-
-  <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"/>
+  <!---->
+  <autotools id="libtasn1"
+             autogen-sh="configure">
+    <branch module="libtasn1/libtasn1-4.17.0.tar.gz"
+            version="4.17.0"
+            hash="sha256:ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5"
+            repo="ftp.gnu.org">
+      <patch file="libtasn1-inline-fix.patch"
+             strip="1" />
     </branch>
   </autotools>
-
+  <!---->
   <cmake id="zlib">
-    <branch repo="zlib" version="1.2.13"
-            module="zlib-1.2.13.tar.xz"
-            hash="sha256:d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98"/>
+    <branch module="zlib-1.2.13.tar.xz"
+            version="1.2.13"
+            hash="sha256:d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98"
+            repo="zlib" />
   </cmake>
-
-  <autotools id="p11-kit" autogen-sh="configure"
+  <!---->
+  <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>
+    <branch module="p11-glue/p11-kit/releases/download/0.23.22/p11-kit-0.23.22.tar.xz"
+            version="0.23.22"
+            hash="sha256:8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6"
+            repo="github-tarball" />
     <dependencies>
-      <dep package="libffi"/>
-      <dep package="libtasn1"/>
+      <dep package="libffi" />
+      <dep package="libtasn1" />
     </dependencies>
   </autotools>
-
+  <!---->
   <if condition-unset="pre-Mavericks">
-    <autotools id="gnutls" autogen-sh="autoreconf"
+    <autotools id="gnutls"
+               autogen-sh="autoreconf"
                autogenargs="--disable-gtk-doc-html --with-included-unistring">
-      <branch repo="gnupg.org" version="3.7.7"
-              module="gcrypt/gnutls/v3.7/gnutls-3.7.7.tar.xz">
+               
+      <branch module="gcrypt/gnutls/v3.7/gnutls-3.7.7.tar.xz"
+              version="3.7.7"
+              hash="sha256:be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106"
+              repo="gnupg.org" >
+        <patch file="gnutls-pkg-config-pc.patch"
+               strip="1"/>
       </branch>
       <dependencies>
-        <dep package="libnettle"/>
-        <dep package="libtasn1"/>
-        <dep package="zlib"/>
-        <dep package="p11-kit"/>
-        <dep package="libgcrypt"/>
+        <dep package="libnettle" />
+        <dep package="libtasn1" />
+        <dep package="zlib" />
+        <dep package="p11-kit" />
+        <dep package="libgcrypt" />
       </dependencies>
     </autotools>
   </if>
-
-  <autotools id="libgpg-error" autogen-sh="autoreconf"
+  <!---->
+  <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>
+    <branch module="gcrypt/libgpg-error/libgpg-error-1.43.tar.bz2"
+            version="1.43"
+            hash="sha256:a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf"
+            repo="gnupg.org" />
   </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"/>
+  <!---->
+  <autotools id="libgcrypt"
+             autogen-sh="configure">
+    <branch module="gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2"
+            version="1.9.4"
+            hash="sha256:ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7"
+            repo="gnupg.org" />
     <dependencies>
-      <dep package="libgpg-error"/>
+      <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"
-            />
+  <!---->
+  <autotools id="gpg"
+             autogen-sh='configure'>
+    <branch module="gcrypt/gnupg/gnupg-2.3.3.tar.bz2"
+            version="2.3.3"
+            hash="sha256:5789b86da6a1a6752efb38598f16a77af51170a8494039c3842b085032e8e937"
+            repo="gnupg.org" />
     <dependencies>
-      <dep package="libgpg-error"/>
-      <dep package="libgcrypt"/>
+      <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"
-            />
+  <!---->
+  <meson id="libsecret"
+         mesonargs="-Dvapi=disabled -Dgtk_doc=disabled">
+    <branch module="libsecret/0.20/libsecret-0.20.4.tar.xz"
+            version="0.20.4" />
     <dependencies>
-      <dep package="glib"/>
-      <dep package="libgcrypt"/>
+      <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"
-            />
+    <branch module="gcr/3.38/gcr-3.38.1.tar.xz"
+            version="3.38" />
     <dependencies>
-      <dep package="p11-kit"/>
-      <dep package="gpg"/>
-      <dep package="libsecret"/>
-      <dep package="glib"/>
+      <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"
-            />
+            version="40.0" />
     <dependencies>
-      <dep package="libgcrypt"/>
-      <dep package="gcr"/>
+      <dep package="libgcrypt" />
+      <dep package="gcr" />
     </dependencies>
   </autotools>
-
-  <meson id="glib-networking" mesonargs="-Dopenssl=enabled">
+  <!---->
+  <meson id="glib-networking"
+         mesonargs="-Dopenssl=enabled">
     <branch module="glib-networking/2.68/glib-networking-2.68.0.tar.xz"
             version="2.68.0"
-            hash="sha256:0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e"/>
+            hash="sha256:0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e" />
     <dependencies>
       <if condition-unset="pre-Mavericks">
-        <dep package="gnutls"/>
+        <dep package="gnutls" />
       </if>
-      <dep package="glib"/>
+      <dep package="glib" />
     </dependencies>
   </meson>
-
-  <autotools id="libpsl" autogen-sh='configure'>
-    <branch repo="github-tarball" version="0.21.0"
-            module="rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz"
-            hash="sha256:ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c"/>
+  <!---->
+  <autotools id="libpsl"
+             autogen-sh='configure'>
+    <branch module="rockdaboot/libpsl/releases/download/0.21.2/libpsl-0.21.2.tar.gz"
+            version="0.21.2"
+            hash="sha256:e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f"
+            repo="github-tarball" />
   </autotools>
-
-  <meson id="libsoup" mesonargs="-Dvapi=disabled">
-    <branch module="libsoup/2.72/libsoup-2.72.0.tar.xz" version="2.72.0"
+  <!---->
+  <meson id="libsoup"
+         mesonargs="-Dvapi=disabled">
+    <branch module="libsoup/2.72/libsoup-2.72.0.tar.xz"
+            version="2.72.0"
             hash="sha256:170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387">
     </branch>
     <dependencies>
-      <dep package="libpsl"/>
-      <dep package="python3"/>
-      <dep package="glib"/>
-      <dep package="glib-networking"/>
-      <dep package="sqlite"/>
-      <dep package="vala"/>
+      <dep package="libpsl" />
+      <dep package="python3" />
+      <dep package="glib" />
+      <dep package="glib-networking" />
+      <dep package="sqlite" />
+      <dep package="vala" />
     </dependencies>
   </meson>
-
-  <autotools id="libwebp" autogen-sh="configure"  autogenargs="--enable-libwebpmux --enable-libwebpdecoder">
-    <branch repo="webm" module="webp/libwebp-1.2.0.tar.gz" version="1.2.0"
-            hash="sha256:2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c"/>
+  <!---->
+  <autotools id="libwebp"
+             autogen-sh="configure"
+             autogenargs="--enable-libwebpmux --enable-libwebpdecoder">
+             
+    <branch module="webp/libwebp-1.2.2.tar.gz"
+            version="1.2.2"
+            hash="sha256:7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6"
+            repo="webm" />
   </autotools>
-
-
-  <!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
-      the WebKit2 API.
+  <!--
+    This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
+    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".
     USE_SYSTEMD: macOS doesn't have systemd.
@@ -222,27 +276,35 @@
     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.  -->
+    USE_WPE_RENDERER: For embedded systems, not Macs.
+  -->
   <cmake id="webkit2gtk3"
-         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"/>
+         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 module="webkitgtk-2.32.0.tar.xz"
+            version="2.32.0"
+            hash="sha256:9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0"
+            repo="webkit.org">
+      <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"/>
+      <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-gstreamer"/>
+      <dep package="meta-gtk-osx-gstreamer" />
     </after>
   </cmake>
- 
+  <!---->
 </moduleset>
Modified: modulesets-stable/gtk-osx-python.modules
118 lines changed, 69 insertions(+), 49 deletions(-)
===================================================================
@@ -2,84 +2,104 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
+  <!--
+    Please format this file using https://github.com/htacg/tidy-html5
-  <repository type="tarball" name="ftp.gnome.org" default="yes"
-              href="http://ftp.gnome.org/pub/GNOME/sources/%22/%3E
-  <repository type="tarball" name="cairographics.org"
-              href="http://cairographics.org/releases/%22/%3E
-  <repository type="tarball" name="python"
-              href="https://www.python.org/ftp/python/%22/%3E
-  <repository type="tarball" name="oracle"
-	      href="http://download.oracle.com/%22/%3E
-  <repository type="tarball" name="pymodules"
-              href="https://pypi.python.org/packages/%22/%3E
-  <repository type="tarball" name="github-tarball"
-              href="https://github.com%22/%3E
-
+        tidy -config ../tidy.conf -m gtk-osx-python.modules
+  -->
+  <repository name="download.gnome.org"
+              default="yes"
+              href="https://download.gnome.org/sources/"
+              type="tarball" />
+  <repository name="cairographics.org"
+              href="http://cairographics.org/releases/"
+              type="tarball" />
+  <repository name="python"
+              href="https://www.python.org/ftp/python/"
+              type="tarball" />
+  <repository name="oracle"
+              href="http://download.oracle.com/"
+              type="tarball" />
+  <repository name="pymodules"
+              href="https://pypi.python.org/packages/"
+              type="tarball" />
+  <repository name="github-tarball"
+              href="https://github.com"
+              type="tarball" />
+  <!---->
   <metamodule id="meta-gtk-osx-python3-gtk3">
     <dependencies>
-      <dep package="pycairo"/>
-      <dep package="pygobject3"/>
-      <dep package="gtk-mac-integration-python"/>
+      <dep package="pycairo" />
+      <dep package="pygobject3" />
+      <dep package="gtk-mac-integration-python" />
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="meta-gtk-osx-gtk3" />
     </after>
   </metamodule>
-
-  <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch repo="python" module="3.10.2/Python-3.10.2.tar.xz" version="3.10.2"
-            hash="sha256:17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7"/>
-
+  <!---->
+  <autotools id="python3"
+             autogen-sh="configure"
+             autogenargs="--enable-shared">
+    <branch module="3.10.10/Python-3.10.10.tar.xz"
+            version="3.10.10"
+            hash="sha256:0419e9085bf51b7a672009b3f50dbf1859acdf18ba725d0ec19aa5c8503f0ea3"
+            repo="python" />
     <dependencies>
-      <dep package='readline'/>
-      <dep package="openssl"/> <!-- For hashlib -->
+      <dep package='readline' />
+      <!--
+        for hashlib
+      -->
+      <dep package="openssl" />
     </dependencies>
   </autotools>
-
+  <!---->
   <meson id="pycairo">
-    <branch module="/pygobject/pycairo/releases/download/v1.20.0/pycairo-1.20.0.tar.gz" repo="github-tarball"
+    <branch module="/pygobject/pycairo/releases/download/v1.20.0/pycairo-1.20.0.tar.gz"
             version="1.20.0"
-	    hash="sha256:5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"/>
+            hash="sha256:5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"
+            repo="github-tarball" />
     <dependencies>
-      <dep package="cairo"/>
-      <dep package="python3"/>
-      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="cairo" />
+      <dep package="python3" />
+      <dep package="meta-gtk-osx-gtk3" />
     </dependencies>
   </meson>
-
-   <meson id="pygobject3" >
-    <branch version="3.40.1" module="pygobject/3.40/pygobject-3.40.1.tar.xz"
-	    hash="sha256:00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035"/>
+  <!---->
+  <meson id="pygobject3">
+    <branch module="pygobject/3.40/pygobject-3.40.1.tar.xz"
+            version="3.40.1"
+            hash="sha256:00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035" />
     <dependencies>
-      <dep package="pycairo"/>
+      <dep package="pycairo" />
     </dependencies>
     <after>
-      <dep package="python3"/>
+      <dep package="python3" />
     </after>
-   </meson>
-
-  <autotools id="gtk-mac-integration-python" autogen-sh="configure"
+  </meson>
+  <!---->
+  <autotools id="gtk-mac-integration-python"
+             autogen-sh="configure"
              autogenargs="--enable-python">
     <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"/>
+
+      <patch file="gtk-mac-integration-work-around-svg-locale-bug.patch"
+             strip="1" />
     </branch>
-    <dependencies>
-    </dependencies>
     <after>
-      <dep package="pygobject3"/>
+      <dep package="pygobject3" />
     </after>
   </autotools>
-
+  <!---->
   <distutils id="pygments">
-    <branch repo="pymodules" version="2.9.0"
-            module="ba/6e/7a7c13c21d8a4a7f82ccbfe257a045890d4dbf18c023f985f565f97393e3/Pygments-2.9.0.tar.gz">
-    </branch>
+    <branch module="ba/6e/7a7c13c21d8a4a7f82ccbfe257a045890d4dbf18c023f985f565f97393e3/Pygments-2.9.0.tar.gz"
+            version="2.9.0"
+            repo="pymodules" />
     <dependencies>
-      <dep package="python3"/>
+      <dep package="python3" />
     </dependencies>
   </distutils>
-  
+  <!---->
 </moduleset>
Modified: modulesets-stable/gtk-osx-random.modules
361 lines changed, 215 insertions(+), 146 deletions(-)
===================================================================
@@ -2,235 +2,304 @@
 <!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="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/%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="fossies"
-              href="https://fossies.org/linux/misc/%22/%3E
-  <repository type="tarball" name="paguire" href="https://releases.pagure.org/"/> 
-  <repository type="tarball" name="pcre" href="https://ftp.pcre.org/pub/"/>
+  <!--
+    Please format this file using https://github.com/htacg/tidy-html5
+        tidy -config ../tidy.conf -m gtk-osx-random.modules
+  -->
+  <repository name="download.gnome.org"
+              default="yes"
+              href="https://download.gnome.org/sources/"
+              type="tarball" />
+  <repository name="github-tarball"
+              href="https://github.com/"
+              type="tarball" />
+  <repository name="ftp.gnu.org"
+              href="https://ftp.gnu.org/gnu/"
+              type="tarball" />
+  <repository name="shared-mime-info"
+              href="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/"
+              type="tarball" />
+  <repository name="iso-codes"
+              href="https://salsa.debian.org/iso-codes-team/iso-codes/uploads/"
+              type="tarball" />
+  <repository name="sourceforge"
+              href="http://downloads.sourceforge.net/sourceforge/"
+              type="tarball" />
+  <repository name="graphviz"
+              href="https://gitlab.com/graphviz/graphviz/-/archive/"
+              type="tarball" />
+  <repository name="sqlite"
+              href="http://www.sqlite.org/"
+              type="tarball" />
+  <repository name="fossies"
+              href="https://fossies.org/linux/misc/"
+              type="tarball" />
+  <repository name="paguire"
+              href="https://releases.pagure.org/"
+              type="tarball" />
+  <repository name="pcre"
+              href="https://ftp.pcre.org/pub/"
+              type="tarball" />
+  <!---->
   <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 module="2.47.0/graphviz-2.47.0.tar.bz2"
+            version="2.47.0"
+            hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714"
+            repo="graphviz">
+      <patch file="graphviz-remove-rpath.patch"
+             strip="1" />
     </branch>
     <dependencies>
-      <dep package="pango"/>
-      <dep package="librsvg"/>
+      <dep package="pango" />
+      <dep package="librsvg" />
     </dependencies>
   </cmake>
-
-  <autotools id="vala" autogen-sh="configure">
-    <branch repo="ftp.gnome.org" version="0.52.0"
-            module="vala/0.52/vala-0.52.0.tar.xz"
-            hash="sha256:1de26310db465aca525679d3b5a3c1d8db2e067c4cbc0e5ddd015cd938bac68b"/>
+  <!---->
+  <autotools id="vala"
+             autogen-sh="configure">
+    <branch module="vala/0.52/vala-0.52.0.tar.xz"
+            version="0.52.0"
+            hash="sha256:1de26310db465aca525679d3b5a3c1d8db2e067c4cbc0e5ddd015cd938bac68b" />
     <dependencies>
-      <dep package="graphviz"/>
-      <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="graphviz" />
+      <dep package="meta-gtk-osx-bootstrap" />
+      <dep package="meta-gtk-osx-gtk3" />
     </dependencies>
   </autotools>
-
-  <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 id="expat"
+             autogen-sh="configure">
+    <branch module="expat/expat-2.3.0.tar.bz2"
+            version="2.3.0"
+            hash="sha256:f122a20eada303f904d5e0513326c5b821248f2d4d2afbf5c6f1339e511c0586"
+            repo="sourceforge" />
   </autotools>
-
-  <meson id="amtk" >
-    <branch module="amtk/5.3/amtk-5.3.1.tar.xz" version="5.3.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"/>
+
+      <patch file="amtk-build-on-macOS.patch"
+             strip="1" />
     </branch>
     <dependencies>
-      <dep package="gtk+-3.0"/>
+      <dep package="gtk+-3.0" />
     </dependencies>
   </meson>
-
+  <!---->
   <meson id="devhelp-gtk3">
-    <branch module="devhelp/3.38/devhelp-3.38.1.tar.xz" version="3.38.1"
+    <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"/>
+
+      <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>
+      <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>
   </meson>
-
-  <meson id="glade" mesonargs="-Dmac_bundle=true -Dman=false" >
-    <branch module="glade/3.40/glade-3.40.0.tar.xz" version="3.40.0"
+  <!---->
+  <meson id="glade"
+         mesonargs="-Dmac_bundle=true -Dman=false">
+    <branch module="glade/3.40/glade-3.40.0.tar.xz"
+            version="3.40.0"
             hash="sha256:31c9adaea849972ab9517b564e19ac19977ca97758b109edc3167008f53e3d9c">
     </branch>
     <dependencies>
-      <dep package="itstool"/>
-      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="itstool" />
+      <dep package="meta-gtk-osx-gtk3" />
     </dependencies>
   </meson>
-
-  <!-- gtksourceview got a major version ahead: 4.x.x supports recent versions of gtk+-3 and 5.x.x is for gtk4.
+  <!--
+    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">
+  <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>
     <dependencies>
-      <dep package="gtk+-3.0"/>
+      <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 id="libpcre2"
+             autogen-sh="configure">
+    <branch module="pcre/pcre2-10.36.tar.bz2"
+            version="20.36"
+            hash="sha256:a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c"
+            repo="pcre" />
   </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"/>
+      <dep package="gtk-4" />
+      <dep package="libpcre2" />
     </dependencies>
   </meson>
-
-  <autotools id="getopt" autogen-sh="configure"
+  <!---->
+  <autotools id="getopt"
+             autogen-sh="configure"
              supports-non-srcdir-builds="no">
-    <branch repo="fossies" version="1.1.6" module="getopt-1.1.6.tar.gz"
-            hash="sha256:d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe">
-       <patch file="getopt-autotools.patch" strip="1"/>
+    <branch module="getopt-1.1.6.tar.gz"
+            version="1.1.6"
+            hash="sha256:d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe"
+            repo="fossies">
+      <patch file="getopt-autotools.patch"
+             strip="1" />
     </branch>
   </autotools>
-  <autotools id="xmlto" autogen-sh="autoreconf">
+  <!---->
+  <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"/>
+            version="0.0.28"
+            hash="sha256:1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276"
+            repo="paguire">
+      <patch file="xmlto-allow-net-access.patch"
+             strip="1" />
     </branch>
     <dependencies>
-      <dep package="getopt"/>
+      <dep package="getopt" />
     </dependencies>
   </autotools>
-
-  <meson id="shared-mime-info" supports-non-srcdir-builds="no" >
+  <!---->
+  <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">
-      <patch file="shared-mime-info-2.1-freedesktop-generate.patch" strip="1"/>
+            version="2.1"
+            hash="sha256:b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563"
+            repo="shared-mime-info">
+      <patch file="shared-mime-info-2.1-freedesktop-generate.patch"
+             strip="1" />
     </branch>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="xmlto"/>
+      <dep package="glib" />
+      <dep package="xmlto" />
     </dependencies>
   </meson>
-
+  <!---->
   <meson id="gsettings-desktop-schemas">
     <branch module="gsettings-desktop-schemas/40/gsettings-desktop-schemas-40.0.tar.xz"
             version="40.0"
-            hash="sha256:f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685"/>
+            hash="sha256:f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685" />
     <dependencies>
-      <dep package="gobject-introspection"/>
+      <dep package="gobject-introspection" />
     </dependencies>
   </meson>
-
-<!-- SQLite3 is also available from the macOS SDK -->
-  <autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe"
-	     autogen-sh="configure">
-    <branch module="2022/sqlite-autoconf-3390400.tar.gz" version='3.39.4'
-            repo="sqlite"
-            hash="sha3:431328e30d12c551da9ba7ef2122b269076058512014afa799caaf62ca567090"/>
+  <!-- SQLite3 is also available from the macOS SDK -->
+  <autotools id="sqlite"
+             autogen-sh="configure"
+             autogenargs="--disable-tcl --enable-threadsafe">
+    <branch module="2022/sqlite-autoconf-3390400.tar.gz"
+            version='3.39.4'
+            hash="sha256:f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb"
+            repo="sqlite" />
   </autotools>
-
-<!-- Goocanvas2 is for gtk+-3. -->
-
-  <autotools id="goocanvas2" supports-non-srcdir-builds="no">
-    <branch module="goocanvas/2.0/goocanvas-2.0.4.tar.xz" version="2.0.4"
-	    hash="sha256:c728e2b7d4425ae81b54e1e07a3d3c8a4bd6377a63cffa43006045bceaa92e90"/>
+  <!--
+    Goocanvas2 is for gtk+-3.
+  -->
+  <autotools id="goocanvas2"
+             supports-non-srcdir-builds="no">
+    <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.0" />
     </after>
   </autotools>
-
-<!-- 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"/>
+  <!--
+    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="gtk-4"/>
+      <dep package="gtk-4" />
     </after>
   </autotools>
-
-  <autotools id="hunspell" autogen-sh="autoreconf">
-    <branch module="hunspell/hunspell/archive/v1.7.0.tar.gz" version="1.7.0"
-            repo="github-tarball" checkoutdir="hunspell-1.7.0"
+  <!---->
+  <autotools id="hunspell"
+             autogen-sh="autoreconf">
+    <branch module="hunspell/hunspell/archive/v1.7.0.tar.gz"
+            version="1.7.0"
+            hash="sha256:bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a"
+            checkoutdir="hunspell-1.7.0"
             rename-tarball="hunspell-1.7.0.tar.gz"
-            hash="sha256:bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a"/>
+            repo="github-tarball" />
   </autotools>
-
-  <autotools id="enchant" autogen-sh="configure"
-             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>
+  <!---->
+  <autotools id="enchant"
+             autogen-sh="configure"
+             autogenargs="--enable-relocatable">
+    <branch module="AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz"
+            version="2.2.15"
+            hash="sha256:3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03"
+            repo="github-tarball" />
     <dependencies>
-      <dep package="glib"/>
+      <dep package="glib" />
     </dependencies>
     <after>
-      <dep package="hunspell"/>
+      <dep package="hunspell" />
     </after>
   </autotools>
-
-  <autotools id="gtkspell3" autogen-sh="configure" autogenargs="--enable-vala=no">
-    <branch module="gtkspell/gtkspell3-3.0.10.tar.xz" repo="sourceforge"
+  <!---->
+  <autotools id="gtkspell3"
+             autogen-sh="configure"
+             autogenargs="--enable-vala=no">
+    <branch module="gtkspell/gtkspell3-3.0.10.tar.xz"
             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"/>
+            hash="sha256:b040f63836b347eb344f5542443dc254621805072f7141d49c067ecb5a375732"
+            repo="sourceforge">
+      <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"/>
+      <dep package="enchant" />
+      <dep package="iso-codes" />
     </dependencies>
   </autotools>
-
+  <!---->
   <autotools id="gmp">
-    <branch repo="ftp.gnu.org" module="gmp/gmp-6.2.1.tar.bz2" version="6.2.1"
-            hash="sha256:eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c">
-    </branch>
+    <branch module="gmp/gmp-6.2.1.tar.bz2"
+            version="6.2.1"
+            hash="sha256:eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c"
+            repo="ftp.gnu.org" />
   </autotools>
-
-  <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 id='readline'
+             autogen-sh="configure">
+    <branch module="readline/readline-8.2.tar.gz"
+            version="8.2"
+            hash="sha256:3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35"
+            repo="ftp.gnu.org" />
   </autotools>
-
-  <autotools id="iso-codes" autogen-sh="configure">
+  <!---->
+  <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"/>
+            version="4.1"
+            hash="sha256:67117fb76f32c8fb5e37d2d60bce238f1f8e865cc7b569a57cbc3017ca15488a"
+            repo="iso-codes" />
   </autotools>
-
+  <!---->
 </moduleset>
Modified: modulesets-stable/gtk-osx.modules
571 lines changed, 328 insertions(+), 243 deletions(-)
===================================================================
@@ -1,359 +1,444 @@
-<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml version="1.0"?>
+<!--*- mode: nxml; indent-tabs-mode: nil -*-->
 <!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="cairographics"
-              href="https://www.cairographics.org/%22/%3E
-  <repository type="tarball" name="cairographics-temp"
-              href="https://gitlab.freedesktop.org/cairo/cairo/-/archive/%22/%3E
-  <repository type="tarball" name="ftp.gnu.org"
-              href="https://ftp.gnu.org/gnu/%22/%3E
-  <repository type="tarball" name="xorg"
-              href="https://www.x.org/releases/%22/%3E
-  <repository type="tarball" name="fontconfig"
-	      href="http://www.freedesktop.org/software/fontconfig/release/%22/%3E
-  <repository type="tarball" name="hicolor"
-              href="https://icon-theme.freedesktop.org/releases/%22/%3E
-  <repository type="git" name="github" href="https://github.com/"/>
-  <repository type="tarball" name="github-tarball" href="https://github.com/"/>
-  <repository type="tarball" name="sourceforge"
-              href="http://downloads.sourceforge.net/sourceforge/%22/%3E
-  <repository type="system" name="system"/>
+  <!--
+    Please format this file using https://github.com/htacg/tidy-html5
-  <!-- This module set works a bit differently than for example the
-       GNOME ones do. It's split up in seperate pieces:
-
-       - gtk-osx-bootstrap: contains bootstrap-like modules that you
-         don't want to rebuild all the time.
-
-       - gtk-osx.modules: contains the core GTK+ stack. This does not
-         have a hard dependency on the bootstrap modules, in order to
-         make it easy to rebuild the whole core stack without redoing
-         the bootstrap parts. They have a soft, "after", depencency.
-
-       - gtk-osx-python.modules: Python bindings for Gtk.
-       - gtk-osx-gtkmm.modules: C++ wrappers for Gtk.
-       - gtk-osx-javascript.modules: GJS and its Mozilla JS (aka
-         spidermonkey) dependency.
-       - gtk-osx-gstreamer.modules: GStreamer library and modules.
-       - gtk-osx-network.modules: The network/crypto stack and WebKit.
-       - gtk-osx-random.modules: "random stuff", has apps for testing GTK+.
-
-       There's one more moduleset, gtk-osx-obsolete.modules, that
-       contains add-on modules that are used with gtk+-2 based
-       applications. It's not included here: If you need it include it
-       in your project's moduleset directly.
+        tidy -config ../tidy.conf -m gtk-osx.modules
+  -->
+  <repository name="download.gnome.org"
+              default="yes"
+              href="https://download.gnome.org/sources/"
+              type="tarball" />
+  <repository name="cairographics"
+              href="https://www.cairographics.org/"
+              type="tarball" />
+  <repository name="cairographics-temp"
+              href="https://gitlab.freedesktop.org/cairo/cairo/-/archive/"
+              type="tarball" />
+  <repository name="ftp.gnu.org"
+              href="https://ftp.gnu.org/gnu/"
+              type="tarball" />
+  <repository name="xorg"
+              href="https://www.x.org/releases/"
+              type="tarball" />
+  <repository name="fontconfig"
+              href="http://www.freedesktop.org/software/fontconfig/release/"
+              type="tarball" />
+  <repository name="hicolor"
+              href="https://icon-theme.freedesktop.org/releases/"
+              type="tarball" />
+  <repository name="github"
+              href="https://github.com/"
+              type="git" />
+  <repository name="github-tarball"
+              href="https://github.com/"
+              type="tarball" />
+  <repository name="sourceforge"
+              href="http://downloads.sourceforge.net/sourceforge/"
+              type="tarball" />
+  <repository name="system"
+              type="system" />
+  <!--
+    This module set works a bit differently than for example the
+    GNOME ones do. It's split up in seperate pieces:
+
+      - gtk-osx-bootstrap: contains bootstrap-like modules that you
+        don't want to rebuild all the time.
+
+      - gtk-osx.modules: contains the core GTK+ stack. This does not
+        have a hard dependency on the bootstrap modules, in order to
+        make it easy to rebuild the whole core stack without redoing
+        the bootstrap parts. They have a soft, "after", depencency.
+
+      - gtk-osx-python.modules: Python bindings for Gtk.
+      - gtk-osx-gtkmm.modules: C++ wrappers for Gtk.
+      - gtk-osx-javascript.modules: GJS and its Mozilla JS (aka
+        spidermonkey) dependency.
+      - gtk-osx-gstreamer.modules: GStreamer library and modules.
+      - gtk-osx-network.modules: The network/crypto stack and WebKit.
+      - gtk-osx-random.modules: "random stuff", has apps for testing GTK+.
+
+    There's one more moduleset, gtk-osx-obsolete.modules, that
+    contains add-on modules that are used with gtk+-2 based
+    applications. It's not included here: If you need it include it
+    in your project's moduleset directly.
+  -->
+  <include href="gtk-osx-bootstrap.modules" />
+  <include href="gtk-osx-gstreamer.modules" />
+  <include href="gtk-osx-gtkmm.modules" />
+  <include href="gtk-osx-javascript.modules" />
+  <include href="gtk-osx-network.modules" />
+  <include href="gtk-osx-python.modules" />
+  <include href="gtk-osx-random.modules" />
+  <!--
+    Dummy meson module to shut up a jhbuild warning.
   -->
-
-  <include href="gtk-osx-bootstrap.modules"/>
-  <include href="gtk-osx-gstreamer.modules"/>
-  <include href="gtk-osx-gtkmm.modules"/>
-  <include href="gtk-osx-javascript.modules"/>
-  <include href="gtk-osx-network.modules"/>
-  <include href="gtk-osx-python.modules"/>
-  <include href="gtk-osx-random.modules"/>
-
-  <!-- Dummy meson module to shut up a jhbuild warning. -->
   <systemmodule id="meson">
-    <branch repo="system"/>
+    <branch repo="system" />
   </systemmodule>
-
+  <!---->
   <metamodule id="meta-gtk-osx-gtk3">
     <dependencies>
-      <dep package="gtk+-3.0"/>
-      <dep package="gtk-mac-integration"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gtk+-3.0" />
+      <dep package="gtk-mac-integration" />
+      <dep package="adwaita-icon-theme" />
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-bootstrap" />
     </after>
   </metamodule>
-
-  <autotools id="libffi" autogenargs="--disable-multi-os-directory"
-             autogen-sh="configure">
-    <branch module="libffi/libffi/releases/download/v3.4.3/libffi-3.4.3.tar.gz"
-            repo="github-tarball" version="3.4.3"
-            hash="sha256:4416dd92b6ae8fcb5b10421e711c4d3cb31203d77521a77d85d0102311e6c3b8"/>
+  <!---->
+  <autotools id="libffi"
+             autogen-sh="configure"
+             autogenargs="--disable-multi-os-directory">
+    <branch module="libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz"
+            version="3.4.4"
+            hash="sha256:d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676"
+            repo="github-tarball" />
   </autotools>
-
-  <autotools id="libpcre" autogen-sh="configure"
+  <!---->
+  <autotools id="libpcre"
+             autogen-sh="configure"
              autogenargs="--enable-unicode-properties --enable-newline-is-any --enable-jit">
-    <branch repo="sourceforge" version="8.45"
-            module="pcre/pcre-8.45.tar.bz2"
-            hash="sha256:4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8"/>
+
+    <branch module="pcre/pcre-8.45.tar.bz2"
+            version="8.45"
+            hash="sha256:4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8"
+            repo="sourceforge" />
   </autotools>
-  
-  <meson id="glib" mesonargs="-Dlibmount=disabled">
-    <branch module="glib/2.72/glib-2.72.0.tar.xz"  version="2.72.0"
+  <!---->
+  <meson id="glib"
+         mesonargs="-Dlibmount=disabled">
+    <branch module="glib/2.72/glib-2.72.0.tar.xz"
+            version="2.72.0"
             hash="sha256:d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d">
     </branch>
     <dependencies>
-      <dep package="libffi"/>
-      <dep package="libpcre"/>
+      <dep package="libffi" />
+      <dep package="libpcre" />
     </dependencies>
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[geany/geany-osx] 484008: Update to latest version of gtk-osx modulesets