GNOME.org
 

[gtk-osx] Update bootstrap.modules

commit 637eb0fa46cb695c21498696e19d62c3dd45cc01
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 30 10:50:06 2021 -0700

    Update bootstrap.modules

 modulesets-stable/bootstrap.modules                | 85 ++++++++++++----------
 modulesets-stable/gtk-osx-bootstrap.modules        |  4 +-
 ...son-3.0.4-vasnprintf.patch => vasnprintf.patch} |  4 +-
 3 files changed, 51 insertions(+), 42 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 315c6e4e..296cc65b 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -14,96 +14,105 @@
   <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
   <repository type="tarball" name="intltool"
               href="http://launchpad.net/intltool/trunk/"/>
-
-  <autotools id='readline' autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="readline/readline-8.0.tar.gz"
-            hash="sha256:e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461"
-            version="8.0">
-    </branch>
-  </autotools>
+  <repository type="tarball" name="github" href="https://github.com"/>
 
   <autotools id="xz" autogen-sh="configure" bootstrap="true">
-    <branch repo="tukaani.org" module="xz/xz-5.2.5.tar.bz2" version="5.2.5"/>
+    <branch repo="tukaani.org" module="xz/xz-5.2.5.tar.bz2" version="5.2.5"
+            hash="sha256:5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df"/>
   </autotools>
 
-
   <!-- gnu make 4.xx, needed to unbreak parallel builds for the webkit -->
-  <autotools id="gnumake" autogen-sh="configure"
+  <autotools id="gnumake" autogen-sh="configure"  bootstrap="true"
              autogenargs="--disable-dependency-tracking">
     <branch repo="ftp.gnu.org"
-            module="make/make-4.2.1.tar.bz2" version="4.2.1" 
hash="sha256:d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589">
+            module="make/make-4.3.tar.gz" version="4.3"
+            hash="sha256:e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19">
     </branch>
   </autotools>
+
   <autotools id="gettext" autogen-sh="configure"
-             autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf 
--disable-csharp --with-included-glib --with-included-libcroco">
+             autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf 
--disable-csharp --with-included-glib --with-included-libcroco"
+             hash="sha256:d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192">
     <branch repo="ftp.gnu.org"
-            module="gettext/gettext-0.20.2.tar.xz" version="0.20.2">
+            module="gettext/gettext-0.21.tar.xz" version="0.21">
     </branch>
   </autotools>
 
   <!-- cmakes ./configure is picky about invalid flags so we manually set it -->
-  <autotools id="cmake" autogen-sh="bootstrap"
+  <autotools id="cmake" autogen-sh="bootstrap"  bootstrap="true"
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
-    <branch repo="cmake" module="v3.17/cmake-3.17.2.tar.gz" version="3.17.2">
+    <branch repo="cmake" module="v3.20/cmake-3.20.0.tar.gz" version="3.20.0">
+    </branch>
+  </autotools>
+  <!-- The version of m4 provided with Xcode is now too old, see
+       https://savannah.gnu.org/support/index.php?110397 -->
+  <autotools id="m4" autogen-sh="configure" bootstrap="true">
+    <branch repo="ftp.gnu.org"
+            module="m4/m4-1.4.18.tar.xz" version="1.4.18"
+            hash="sha256:f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07">
+      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/vasnprintf.patch"; strip="1"/>
     </branch>
   </autotools>
 
   <autotools id="autoconf" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
-            module="autoconf/autoconf-2.69.tar.xz" version="2.69"/>
+            module="autoconf/autoconf-2.71.tar.xz" version="2.71"
+            hash="shas56:f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4"/>
     <dependencies>
+      <dep package="m4"/>
       <dep package="xz"/>
     </dependencies>
   </autotools>
 
-  <autotools id="autoconf-archive" autogen-sh="configure">
+  <autotools id="autoconf-archive" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
-            module="autoconf-archive/autoconf-archive-2019.01.06.tar.xz"
-            version="2019-01-06"/>
+            module="autoconf-archive/autoconf-archive-2021.02.19.tar.xz"
+            version="2021-02-19"
+            hash="sha256:e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd"/>
   </autotools>
 
   <autotools id="libtool" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
-            module="libtool/libtool-2.4.6.tar.gz" version="2.4.6"/>
+            module="libtool/libtool-2.4.6.tar.gz" version="2.4.6"
+            hash="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"/>
   </autotools>
 
 
   <autotools id="automake" autogen-sh="configure" bootstrap="true">
