GNOME.org
 

[gtk-osx] Update gtk-osx-bootstrap.modules

commit cf1c75ba62b1b5acbaeeffb21bae3086707b0455
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 30 15:20:53 2021 -0700

    Update gtk-osx-bootstrap.modules
    
    And clean up, removing modules that aren't required here.

 gtk-osx-setup.sh                                   |  4 +-
 modulesets-stable/gtk-osx-bootstrap.modules        | 64 ++++++-------------
 modulesets-stable/gtk-osx-random.modules           |  6 ++
 patches/libxml2.9.10-conditional-parentheses.patch | 74 ++++++++++++++++++++++
 4 files changed, 101 insertions(+), 47 deletions(-)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index aca7959c..85bbd671 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -111,7 +111,7 @@ if test ! -x "`eval echo $PIP`" ; then
 fi
 
 # Install pipenv
-$PIP install --upgrade --user pipenv==2018.10.09
+$PIP install --upgrade --user pipenv==2020.11.15
 pip_remove typing
 PIPENV="$PYTHONUSERBASE/bin/pipenv"
 
@@ -121,7 +121,7 @@ if test ! -d "$DEV_SRC_ROOT/jhbuild/.git" ; then
     cd "$DEV_SRC_ROOT/jhbuild"
 else #Get the latest if it's already installed
     cd "$DEV_SRC_ROOT/jhbuild"
-    git reset --hard 3.36.0
+    git reset --hard 3.38.0
 fi
 
 # Install Ninja
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 7fdc24bb..aaafbe8b 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -20,14 +20,6 @@
               href="https://gitlab.gnome.org/GNOME"/>
   <repository type="tarball" name="itstool" href="http://files.itstool.org/"/>
   <repository type="tarball" name="github-tarball" href="https://github.com/"/>
-  <repository type="tarball" name="ragel"
-              href="http://www.colm.net/files/ragel/"/>
-
-  <autotools id='readline' autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="readline/readline-8.1.tar.gz"
-      version="8.1">
-    </branch>
-  </autotools>
 
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
     <branch version="1.6.37" module="libpng/libpng-1.6.37.tar.xz"
@@ -40,15 +32,15 @@
 
   <autotools id="libjpeg" autogen-sh="configure">
     <branch module="jpegsrc.v9d.tar.gz" version="9d"
-            repo="jpeg"
-            checkoutdir="jpeg-9d">
+            repo="jpeg" checkoutdir="jpeg-9d"
+            hash="sha256:99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32">
     </branch>
   </autotools>
 
   <autotools id="libtiff" autogen-sh="configure" autogenargs="--without-x">
-    <branch version="4.1.0" module="libtiff/tiff-4.1.0.tar.gz"
-           hash="sha156:5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634"
-           repo="libtiff">
+    <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" />
     </branch>
     <dependencies>
@@ -64,9 +56,11 @@
 
   <autotools id="libxml2" autogen-sh="configure"
              autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
-    <branch version="2.9.9" module="libxml2-2.9.9.tar.gz"
-            hash="sha256:94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"
-           repo="xmlsoft.org"/>
+    <branch version="2.9.10" module="libxml2-2.9.10.tar.gz"
+            repo="xmlsoft.org"
+            hash="sha256:aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f">
+      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libxml2.9.10-conditional-parentheses.patch"; 
strip="1"/>            
+    </branch>
     <after>
       <dep package="python2"/>
       <dep package="python3"/>
@@ -84,7 +78,8 @@
 
   <autotools id="itstool" autogen-sh="configure">
     <branch module="itstool/itstool-2.0.6.tar.bz2" version="2.0.6n"
-            repo="itstool">
+            repo="itstool"
+            hash="sha256:6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9">
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/itstool-config-python.patch"; 
strip="1"/>
     </branch>
     <dependencies>
@@ -92,30 +87,9 @@
     </dependencies>
   </autotools>
 
-  <autotools id="yelp-xsl">
-    <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"/>
-      <dep package="itstool"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="yelp-tools">
-    <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"/>
-      <dep package="itstool"/>
-      <dep package="yelp-xsl"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gtk-doc" autogen-sh="configure">
-    <branch version="1.32" module="gtk-doc/1.32/gtk-doc-1.32.tar.xz"
-            hash="sha256:de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"/>
+  <meson id="gtk-doc" mesonargs="-Dyelp_manual=false -Dtests=false">
+    <branch version="1.33.2" module="gtk-doc/1.33/gtk-doc-1.33.2.tar.xz"
+            hash="sha256:cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
@@ -124,13 +98,13 @@
     <after>
       <dep package="python3"/>
     </after>
