[geany/geany-osx] 914fbe: Update to latest version of working modules - Commits

15 Nov 2021


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Mon, 15 Nov 2021 16:41:24 UTC
Commit:      914fbefe2e3555c08a82e27d0cb70de02df8235d
             https://github.com/geany/geany-osx/commit/914fbefe2e3555c08a82e27d0cb70de02d...
Log Message:
-----------
Update to latest version of working modules
Modified Paths:
--------------
    modulesets-stable/bootstrap.modules
    modulesets-stable/gtk-osx-bootstrap.modules
    modulesets-stable/gtk-osx-network.modules
    modulesets-stable/gtk-osx-random.modules
    modulesets-stable/gtk-osx.modules
    patches/libtool-apple-sort.patch
    patches/libxml2-python-config.patch
    patches/shared-mime-info-2.1-freedesktop-generate.patch
Modified: modulesets-stable/bootstrap.modules
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -74,7 +74,9 @@
   <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"
-            hash="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"/>
+            hash="sha256:e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3">
+      <patch file="libtool-apple-sort.patch" strip="1"/>
+    </branch>
   </autotools>
Modified: modulesets-stable/gtk-osx-bootstrap.modules
10 lines changed, 5 insertions(+), 5 deletions(-)
===================================================================
@@ -41,7 +41,7 @@
     <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" />
+	<patch file="tiff-nohtml.patch" strip="1" />
     </branch>
     <dependencies>
       <dep package="libjpeg"/>
@@ -54,12 +54,12 @@
        module won't link. In case you're wondering, itstool
        needs libxml2's python module. -->
-  <autotools id="libxml2" autogen-sh="configure"
+  <autotools id="libxml2" autogen-sh="autoreconf"
              autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
-    <branch version="2.9.10" module="libxml2-2.9.10.tar.gz"
+    <branch version="2.9.12" module="libxml2-2.9.12.tar.gz"
             repo="xmlsoft.org"
-            hash="sha256:aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f">
-      <patch file="libxml2.9.10-conditional-parentheses.patch" strip="1"/>            
+            hash="sha256:c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92">
+      <patch file="libxml2-python-config.patch" strip="1"/>
     </branch>
     <after>
       <dep package="python2"/>
Modified: modulesets-stable/gtk-osx-network.modules
40 lines changed, 29 insertions(+), 11 deletions(-)
===================================================================
@@ -35,17 +35,33 @@
   </autotools>
<!-- Rudely demands TeX to build documentation -->
-  <autotools id="libnettle" autogen-sh="configure"
-             autogenargs="--disable-documentation">
-    <branch repo="ftp.gnu.org" version="3.7.2"
-            module="nettle/nettle-3.7.2.tar.gz"
-            hash="sha256:8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162">
-    </branch>
-    <dependencies>
-      <dep package="gmp"/>
-      <dep package="openssl"/>
-    </dependencies>
-  </autotools>
+  <!-- libnettle 3.7 doesn't have arm64 assembler support and the support that's added in master is for arm-64-neutron that's incompatible with Apple Silicon. -->
+  <if condition-set="arm64">
+    <autotools id="libnettle" autogen-sh="configure"
+               autogenargs="--disable-documentation --disable-assembler">
+      <branch repo="ftp.gnu.org" version="3.7.2"
+              module="nettle/nettle-3.7.2.tar.gz"
+              hash="sha256:8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162">
+      </branch>
+      <dependencies>
+        <dep package="gmp"/>
+        <dep package="openssl"/>
+      </dependencies>
+    </autotools>
+  </if>
+  <if condition-unset="arm64">
+    <autotools id="libnettle" autogen-sh="configure"
+               autogenargs="--disable-documentation">
+      <branch repo="ftp.gnu.org" version="3.7.2"
+              module="nettle/nettle-3.7.2.tar.gz"
+              hash="sha256:8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162">
+      </branch>
+      <dependencies>
+        <dep package="gmp"/>
+        <dep package="openssl"/>
+      </dependencies>
+    </autotools>
+  </if>
<autotools id="libtasn1" autogen-sh="configure">
     <branch repo="ftp.gnu.org" version="4.17.0"
@@ -69,6 +85,7 @@
             hash="sha256:8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6">
     </branch>
     <dependencies>
+      <dep package="libffi"/>
       <dep package="libtasn1"/>
     </dependencies>
   </autotools>
@@ -85,6 +102,7 @@
         <dep package="libtasn1"/>
         <dep package="zlib"/>
         <dep package="p11-kit"/>
+        <dep package="libgcrypt"/>
       </dependencies>
     </autotools>
   </if>
Modified: modulesets-stable/gtk-osx-random.modules
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -138,6 +138,7 @@
     <branch module="0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz"
             repo="shared-mime-info" version="2.1"
             hash="sha256:b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563">
+      <patch file="shared-mime-info-2.1-freedesktop-generate.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
Modified: modulesets-stable/gtk-osx.modules
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -233,7 +233,7 @@
     </after>
   </meson>
-  <meson id="gdk-pixbuf" mesonargs="-Dman=false">
+  <meson id="gdk-pixbuf" mesonargs="-Drelocatable=true -Dman=false">
     <branch module="gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.tar.xz" version="2.42.4"
             hash="sha256:fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d">
       <patch file="gdk-pixbuf-loader-name.patch" strip="1"/>
@@ -294,8 +294,7 @@
   </meson>