-    <branch repo="ftp.gnu.org" version="1.16.2"
-            module="automake/automake-1.16.2.tar.xz"/>
+    <branch repo="ftp.gnu.org" version="1.16.3"
+            module="automake/automake-1.16.3.tar.xz"
+            hash="sha256:ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a"/>
     <dependencies>
       <dep package="autoconf"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pkg-config" autogen-sh="configure"
+  <autotools id="pkg-config" autogen-sh="configure" bootstrap="true"
              autogenargs="--with-internal-glib">
     <branch repo="pkgconfig"
-            module="pkg-config-0.29.2.tar.gz" version="0.29.2"/>
+            module="pkg-config-0.29.2.tar.gz" version="0.29.2"
+            hash="sha256:6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"/>
   </autotools>
 
   <!-- MacOS provides 2.3 (presumably the last GPL2 version, gstreamer
        requires 2.4. -->
   <autotools id="bison" autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="bison/bison-3.6.tar.xz"
-            version="3.6">
+    <branch repo="ftp.gnu.org" module="bison/bison-3.7.6.tar.xz"
+            version="3.7.6"
+            hash="sha256:67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf">
     </branch>
     <dependencies>
       <dep package='flex'/>
     </dependencies>
   </autotools>
-  
-  <!-- As of 9 May 2020 Flex hasn't had an update since November 2015. -->
+
+  <!-- As of 29 March 2021 Flex hasn't had an update since May 2017. -->
   <autotools id="flex" autogen-sh="configure">
-    <branch module="flex/flex-2.6.0.tar.xz" version="2.6.0"
-            repo="sourceforge" />
+    <branch module="westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz"
+            repo="github" version="2.6.4"
+            hash="sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995"/>
   </autotools>
   
-  <autotools id="expat" autogen-sh="configure">
-    <branch module="expat/expat-2.2.9.tar.bz2" version="2.2.9"
-            repo="sourceforge"/>
-  </autotools>
-
   <!-- This is generated by tarring up the needed docbook stylesheets
        for gtk-doc to work. If someone wants to work on a setup that
        uses the real docbook source from upstream, feel free to do so,
@@ -114,13 +123,14 @@
   <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"/>
+            version="1.2"
+            hash="sha256:40f0a97116b5abb7a38191b2720c15e690d3ffb1ab64883bba1f8a807b5e117e"/>
   </autotools>
 
   <autotools id="intltool" autogen-sh="configure">
     <branch repo="intltool" module="0.51.0/+download/intltool-0.51.0.tar.gz"
             version="0.51.0"
-            hash="md5:12e517cac2b57a0121cda351570f1e63"/>
+            hash="sha256:67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"/>
     <!--dependencies>
       <dep package="perl-xml-parser"/>
     </dependencies-->
@@ -131,7 +141,6 @@
       <dep package="xz"/>
       <dep package="gettext" /> <!-- Needed for 64-bit -->
       <dep package="cmake"/>
-      <dep package="autoconf" />
       <dep package="autoconf-archive" />
       <dep package="libtool" />
       <dep package="automake"/>
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 8adc9bf8..7fdc24bb 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -24,8 +24,8 @@
               href="http://www.colm.net/files/ragel/"/>
 
   <autotools id='readline' autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="readline/readline-8.0.tar.gz"
-      version="8.0">
+    <branch repo="ftp.gnu.org" module="readline/readline-8.1.tar.gz"
+      version="8.1">
     </branch>
   </autotools>
 
diff --git a/patches/bison-3.0.4-vasnprintf.patch b/patches/vasnprintf.patch
similarity index 78%
rename from patches/bison-3.0.4-vasnprintf.patch
rename to patches/vasnprintf.patch
index adc1452f..995e1e37 100644
--- a/patches/bison-3.0.4-vasnprintf.patch
+++ b/patches/vasnprintf.patch
@@ -1,5 +1,5 @@
---- bison-3.0.4-orig/lib/vasnprintf.c  2017-09-29 11:10:29.000000000 +0200
-+++ bison-3.0.4/lib/vasnprintf.c       2017-09-29 11:15:06.000000000 +0200
+--- a/lib/vasnprintf.c 2017-09-29 11:10:29.000000000 +0200
++++ b/lib/vasnprintf.c 2017-09-29 11:15:06.000000000 +0200
 @@ -4858,7 +4858,7 @@
  #endif
                    *fbp = dp->conversion;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]