update moduleset to 1a8dd873 (2022-02-18)

Author: elelay

modulesets/bootstrap.modules

@@ -74,7 +74,9 @@
   <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="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"/>
+            hash="sha256:e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3">
+      <patch file="libtool-apple-sort.patch" strip="1"/>
+    </branch>
   </autotools>
 
 
@@ -107,7 +109,7 @@
   </autotools>
 
   <!-- As of 29 March 2021 Flex hasn't had an update since May 2017. -->
-  <autotools id="flex" autogen-sh="configure">
+  <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"/>
@@ -122,9 +124,9 @@
   -->
   <autotools id="gtk-osx-docbook" autogen-sh="configure"
              supports-non-srcdir-builds="no" >
-    <branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.2.tar.bz2"
-            version="1.2"
-            hash="sha256:40f0a97116b5abb7a38191b2720c15e690d3ffb1ab64883bba1f8a807b5e117e"/>
+   <branch repo="github" module="jralls/gtk-osx-docbook/releases/download/gtk-osx-docbook-1.3/gtk-osx-docbook-1.3.tar.xz"
+            version="1.3"
+            hash="sha256:fcf497688a1d531b192301bd09c55adefda5a662729a58eb8a895166e38ef219"/>
   </autotools>
 
   <autotools id="intltool" autogen-sh="configure">

modulesets/gtk-osx-bootstrap.modules

@@ -41,7 +41,7 @@
     <branch version="4.2.0" module="libtiff/tiff-4.2.0.tar.gz"
             repo="libtiff"
             hash="sha256:eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb">
-	<patch file="https://raw.githubusercontent.com/totaam/gtk-osx-build/master/patches/tiff-nohtml.patch" strip="1" />
+	<patch file="tiff-nohtml.patch" strip="1" />
     </branch>
     <dependencies>
       <dep package="libjpeg"/>
@@ -54,12 +54,12 @@
        module won't link. In case you're wondering, itstool
        needs libxml2's python module. -->
 
-  <autotools id="libxml2" autogen-sh="configure"
+  <autotools id="libxml2" autogen-sh="autoreconf"
              autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
-    <branch version="2.9.10" module="libxml2-2.9.10.tar.gz"
+    <branch version="2.9.12" module="libxml2-2.9.12.tar.gz"
             repo="xmlsoft.org"
-            hash="sha256:aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f">
-      <patch file="libxml2.9.10-conditional-parentheses.patch" strip="1"/>            
+            hash="sha256:c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92">
+      <patch file="libxml2-python-config.patch" strip="1"/>
     </branch>
     <after>
       <dep package="python2"/>
@@ -97,6 +97,7 @@
     </dependencies>
     <after>
       <dep package="python3"/>
+      <dep package="pygments"/>
     </after>
   </meson>
 

modulesets/gtk-osx-gtkmm.modules

@@ -143,7 +143,7 @@
       <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
-      <dep package="gtk-4.0"/>
+      <dep package="gtk-4"/>
     </dependencies>
   </meson>
 

modulesets/gtk-osx-network.modules

@@ -35,23 +35,40 @@
   </autotools>
 
   <!-- Rudely demands TeX to build documentation -->
-  <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>
-    <dependencies>
-      <dep package="gmp"/>
-      <dep package="openssl"/>
-    </dependencies>
-  </autotools>
+  <!-- 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"
+               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>
+      <dependencies>
+        <dep package="gmp"/>
+        <dep package="openssl"/>
+      </dependencies>
+    </autotools>
+  </if>
+  <if condition-unset="arm64">
+    <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>
+      <dependencies>
+        <dep package="gmp"/>
+        <dep package="openssl"/>
+      </dependencies>
+    </autotools>
+  </if>
 
-  <autotools id="libtasn1" supports-non-srcdir-builds="no"
-             autogen-sh="configure">
-    <branch repo="ftp.gnu.org" version="4.16.0"
-            module="libtasn1/libtasn1-4.16.0.tar.gz"
-             hash="sha256:0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d"/>
+  <autotools id="libtasn1" autogen-sh="configure">
+    <branch repo="ftp.gnu.org" version="4.17.0"
+            module="libtasn1/libtasn1-4.17.0.tar.gz"
+            hash="sha256:ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5">
+      <patch file="libtasn1-inline-fix.patch" strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
@@ -68,6 +85,7 @@
             hash="sha256:8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6">
     </branch>
     <dependencies>
+      <dep package="libffi"/>
       <dep package="libtasn1"/>
     </dependencies>
   </autotools>
@@ -84,6 +102,7 @@
         <dep package="libtasn1"/>
         <dep package="zlib"/>
         <dep package="p11-kit"/>
+        <dep package="libgcrypt"/>
       </dependencies>
     </autotools>
   </if>