<!-- gtk3 is in maintenance mode with 3.24 the final release series. -->
-  <meson id="gtk+-3.0"
-             mesonargs="-Dquartz_backend=true -Dx11_backend=false">
+  <meson id="gtk+-3.0" mesonargs="-Dx11_backend=false">
     <branch module="gtk+/3.24/gtk+-3.24.30.tar.xz" version="3.24.30"
             hash="sha256:ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9">
       <patch file="Quartz-version-detection-for-macOS-12.patch" strip="1"/>
@@ -367,7 +366,8 @@
             hash="sha256:767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"/>
   </autotools>
-  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
+  <autotools id="librsvg" autogen-sh="autoreconf"
+             autogenargs="--disable-Bsymbolic">
     <branch module="librsvg/2.51/librsvg-2.51.0.tar.xz" version="2.51.0"
             hash="sha256:89d32e38445025e1b1d9af3dd9d3aeb9f6fce527aeecbecf38b369b34c80c038"/>
     <dependencies>
Modified: patches/libtool-apple-sort.patch
38 lines changed, 38 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,38 @@
+--- a/Makefile.am	2015-01-20 07:34:33.000000000 -0800
++++ b/Makefile.am	2021-11-12 10:18:23.000000000 -0800
+@@ -416,8 +416,8 @@
+ # files created in the build tree, so instead we regenerate the
+ # manual pages if the sources for the build-tree files we want to
+ # run have changed.
+-$(libtool_1): $(ltmain_sh)
+-	$(AM_V_GEN)$(update_mans) --help-option=--help-all libtool
++#$(libtool_1): $(ltmain_sh)
++#	$(AM_V_GEN)$(update_mans) --help-option=--help-all libtool
+ $(libtoolize_1): $(libtoolize_in)
+ 	$(AM_V_GEN)$(update_mans) libtoolize
+ 
+--- s/Makefile.in	2015-02-15 08:14:14.000000000 -0800
++++ b/Makefile.in	2021-11-12 10:26:26.000000000 -0800
+@@ -2324,8 +2324,8 @@
+ # files created in the build tree, so instead we regenerate the
+ # manual pages if the sources for the build-tree files we want to
+ # run have changed.
+-$(libtool_1): $(ltmain_sh)
+-	$(AM_V_GEN)$(update_mans) --help-option=--help-all libtool
++#$(libtool_1): $(ltmain_sh)
++#	$(AM_V_GEN)$(update_mans) --help-option=--help-all libtool
+ $(libtoolize_1): $(libtoolize_in)
+ 	$(AM_V_GEN)$(update_mans) libtoolize
+ 
+--- a/build-aux/ltmain.in	2015-02-06 04:57:56.000000000 -0800
++++ b/build-aux/ltmain.in	2021-11-08 14:58:33.000000000 -0800
+@@ -3188,7 +3188,7 @@
+     if test yes = "$lock_old_archive_extraction"; then
+       $opt_dry_run || rm -f "$lockfile"
+     fi
+-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++    if ($AR t "$f_ex_an_ar_oldlib" | sort -u | sort -c >/dev/null 2>&1); then
+      :
+     else
+       func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+
Modified: patches/libxml2-python-config.patch
23 lines changed, 23 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,23 @@
+--- a/configure.ac	2021-05-13 11:44:23.000000000 -0700
++++ b/configure.ac	2021-11-08 11:13:54.000000000 -0800
+@@ -905,7 +905,17 @@
+ 	fi
+     fi
+     pythondir='$(PYTHON_SITE_PACKAGES)'
+-    PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
++    py_ver_major=$(echo $PYTHON_VERSION | cut -d . -f 1)
++    py_ver_minor=$(echo $PYTHON_VERSION | cut -d . -f 2)
++    if test $py_ver_major -eq 3 -a $py_ver_minor -ge 8
++    then
++       PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags --embed`
++    elif test $py_ver_major -gt 3
++    then
++       PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags --embed`
++    else
++        PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
++    fi
+ else
+     PYTHON=
+ fi
+
+Diff finished.  Mon Nov  8 11:28:35 2021
Modified: patches/shared-mime-info-2.1-freedesktop-generate.patch
27 lines changed, 27 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,27 @@
+--- a/data/freedesktop_generate.sh	2020-12-31 11:12:16.000000000 -0800
++++ b/data/freedesktop_generate.sh	2021-11-07 13:50:19.000000000 -0800
+@@ -3,10 +3,17 @@
+ src_root="$1"
+ build_root="$2"
+ 
+-ninja -C "${build_root}" shared-mime-info-gmo
+-
+-itstool \
+-    --its "${src_root}/data/its/shared-mime-info.its" \
+-    --join "${src_root}/data/freedesktop.org.xml.in" \
+-    -o "${build_root}/data/freedesktop.org.xml" \
+-    "${build_root}/po/"*".gmo"
++if test ! -d "${build_root}/po/de"; then
++    ninja -C "${build_root}" shared-mime-info-gmo
++    itstool \
++        --its "${src_root}/data/its/shared-mime-info.its" \
++        --join "${src_root}/data/freedesktop.org.xml.in" \
++        -o "${build_root}/data/freedesktop.org.xml" \
++        "${build_root}/po/"*".gmo"
++else
++    itstool \
++        --its "${src_root}/data/its/shared-mime-info.its" \
++        --join "${src_root}/data/freedesktop.org.xml.in" \
++        -o "${build_root}/data/freedesktop.org.xml" \
++        "${build_root}/po/"*"/LC_MESSAGES/shared-mime-info.mo"
++fi
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    