[gtk-osx] Update boostrap modules to the various packages latest releases.

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-osx] Update boostrap modules to the various packages latest releases.
Date: Sun, 10 May 2020 23:39:01 +0000 (UTC)
commit 9fada7d058b6553bad1e9273e1f4fab5255b8eca
Author: John Ralls <jralls ceridwen us>
Date:   Sun May 10 16:16:12 2020 -0700

    Update boostrap modules to the various packages latest releases.
    
    Gettext no longer compiles as separate projects so it's consolidated
    in bootstrap.modules (the one run by jhbuild bootstrap-gtk-osx).
    Since that's always a prerequisite the python dependencies on it
    are removed.

 modulesets-stable/bootstrap.modules           | 37 ++++++++++-----------------
 modulesets-stable/gtk-osx-bootstrap.modules   | 32 ++++++++---------------
 modulesets-stable/gtk-osx-python.modules      |  2 --
 modulesets-unstable/gtk-osx-bootstrap.modules |  7 -----
 modulesets-unstable/gtk-osx-python.modules    |  2 --
 modulesets/gtk-osx-bootstrap.modules          |  6 -----
 modulesets/gtk-osx-python.modules             |  2 --
 7 files changed, 24 insertions(+), 64 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index b718b7d..a5c4ee1 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/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,
@@ -145,7 +134,7 @@
   <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" />
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index f2600ff..17342f2 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/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"/>
@@ -162,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>
@@ -185,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>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 6b76854..200af1b 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/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>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index d8b5bbd..78f3af9 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -183,19 +183,12 @@
             version="0.13"/>
   </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.gz" version="0.19.8"/>
-  </autotools>
-
    <metamodule id="meta-gtk-osx-bootstrap">
     <dependencies>
       <dep package="readline"/>
       <dep package="libpng"/>
       <dep package="libjpeg"/>
       <dep package="libtiff"/>
-      <dep package="gettext-runtime"/>
       <dep package="hicolor-icon-theme"/>
       <dep package="gtk-doc"/>
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 2da7c1d..fc9a468 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -63,7 +63,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'/>
       <dep package="openssl" /> <!-- For hashlib -->
     </dependencies>
@@ -77,7 +76,6 @@
             hash="sha256:2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df"
             />
     <dependencies>
-      <dep package="gettext-runtime"/>
       <dep package='readline'/>
       <dep package="openssl" /> <!-- For hashlib -->
     </dependencies>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 59796e5..25a045a 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -164,12 +164,6 @@
             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"/>
-  </autotools>
-
   <metamodule id="meta-gtk-osx-bootstrap">
     <dependencies>
       <dep package="readline"/>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index ec0e2b7..67c7333 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -65,7 +65,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'/>
       <dep package="openssl"/> <!-- For hashlib -->
     </dependencies>
@@ -79,7 +78,6 @@
             hash="sha256:2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df"
             />
     <dependencies>
-      <dep package="gettext-runtime"/>
       <dep package='readline'/>
       <dep package="openssl" /> <!-- For hashlib -->
     </dependencies>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]