@@ -210,7 +229,9 @@
     <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-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"/>

modulesets/gtk-osx-python.modules

@@ -139,6 +139,7 @@
     <branch module="gtk-mac-integration/3.0/gtk-mac-integration-3.0.1.tar.xz"
             version="3.0.1"
             hash="sha256:f19e35bc4534963127bbe629b9b3ccb9677ef012fc7f8e97fd5e890873ceb22d">
+      <patch file="gtk-mac-integration-work-around-svg-locale-bug.patch" strip="1"/>
     </branch>
     <dependencies>
     </dependencies>
@@ -148,4 +149,13 @@
     </after>
   </autotools>
 
+  <distutils id="pygments">
+    <branch repo="pymodules" version="2.9.0"
+            module="ba/6e/7a7c13c21d8a4a7f82ccbfe257a045890d4dbf18c023f985f565f97393e3/Pygments-2.9.0.tar.gz">
+    </branch>
+    <dependencies>
+      <dep package="python3"/>
+    </dependencies>
+  </distutils>
+  
 </moduleset>

modulesets/gtk-osx-random.modules

@@ -89,7 +89,7 @@
 
   <!-- 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">
+  <meson id="gtksourceview3" mesonargs="-Dvapi=false">
     <branch module="gtksourceview/4.8/gtksourceview-4.8.1.tar.xz"
             version="4.8.1"
             hash="sha256:d163d71b5fcafbc5b1eec6dd841edbdbcddd3a7511cd5fdcffd86b8bbfe69ac1">
@@ -138,6 +138,7 @@
     <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"/>
     </branch>
     <dependencies>
       <dep package="glib"/>

modulesets/gtk-osx.modules

@@ -170,9 +170,10 @@
   </autotools>
 
   <meson id="gobject-introspection">
-    <branch module="gobject-introspection/1.68/gobject-introspection-1.68.0.tar.xz"
-            version="1.68.0"
-            hash="sha256:d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27">
+    <branch module="gobject-introspection/1.70/gobject-introspection-1.70.0.tar.xz"
+            version="1.70.0"
+            hash="sha256:902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a">
+      <patch file="gobject-introspection-1.70.0-obsolet.patch" strip="1"/>XS
       <patch file="girscanner-objc.patch" strip="1"/>
     </branch>
     <dependencies>
@@ -205,7 +206,7 @@
     </dependencies>
   </meson>
 
-  <meson id="pango">
+  <meson id="pango" mesonargs="-Dfontconfig=enabled">
     <branch version="1.48.4" module="pango/1.48/pango-1.48.4.tar.xz"
             hash="sha256:418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a">
     </branch>
@@ -233,7 +234,7 @@
     </after>
   </meson>
 
-  <meson id="gdk-pixbuf" mesonargs="-Dx11=false -Dman=false">
+  <meson id="gdk-pixbuf" mesonargs="-Drelocatable=true -Dman=false">
     <branch module="gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.tar.xz" version="2.42.4"
             hash="sha256:fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d">
       <patch file="gdk-pixbuf-loader-name.patch" strip="1"/>
@@ -294,10 +295,11 @@
   </meson>
 
   <!-- gtk3 is in maintenance mode with 3.24 the final release series. -->
-  <meson id="gtk+-3.0"
-             mesonargs="-Dquartz-backend=true -Dx11-backend=false -Dmedia=none">
+  <meson id="gtk+-3.0" mesonargs="-Dx11_backend=false">
     <branch module="gtk+/3.24/gtk+-3.24.30.tar.xz" version="3.24.30"
             hash="sha256:ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9">
+      <patch file="Quartz-version-detection-for-macOS-12.patch" strip="1"/>
+      <patch file="gtk+-scale-absolute-value.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -313,7 +315,7 @@
     </after>
   </meson>
 
-  <meson id="graphene" mesonargs="-Dtests=false -Dbenchmarks=false">
+  <meson id="graphene" mesonargs="-Dtests=false">
     <branch repo="github-tarball" version="1.10.4"
             module="ebassi/graphene/releases/download/1.10.4/graphene-1.10.4.tar.xz"
             hash="sha256:b2a45f230f332478553bd79666eca8df1d1c6dbf208c344ba9f5120592772414"/>
@@ -338,6 +340,7 @@
       <dependencies>
       <dep package="pango"/>
       <dep package="atk"/>
+      <dep package="gdk-pixbuf"/>
       <dep package="graphene"/>
       <dep package="libsass"/>
       <dep package="libepoxy"/>
@@ -348,8 +351,8 @@
              autogenargs="--disable-python">
     <branch module="gtk-mac-integration/3.0/gtk-mac-integration-3.0.1.tar.xz"
             version="3.0.1"
