GNOME.org
 

[gtk-osx: 4/6] also update modulesets and modulesets-unstable

commit 95d994fa9d560932921d3a8a54112322aa69e7be
Author: totaam <antoine nagafix co uk>
Date:   Wed Apr 8 15:26:59 2020 +0700

    also update modulesets and modulesets-unstable

 modulesets-unstable/gtk-osx-network.modules | 32 ++++++++++++++---------------
 modulesets-unstable/gtk-osx-python.modules  |  6 +++---
 modulesets/gtk-osx-network.modules          | 26 ++++++++++++-----------
 modulesets/gtk-osx-python.modules           | 10 ++++-----
 4 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index 161b8ab..2ac252c 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -41,14 +41,12 @@
   </metamodule>
 
   <!-- of the many arguments such as prefix and libdir that jhbuild might pass
-       to configure, openssl only understands prefix, and only with =. -->
-  <!-- Unfortunately Python2 hasn't been fixed up to use the 1.1 API
-       so we're stuck at 1.0. -->
-  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
+  to configure, openssl only understands prefix, and only with =. -->
+  <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.1c.tar.gz" version="1.1.1c" repo="openssl"
-            hash="sha256:f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90"/>
+    <branch module="openssl-1.1.1f.tar.gz" version="1.1.1f" repo="openssl"
+            hash="sha256:186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"/>
   </autotools>
 
   <!-- Rudely demands TeX to build documentation -->
@@ -63,12 +61,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libtasn1" supports-non-srcdir-builds="no">
-    <!-- Git repository is missing files required to build libtasn1
-    <branch repo="git.gnu.org" /> -->
-    <branch repo="ftp.gnu.org" version="4.12"
-            module="libtasn1/libtasn1-4.12.tar.gz"
-            hash="sha256:6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753" />
+  <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"
+            hash="sha256:dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" />
   </autotools>
 
   <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
@@ -80,11 +77,12 @@
   <!-- Building from git does not work because they have checked in a bunch of
   files (build-aux/, po/Makefile.in.in) that they're not supposed to.-->
   <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
+  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
   <autotools id="gnutls" autogen-sh="configure"
-             autogenargs="--disable-doc --without-p11-kit">
-    <!--branch repo="gitlab" module="gnutls/gnutls"/-->
-    <branch repo="gnutls" version="3.5.9"
-            module="gcrypt/gnutls/v3.5/gnutls-3.5.9.tar.xz"/>
+             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"/>
     <dependencies>
       <dep package="libunistring"/>
       <dep package="libnettle"/>
@@ -107,7 +105,7 @@
   </autotools>
 
   <autotools id="libpsl" autogen-sh='configure'>
-    <branch repo="github" tag="libpsl-0.20.2" module="rockdaboot/libpsl"/>
+    <branch repo="github" tag="libpsl-0.21.0" module="rockdaboot/libpsl"/>
   </autotools>
 
   <autotools id="libsoup"
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 1d518a9..184cb51 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -55,10 +55,10 @@
   </autotools>
 
   <autotools id="python" autogenargs="--enable-shared" supports-non-srcdir-builds="no"
-            autogen-sh="autoreconf">
+             autogen-sh="autoreconf">
     <branch repo="python"
-           module="2.7.16/Python-2.7.16.tar.xz" version="2.7.16"
-           hash="sha256:f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7">
+            module="2.7.17/Python-2.7.17.tgz" version="2.7.17"
+            hash="sha256:f22059d09cdf9625e0a7284d24a13062044f5bf59d93a7f3382190dfa94cecde">
         <!-- related to https://bugs.python.org/issue11445 -->
         <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/python-ldflags.patch"; 
strip="1"/>
     </branch>
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index 2c4cb57..12088f5 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -40,11 +40,11 @@
 
   <!-- 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"
+  <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.1c.tar.gz" version="1.1.1c" repo="openssl"
-            hash="sha256:f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90"/>
+    <branch module="openssl-1.1.1f.tar.gz" version="1.1.1f" repo="openssl"
+            hash="sha256:186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"/>
   </autotools>
 
   <!-- Rudely demands TeX to build documentation -->
@@ -60,12 +60,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libtasn1" supports-non-srcdir-builds="no">
+  <autotools id="libtasn1" supports-non-srcdir-builds="no" autogen-sh="configure">
     <!-- Git repository is missing files required to build libtasn1
     <branch repo="git.gnu.org" tag="libtasn1_4_4"  module="libtasn1"/> -->
-    <branch repo="ftp.gnu.org" version="4.12"
-            module="libtasn1/libtasn1-4.12.tar.gz"
-            hash="sha256:6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753" />
+    <branch repo="ftp.gnu.org" version="4.15"
+            module="libtasn1/libtasn1-4.15.tar.gz"
+            hash="sha256:dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" />
   </autotools>
 
   <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
@@ -78,11 +78,13 @@
   files (build-aux/, po/Makefile.in.in) that they're not supposed to.-->
   <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
   <autotools id="gnutls" autogen-sh="configure"
-             autogenargs="--disable-doc --without-p11-kit">
+             autogenargs="--disable-gtk-doc-html --without-p11-kit">
     <!--branch repo="gitlab" module="gnutls/gnutls"/-->
-    <branch repo="gnutls" version="3.5.9"
-            module="gcrypt/gnutls/v3.5/gnutls-3.5.9.tar.xz"/>
+    <branch repo="gnutls" version="3.6.12"
+            hash="sha256:bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b"
+            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz"/>
     <dependencies>
+      <dep package="libunistring"/>
       <dep package="libnettle"/>
       <dep package="libtasn1" />
       <dep package="zlib"/>
@@ -103,12 +105,12 @@
   </autotools>
 
   <autotools id="libpsl" autogen-sh='configure'>
-    <branch repo="github" tag="libpsl-0.20.2" module="rockdaboot/libpsl"/>
+    <branch repo="github" tag="libpsl-0.21.0" module="rockdaboot/libpsl"/>
   </autotools>
 
   <autotools id="libsoup"
              autogenargs="set_more_warnings=no --enable-introspection=no">
-    <branch revision="gnome-3-30"/>
+    <branch revision="gnome-3-34"/>
     <dependencies>
       <dep package="libpsl"/>
       <dep package="python3"/>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 705ab90..e3d91c9 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -59,11 +59,11 @@
   <autotools id="python" autogenargs="--enable-shared"
             supports-non-srcdir-builds="no" autogen-sh="autoreconf">
        <branch repo="python"
-              module="2.7.16/Python-2.7.16.tar.xz" version="2.7.16"
-              hash="sha256:f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7">
-          <!-- related to https://bugs.python.org/issue11445 -->
-          <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/python-ldflags.patch"; 
strip="1"/>
-       </branch>
+               module="2.7.17/Python-2.7.17.tgz" version="2.7.17"
+               hash="sha256:f22059d09cdf9625e0a7284d24a13062044f5bf59d93a7f3382190dfa94cecde">
+  <!-- related to https://bugs.python.org/issue11445 -->
+  <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'/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]