update to latest upstream

Author: elelay

modulesets/bootstrap.modules

@@ -27,7 +27,7 @@
   </autotools>
 
   <autotools id="xz" autogen-sh="configure" bootstrap="true">
-    <branch repo="tukaani.org" module="xz/xz-5.2.4.tar.bz2" version="5.2.4"/>
+    <branch repo="tukaani.org" module="xz/xz-5.2.5.tar.bz2" version="5.2.5"/>
   </autotools>
 
 
@@ -38,19 +38,17 @@
             module="make/make-4.2.1.tar.bz2" version="4.2.1" hash="sha256:d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589">
     </branch>
   </autotools>
-  <autotools id="gettext-tools" autogen-sh="configure"
+  <autotools id="gettext" autogen-sh="configure"
              autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">
-    <branch repo="ftp.gnu.org" source-subdir="gettext-tools"
-            module="gettext/gettext-0.19.8.tar.xz" version="0.19.8">
-      <!-- upstream bug: https://savannah.gnu.org/bugs/index.php?49560 -->
-      <patch file="https://savannah.gnu.org/bugs/download.php?file_id=38908" strip="1"/>
+    <branch repo="ftp.gnu.org"
+            module="gettext/gettext-0.20.2.tar.xz" version="0.20.2">
     </branch>
   </autotools>
 
   <!-- cmakes ./configure is picky about invalid flags so we manually set it -->
   <autotools id="cmake" autogen-sh="bootstrap"
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
-    <branch repo="cmake" module="v3.14/cmake-3.14.5.tar.gz" version="3.14.5">
+    <branch repo="cmake" module="v3.17/cmake-3.17.2.tar.gz" version="3.17.2">
     </branch>
   </autotools>
 
@@ -64,8 +62,8 @@
 
   <autotools id="autoconf-archive" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
-            module="autoconf-archive/autoconf-archive-2018.03.13.tar.xz"
-            version="2018-03-13"/>
+            module="autoconf-archive/autoconf-archive-2019.01.06.tar.xz"
+            version="2019-01-06"/>
   </autotools>
 
   <autotools id="libtool" autogen-sh="configure" bootstrap="true">
@@ -76,7 +74,7 @@
 
   <autotools id="automake" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org" version="1.16"
-            module="automake/automake-1.16.1.tar.xz"/>
+            module="automake/automake-1.16.2.tar.xz"/>
     <dependencies>
       <dep package="autoconf"/>
     </dependencies>