-            hash="sha256:f19e35bc4534963127bbe629b9b3ccb9677ef012fc7f8e97fd5e890873ceb22d"
-            >
+            hash="sha256:f19e35bc4534963127bbe629b9b3ccb9677ef012fc7f8e97fd5e890873ceb22d">
+      <patch file="gtk-mac-integration-work-around-svg-locale-bug.patch" strip="1"/>
     </branch>
     <dependencies>
     </dependencies>
@@ -365,7 +368,8 @@
             hash="sha256:767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"/>
   </autotools>
 
-  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
+  <autotools id="librsvg" autogen-sh="autoreconf"
+             autogenargs="--disable-Bsymbolic">
     <branch module="librsvg/2.51/librsvg-2.51.0.tar.xz" version="2.51.0"
             hash="sha256:89d32e38445025e1b1d9af3dd9d3aeb9f6fce527aeecbecf38b369b34c80c038"/>
     <dependencies>

modulesets/patches/Quartz-version-detection-for-macOS-12.patch

@@ -0,0 +1,67 @@
+From a752e338381bc37dbe8d4c04ec23e4f6fd911b30 Mon Sep 17 00:00:00 2001
+From: John Ralls <[email protected]>
+Date: Wed, 8 Sep 2021 18:01:50 -0700
+Subject: [PATCH] Update Quartz version detection for macOS 12.
+
+---
+ gdk/quartz/gdkglobals-quartz.c | 16 +++++++---------
+ gdk/quartz/gdkquartz.h         |  3 ++-
+ 2 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/gdk/quartz/gdkglobals-quartz.c b/gdk/quartz/gdkglobals-quartz.c
+index 72aed1c92d..30649efe8a 100644
+--- a/gdk/quartz/gdkglobals-quartz.c
++++ b/gdk/quartz/gdkglobals-quartz.c
+@@ -29,28 +29,26 @@ GdkWindow *_gdk_root = NULL;
+ GdkOSXVersion
+ gdk_quartz_osx_version (void)
+ {
+-  static gint32 minor = GDK_OSX_UNSUPPORTED;
++  static gint32 vkey = GDK_OSX_UNSUPPORTED;
+ 
+-  if (minor == GDK_OSX_UNSUPPORTED)
++  if (vkey == GDK_OSX_UNSUPPORTED)
+     {
+ #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
+-      OSErr err = Gestalt (gestaltSystemVersionMinor, (SInt32*)&minor);
++      OSErr err = Gestalt (gestaltSystemVersionMinor, (SInt32*)&vkey);
+ 
+       g_return_val_if_fail (err == noErr, GDK_OSX_UNSUPPORTED);
+ #else
+       NSOperatingSystemVersion version;
+ 
+       version = [[NSProcessInfo processInfo] operatingSystemVersion];
+-      minor = version.minorVersion;
+-      if (version.majorVersion == 11)
+-        minor += 16;
++      vkey = version.majorVersion == 10 ? version.minorVersion : version.majorVersion + 5;
+ #endif
+     }
+ 
+-  if (minor < GDK_OSX_MIN)
++  if (vkey < GDK_OSX_MIN)
+     return GDK_OSX_UNSUPPORTED;
+-  else if (minor > GDK_OSX_CURRENT)
++  else if (vkey > GDK_OSX_CURRENT)
+     return GDK_OSX_NEW;
+   else
+-    return minor;
++    return vkey;
+ }
+diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
+index dd1b4f41af..2d53dcbce6 100644
+--- a/gdk/quartz/gdkquartz.h
++++ b/gdk/quartz/gdkquartz.h
+@@ -42,7 +42,8 @@ typedef enum
+   GDK_OSX_MOJAVE = 14,
+   GDK_OSX_CATALINA = 15,
+   GDK_OSX_BIGSUR = 16,
+-  GDK_OSX_CURRENT = 15,
++  GDK_OSX_MONTEREY = 17,
++  GDK_OSX_CURRENT = 17,
+   GDK_OSX_NEW = 99
+ } GdkOSXVersion;
+ 
+-- 
+2.30.1 (Apple Git-130)
+

modulesets/patches/WebKit2Gtk3-2.32.0-color-components-correct-math-header.patch

@@ -0,0 +1,13 @@
+--- a/Source/WebCore/platform/graphics/ColorComponents.h	2021-02-26 01:57:13.000000000 -0800
++++ b/Source/WebCore/platform/graphics/ColorComponents.h	2021-08-26 17:28:59.000000000 -0700
+@@ -27,7 +27,8 @@
+ 
+ #include <algorithm>
+ #include <array>
+-#include <math.h>
++#include <cmath>
++#include <cstdlib>
+ #include <tuple>
+ 
+ namespace WebCore {
+