-  </autotools>
+  </meson>
 
   <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="66.1" checkoutdir="icu"
-            module="unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz"
-            hash="sha256:52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e"/>
+    <branch repo="github-tarball" version="68.2" checkoutdir="icu"
+            module="unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz"
+            />
   </autotools>
 
   <metamodule id="meta-gtk-osx-bootstrap">
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 1a828a72..598d7ce0 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -218,4 +218,10 @@
     </branch>
   </autotools>
 
+  <autotools id='readline' autogen-sh="configure">
+    <branch repo="ftp.gnu.org" module="readline/readline-8.1.tar.gz"
+      version="8.1">
+    </branch>
+  </autotools>
+
 </moduleset>
diff --git a/patches/libxml2.9.10-conditional-parentheses.patch 
b/patches/libxml2.9.10-conditional-parentheses.patch
new file mode 100644
index 00000000..3c6d9837
--- /dev/null
+++ b/patches/libxml2.9.10-conditional-parentheses.patch
@@ -0,0 +1,74 @@
+diff -u /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/libxml2-2.9.10/python/libxml.c\~ 
/Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/libxml2-2.9.10/python/libxml.c
+--- a/python/libxml.c  2019-10-22 11:46:01.000000000 -0700
++++ b/python/libxml.c  2021-04-10 16:44:06.000000000 -0700
+@@ -294,7 +294,7 @@
+       lenread = PyBytes_Size(ret);
+       data = PyBytes_AsString(ret);
+ #ifdef PyUnicode_Check
+-    } else if PyUnicode_Check (ret) {
++    } else if (PyUnicode_Check (ret)) {
+ #if PY_VERSION_HEX >= 0x03030000
+         Py_ssize_t size;
+       const char *tmp;
+@@ -359,7 +359,7 @@
+       lenread = PyBytes_Size(ret);
+       data = PyBytes_AsString(ret);
+ #ifdef PyUnicode_Check
+-    } else if PyUnicode_Check (ret) {
++    } else if (PyUnicode_Check (ret)) {
+ #if PY_VERSION_HEX >= 0x03030000
+         Py_ssize_t size;
+       const char *tmp;
+
+Diff finished.  Sat Apr 10 16:50:53 2021
+diff -u /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/libxml2-2.9.10/python/types.c\~ 
/Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/libxml2-2.9.10/python/types.c
+--- a/python/types.c   2019-10-22 11:46:01.000000000 -0700
++++ b/python/types.c   2021-04-10 16:48:01.000000000 -0700
+@@ -602,16 +602,16 @@
+     if (obj == NULL) {
+         return (NULL);
+     }
+-    if PyFloat_Check (obj) {
++    if (PyFloat_Check (obj)) {
+         ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
+-    } else if PyLong_Check(obj) {
++    } else if (PyLong_Check(obj)) {
+ #ifdef PyLong_AS_LONG
+         ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
+ #else
+         ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
+ #endif
+ #ifdef PyBool_Check
+-    } else if PyBool_Check (obj) {
++    } else if (PyBool_Check (obj)) {
+ 
+         if (obj == Py_True) {
+           ret = xmlXPathNewBoolean(1);
+@@ -620,14 +620,14 @@
+           ret = xmlXPathNewBoolean(0);
+         }
+ #endif
+-    } else if PyBytes_Check (obj) {
++    } else if (PyBytes_Check (obj)) {
+         xmlChar *str;
+ 
+         str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
+                          PyBytes_GET_SIZE(obj));
+         ret = xmlXPathWrapString(str);
+ #ifdef PyUnicode_Check
+-    } else if PyUnicode_Check (obj) {
++    } else if (PyUnicode_Check (obj)) {
+ #if PY_VERSION_HEX >= 0x03030000
+         xmlChar *str;
+       const char *tmp;
+@@ -650,7 +650,7 @@
+       ret = xmlXPathWrapString(str);
+ #endif
+ #endif
+-    } else if PyList_Check (obj) {
++    } else if (PyList_Check (obj)) {
+         int i;
+         PyObject *node;
+         xmlNodePtr cur;
+
+Diff finished.  Sat Apr 10 16:48:32 2021
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]