@@ -91,34 +89,25 @@
   <!-- MacOS provides 2.3 (presumably the last GPL2 version, gstreamer
        requires 2.4. -->
   <autotools id="bison" autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="bison/bison-3.0.4.tar.xz"
-            version="3.0.4">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/bison-3.0.4-vasnprintf.patch" strip="1"/>
+    <branch repo="ftp.gnu.org" module="bison/bison-3.6.tar.xz"
+            version="3.6">
     </branch>
     <dependencies>
       <dep package='flex'/>
     </dependencies>
   </autotools>
 
-  <!-- MacOS hasn't updated flex since 2012. Since it's BSD-licensed
-       it must be just because Apple doesn't use it and doesn't
-       care. We'll provide something more up-to-date. -->
+  <!-- As of 9 May 2020 Flex hasn't had an update since November 2015. -->
   <autotools id="flex" autogen-sh="configure">
     <branch module="flex/flex-2.6.0.tar.xz" version="2.6.0"
             repo="sourceforge" />
   </autotools>
 
   <autotools id="expat" autogen-sh="configure">
-    <branch module="expat/expat-2.2.5.tar.bz2" version="2.2.5"
+    <branch module="expat/expat-2.2.9.tar.bz2" version="2.2.9"
             repo="sourceforge"/>
   </autotools>
 
-  <!-- Needed for building Gnome apps from the repository -->
-  <autotools id="gnome-common">
-    <branch module="gnome-common/3.18/gnome-common-3.18.0.tar.xz" version="3.18.0"
-            hash="sha256:22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"/>
-  </autotools>
-
   <!-- This is generated by tarring up the needed docbook stylesheets
        for gtk-doc to work. If someone wants to work on a setup that
        uses the real docbook source from upstream, feel free to do so,
@@ -137,15 +126,14 @@
             version="0.51.0"
             hash="md5:12e517cac2b57a0121cda351570f1e63"/>
     <!--dependencies>
-      <dep package="gnome-common"/>
       <dep package="perl-xml-parser"/>
     </dependencies-->
   </autotools>
 
   <metamodule id="meta-bootstrap">
     <dependencies>
       <dep package="xz"/>
-      <dep package="gettext-tools" /> <!-- Needed for 64-bit -->
+      <dep package="gettext" /> <!-- Needed for 64-bit -->
       <dep package="cmake"/>
       <dep package="autoconf" />
       <dep package="autoconf-archive" />
@@ -155,7 +143,6 @@
       <dep package="bison"/>
       <dep package="flex"/>
       <dep package="gtk-osx-docbook"/>
-      <dep package="gnome-common"/>
       <dep package="intltool"/>
       <dep package="gnumake"/>
     </dependencies>

modulesets/gtk-osx-bootstrap.modules

@@ -28,8 +28,8 @@
               href="http://www.colm.net/files/ragel/"/>
 
   <autotools id='readline' autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
-      version="7.0">
+    <branch repo="ftp.gnu.org" module="readline/readline-8.0.tar.gz"
+      version="8.0">
     </branch>
   </autotools>
 
@@ -43,9 +43,9 @@
   </autotools>
 
   <autotools id="libjpeg" autogen-sh="configure">
-    <branch module="jpegsrc.v9c.tar.gz" version="9c"
+    <branch module="jpegsrc.v9d.tar.gz" version="9d"
             repo="jpeg"
-            checkoutdir="jpeg-9c">
+            checkoutdir="jpeg-9d">
     </branch>
   </autotools>
 
@@ -97,8 +97,8 @@
   </autotools>
 
   <autotools id="yelp-xsl">
-    <branch version="3.20.1" module="yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz"
-            hash="sha256:dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"/>
+    <branch version="3.36.0" module="yelp-xsl/3.36/yelp-xsl-3.36.0.tar.xz"
+            hash="sha256:4fe51c0233b79a4c204c68498d45f09b342c30ed02c4e418506c0e35f0904ec3"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
@@ -107,8 +107,8 @@
   </autotools>
 
   <autotools id="yelp-tools">
-    <branch version="3.18.0" module="yelp-tools/3.18/yelp-tools-3.18.0.tar.xz"
-            hash="sha256:c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"/>
+    <branch version="3.32.2" module="yelp-tools/3.32/yelp-tools-3.32.2.tar.xz"
+            hash="sha256:183856b5ed0b0bb2c05dd1204af023946ed436943e35e789afb0295e5e71e8f9"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
@@ -118,8 +118,8 @@
   </autotools>
 
   <autotools id="gtk-doc" autogen-sh="configure">
-    <branch version="1.30" module="gtk-doc/1.30/gtk-doc-1.30.tar.xz"
-            hash="sha256:a4f6448eb838ccd30d76a33b1fd095f81aea361f03b12c7b23df181d21b7069e"/>
+    <branch version="1.32" module="gtk-doc/1.32/gtk-doc-1.32.tar.xz"
+            hash="sha256:de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
@@ -132,9 +132,9 @@
 
   <autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
              makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
-    <branch repo="github-tarball" version="58.3" checkoutdir="icu"
-	    module="unicode-org/icu/releases/download/release-58-3/icu4c-58_3-src.tgz"
-	    hash="sha512:efb3baa32bd01b1b2c63bed9d077c4df4df76db8c6007b50bb7de642df6e6723def2e7180712efdc1df763d89c3a22aa7f470c07c4a099ac9e647762448fd541"/>
+    <branch repo="github-tarball" version="66.1" checkoutdir="icu"
+            module="unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz"
+            hash="sha256:52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e"/>
   </autotools>
 
 
@@ -146,7 +146,8 @@
 
   <autotools id="harfbuzz" autogen-sh="configure"
              autogenargs="--with-coretext --with-icu">
-    <branch repo="harfbuzz" module="harfbuzz-2.5.3.tar.xz" version="2.5.3">
+    <branch repo="harfbuzz" module="harfbuzz-2.6.4.tar.xz" version="2.6.4"
+            hash="sha256:9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12">
     </branch>
     <dependencies>
       <dep package="ragel"/>
@@ -161,7 +162,7 @@
   <autotools id="freetype" autogen-sh="configure"
              skip-autogen="never"
              autogenargs="--without-bzip2 --without-harfbuzz">
-    <branch module="freetype/freetype-2.9.1.tar.gz" version="2.9.1"
+    <branch module="freetype/freetype-2.10.2.tar.gz" version="2.10.2"
             repo="sourceforge">
     </branch>
     <dependencies>
@@ -184,21 +185,11 @@
             version="0.15"/>
   </autotools>
 
-  <autotools id="gettext-runtime" autogen-sh="configure"
-	     autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp">
-    <branch repo="ftp.gnu.org" source-subdir="gettext-runtime"
-            module="gettext/gettext-0.19.8.tar.xz" version="0.19.8">
-      <!-- upstream bug: https://savannah.gnu.org/bugs/index.php?49560 -->
-      <patch file="https://savannah.gnu.org/bugs/download.php?file_id=38908" strip="1"/>
-    </branch>
-  </autotools>
-
   <metamodule id="meta-gtk-osx-bootstrap">
     <dependencies>
       <dep package="libpng"/>
       <dep package="libjpeg"/>
       <dep package="libtiff"/>
-      <dep package="gettext-runtime"/>
       <dep package="hicolor-icon-theme"/>
       <dep package="gtk-doc"/>
     </dependencies>

modulesets/gtk-osx-network.modules

@@ -6,7 +6,8 @@
               href="http://ftp.gnome.org/pub/GNOME/sources/"/>
   <repository name="openssl" type="tarball"
               href="https://www.openssl.org/source/"/>
-  <repository name="ftp.gnu.org" type="tarball" href="https://ftp.gnu.org/gnu/"/>
+  <repository name="ftp.gnu.org" type="tarball"
+              href="https://ftp.gnu.org/gnu/"/>
   <repository name="sourceforge" type="tarball"
               href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository name="gnutls" type="tarball" href="https://www.gnupg.org/ftp/"/>
@@ -37,17 +38,16 @@
   <autotools id="openssl" autogen-sh="Configure" autogenargs="shared "
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl %(autogenargs)s"
              makeinstallargs="install_sw" supports-non-srcdir-builds="no">
-    <branch module="openssl-1.1.1f.tar.gz" version="1.1.1f" repo="openssl"
-            hash="sha256:186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"/>
+    <branch module="openssl-1.1.1g.tar.gz" version="1.1.1g" repo="openssl"
+            hash="sha256:ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46"/>
   </autotools>
 
   <!-- Rudely demands TeX to build documentation -->
-  <!-- Assembler files are missing md5-compress.asm for x86_64 -->
   <autotools id="libnettle" autogen-sh="configure"
-             autogenargs="--disable-documentation --disable-assembler">
-    <branch repo="ftp.gnu.org" version="3.3"
-            module="nettle/nettle-3.3.tar.gz">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libnettle-cc-for-build-needs-cflags.patch" strip="1"/>
+             autogenargs="--disable-documentation">
+    <branch repo="ftp.gnu.org" version="3.5.1"
+            module="nettle/nettle-3.5.1.tar.gz"
+            hash="sha256:75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419">
     </branch>
     <dependencies>
       <dep package="gmp"/>
@@ -57,8 +57,8 @@
 
   <autotools id="libtasn1" supports-non-srcdir-builds="no"
              autogen-sh="configure">
-    <branch repo="ftp.gnu.org" version="4.15"
-            module="libtasn1/libtasn1-4.15.tar.gz"
+    <branch repo="ftp.gnu.org" version="4.15.0"
+            module="libtasn1/libtasn1-4.15.0.tar.gz"
             hash="sha256:dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" />
   </autotools>
 
@@ -69,11 +69,13 @@
   </autotools>
 
   <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
-  <autotools id="gnutls" autogen-sh="configure"
+  <autotools id="gnutls" autogen-sh="autoreconf"
              autogenargs="--disable-gtk-doc-html --without-p11-kit">
     <branch repo="gnutls" version="3.6.12"
             hash="sha256:bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b"
-            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz"/>
+            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz">
+      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gnutls-yes-weak-imports.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libunistring"/>
       <dep package="libnettle"/>
@@ -101,12 +103,11 @@
 
   <autotools id="libpsl" autogen-sh='configure'>
     <branch repo="github-tarball" version="0.21.0"
-            hash="sha256:055aa87ec166c7afb985d0816c07ff440e1eb899881a318c51c69a0aeea8e279"
-            module="rockdaboot/libpsl/archive/libpsl-0.21.0.tar.gz" />
+            hash="sha256:41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12"
+            module="rockdaboot/libpsl/releases/download/libpsl-0.21.0/libpsl-0.21.0.tar.gz"/>
   </autotools>
 
-  <autotools id="libsoup" autogen-sh="configure"
-             autogenargs="set_more_warnings=no --enable-introspection=no">
+  <meson id="libsoup" mesonargs="-Dintrospection=disabled">
     <branch module="libsoup/2.68/libsoup-2.68.4.tar.xz" version="2.68.4"
             hash="sha256:2d50b12922cc516ab6a7c35844d42f9c8a331668bbdf139232743d82582b3294">
     </branch>
@@ -118,7 +119,7 @@
       <dep package="sqlite"/>
       <dep package="vala"/>
     </dependencies>
-  </autotools>
+  </meson>
 
   <autotools id="libwebp" autogen-sh="configure"  autogenargs="--enable-libwebpmux --enable-libwebpdecoder">
     <branch repo="webm" module="webp/libwebp-1.0.0.tar.gz" version="1.0.0"/>
@@ -128,8 +129,8 @@
              autogenargs="--enable-rpath"
              makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
     <branch repo="github-tarball" version="55.2" checkoutdir="icu"
-	    module="unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
-	    hash="sha512:4f4ee742a1f4a320ef01c3a61907002fca687bf2a8516acd2d4d3670ae289208b81f3fc0daeadf684f868bf0840be54e7eda5be55b3f9e0cb83262759d9f6f69"/>
+            module="unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
+            hash="sha256:eda2aa9f9c787748a2e2d310590720ca8bcc6252adf6b4cfb03b65bef9d66759"/>
   </autotools>
 
   <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.

modulesets/gtk-osx-python.modules

@@ -85,7 +85,6 @@
   <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/python-ldflags.patch" strip="1"/>
     </branch>
     <dependencies>
-      <dep package="gettext-runtime"/>
       <dep package='readline'/>
     </dependencies>
     <after>
@@ -99,7 +98,6 @@
             hash="sha256:2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df"
             />
     <dependencies>
-      <dep package="gettext-runtime"/>
       <dep package='readline'/>
       <dep package="openssl"/> <!-- For hashlib -->
     </dependencies>

modulesets/gtk-osx-themes.modules

@@ -24,13 +24,6 @@
     </dependencies>
   </metamodule>
 
-  <metamodule id="meta-gtk-osx-gtk3-core-themes">
-    <dependencies>
-      <dep package="icon-naming-utils"/>
-      <dep package="adwaita-icon-theme"/>
-    </dependencies>
-  </metamodule>
-
   <autotools id="icon-naming-utils" autogen-sh="configure">
     <branch repo="tango.freedesktop.org"  version="0.8.90"
             module="icon-naming-utils-0.8.90.tar.bz2"
@@ -51,16 +44,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="adwaita-icon-theme" autogen-sh="configure">
-    <branch module="adwaita-icon-theme/3.32/adwaita-icon-theme-3.32.0.tar.xz"
-            version="3.32.0" hash="sha256:698db6e407bb987baec736c6a30216dfc0317e3ca2403c7adf3a5aa46c193286"/>
-    <dependencies>
-      <dep package="librsvg"/>
-      <dep package="hicolor-icon-theme"/>
-      <dep package="icon-naming-utils"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtk-engines" autogen-sh="configure">
     <branch module="gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"
             version="2.20.2" hash="sha256:15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"/>
@@ -74,28 +57,4 @@
 	    hash="sha256:e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912"/>
   </autotools>
 
-  <!-- librsvg is converting to the Rust language. This requires
-       substantial infrastructure that's resistant to installing with
-       jhbuild, so we'll freeze at the 2.40 branch. -->
-  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
-    <branch module="librsvg/2.40/librsvg-2.40.17.tar.xz" version="2.40.17"
-	    hash="sha256:e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc"/>
-    <dependencies>
-      <dep package="libcroco"/>
-      <dep package="meta-gtk-osx-freetype"/>
-    </dependencies>
-    <after>
-<!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
-      <dep package="gtk+"/>
-      <dep package="gtk+-3.0"/>
-      <dep package="gtk+-3.14"/>
-    </after>
-  </autotools>
-
-  <autotools id="libcroco" autogenargs="--disable-Bsymbolic"
-	     autogen-sh="configure">
-    <branch module="libcroco/0.6/libcroco-0.6.13.tar.xz" version="0.6.13"
-	    hash="sha256:767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"/>
-  </autotools>
- 
 </moduleset>