GNOME.org
 

[gtk-osx] Update stable versions in all gtk-osx and gtk-osx-gtkmm modules.

commit 865f982d223dbcad5867ca2fc416d81540064569
Author: John Ralls <jralls ceridwen us>
Date:   Thu Aug 1 13:51:36 2019 -0700

    Update stable versions in all gtk-osx and gtk-osx-gtkmm modules.
    
    Note that the python3 dependency of gobject-introspection has been made
    "soft". It builds fine with the virtenv python3 *on native builds only*.
    Also note that cairomm is held at 1.13.1, see the comment in
    gtk-osx-gtkmm.modules.

 jhbuildrc-gtk-osx                       | 32 +++++++++++---------
 modulesets-stable/gtk-osx-gtkmm.modules | 27 ++++++++++-------
 modulesets-stable/gtk-osx.modules       | 53 +++++++++++++++++----------------
 3 files changed, 61 insertions(+), 51 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 240efa5..2c6505e 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -570,20 +570,24 @@ else:
 if not _ran_recursively and _gtk_osx_prompt_prefix:
     os.environ["JHBUILD_PROMPT"] = "[" + _gtk_osx_prompt_prefix + "] "
 
-#Bug 766738: Apple's python tries to install extensions in
-#/Library/Python, which requires sudo. Change that to the right place
-#inside prefix. Note that we need the installed python's version to
-#get the right directory name.
-
-if (not "python" in modules and not 'python3' in modules and
-    not os.path.exists(os.path.join(prefix, 'bin', 'python2'))):
-    _python_ver = _popen('bash -c "python -V"')
-    if _python_ver:
-        _python_ver = 'python' + _python_ver.split(" ")[1][0:3]
-        _python_install_path = os.path.join(prefix, 'lib',
-                                            _python_ver, 'site-packages')
-        append_autogenargs('libxml2',
-                           '--with-python-install-dir=' + _python_install_path)
+# We want libxml2 to install its python module in $PREFIX even if
+# we're not building python because if it tries to install in the
+# virtenv site-packages jhbuild will refuse to install it. Ideally
+# we'd do this only if not building python because if we do then it
+# finds the right place and does the right thing. Unfortunately
+# there's no way to get the config object from the project to find out
+# if we're building python.
+
+# Note that this will break if the built python is a different major + minor
+# version from the virtenv one.
+_python_ver = _popen('bash -c "python -V"')
+if _python_ver:
+    _python_ver = 'python' + _python_ver.split(" ")[1][0:3]
+    _python_install_path = os.path.join(prefix, 'lib',
+                                        _python_ver, 'site-packages')
+    append_autogenargs('libxml2',
+                       '--with-python-install-dir=' + _python_install_path)
+    environ_append('PYTHONPATH', _python_install_path, ':')
 
 # Unset this so we don't mess with the check for not starting
 # recursively.
diff --git a/modulesets-stable/gtk-osx-gtkmm.modules b/modulesets-stable/gtk-osx-gtkmm.modules
index c572d8f..b96cd1b 100644
--- a/modulesets-stable/gtk-osx-gtkmm.modules
+++ b/modulesets-stable/gtk-osx-gtkmm.modules
@@ -22,9 +22,14 @@
   </metamodule>
 
   <autotools id="mm-common" autogen-sh="configure">
-    <branch module="mm-common/0.9/mm-common-0.9.10.tar.xz" version="0.9.10"/>
+    <branch module="mm-common/0.9/mm-common-0.9.12.tar.xz" version="0.9.12"
+            hash="sha256:ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b"/>
   </autotools>
 
+  <!-- Cairomm 1.15 has been around since the end of 2016 but they
+       renamed their pc files because of an ABI change and neither
+       pangomm nor gtkmm have adopted the new pc files, so stay with
+       cairomm-1.13. -->
   <autotools id="cairomm" autogen-sh="configure">
     <branch module="cairomm-1.13.1.tar.gz" version="1.13.1"
            hash="sha1:63cd9eab40686f368a8edd3e6912ac18b3048ecf"
@@ -37,8 +42,8 @@
   </autotools>
 
   <autotools id="glibmm" autogen-sh="autoreconf">
-    <branch module="glibmm/2.52/glibmm-2.52.1.tar.xz" version="2.52.1"
-            hash="sha256:dc19d20fb6b24d6b6da7cbe1b2190b38ae6ad64e6b93fecdcce71b995f43c975">
+    <branch module="glibmm/2.60/glibmm-2.60.0.tar.xz" version="2.60.0"
+            hash="sha256:a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc">
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -48,8 +53,8 @@
   </autotools>
 
   <autotools id="pangomm" autogen-sh="configure">
-    <branch module="pangomm/2.40/pangomm-2.40.1.tar.xz" version="2.40.1"
-            hash="sha256:9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af"/>
+    <branch module="pangomm/2.42/pangomm-2.42.0.tar.xz" version="2.42.0"
+            hash="sha256:ca6da067ff93a6445780c0b4b226eb84f484ab104b8391fb744a45cbc7edbf56"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
@@ -58,8 +63,8 @@
   </autotools>
 
   <autotools id="atkmm" autogen-sh="configure">
-    <branch module="atkmm/2.24/atkmm-2.24.2.tar.xz" version="2.24.2"
-           hash="sha256:ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"/>
+    <branch module="atkmm/2.28/atkmm-2.28.0.tar.xz" version="2.28.0"
+           hash="sha256:4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
@@ -75,13 +80,13 @@
      documentation in your jhbuildrc-custom. -->
   <autotools id="libsigc++2" autogen-sh="configure"
             autogenargs="--disable-documentation">
-    <branch module="libsigc++/2.10/libsigc++-2.10.0.tar.xz" version="2.10.0"
-            hash="sha256:f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"/>
+    <branch module="libsigc++/2.10/libsigc++-2.10.2.tar.xz" version="2.10.2"
+            hash="sha256:b1ca0253379596f9c19f070c83d362b12dfd39c0a3ea1dd813e8e21c1a097a98"/>
   </autotools>
 
   <autotools id="gtkmm3" autogen-sh="configure">
-    <branch module="gtkmm/3.22/gtkmm-3.22.0.tar.xz" version="3.22.0"
-            hash="sha256:05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5">
+    <branch module="gtkmm/3.24/gtkmm-3.24.1.tar.xz" version="3.24.1"
+            hash="sha256:ddfe42ed2458a20a34de252854bcf4b52d3f0c671c045f56b42aa27c7542d2fd">
     </branch>
     <dependencies>
       <dep package="glibmm"/>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 4db1615..f17d3fc 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -93,9 +93,9 @@
     </systemdependencies>
   </systemmodule>
 
-  <autotools id="glib" autogenargs="--with-pcre=internal">
-    <branch module="glib/2.58/glib-2.58.3.tar.xz"  version="2.58.3"
-            hash="sha256:8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481">
+  <meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=false">
+    <branch module="glib/2.60/glib-2.60.6.tar.xz"  version="2.60.6"
+            hash="sha256:ff8fab8d8deaa4fd0536c90f90d9769a09071779c7e6183907f6855645bffb6c">
     </branch>
     <dependencies>
         <dep package="libffi"/>
@@ -103,7 +103,7 @@
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
-  </autotools>
+  </meson>
 
   <autotools id="libffi" autogenargs="--disable-builddir"
              autogen-sh="configure">
@@ -112,17 +112,19 @@
   </autotools>
 
   <meson id="gobject-introspection">
-    <branch module="gobject-introspection/1.60/gobject-introspection-1.60.1.tar.xz"
-            version="1.60.1"
-            hash="sha256:d844d1499ecd36f3ec8a3573616186d36626ec0c9a7981939e99aa02e9c824b3">
+    <branch module="gobject-introspection/1.60/gobject-introspection-1.60.2.tar.xz"
+            version="1.60.2"
+            hash="sha256:ffdfe2368fb2e34a547898b01aac0520d52d8627fdeb1c306559bcb503ab5e9c">
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/girscanner-objc.patch"; 
strip="1"/>
             <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gi_cairo_library_path.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package='python3'/>
     </dependencies>
+    <after>
+      <dep package='python3'/>
+    </after>
   </meson>
 
   <meson id="fribidi" mesonargs="-Ddocs=false">
@@ -134,13 +136,14 @@
   </meson>
 
   <meson id="pango">
-    <branch version="1.42.4" module="pango/1.42/pango-1.42.4.tar.xz"
-            hash="sha256:1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d">
+    <branch version="1.44.1" module="pango/1.44/pango-1.44.1.tar.xz"
+            hash="sha256:07fab549d383cae6d4715eaf853903433328d6e3618e7307bdedb4995f3bfe5f">
     </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="fribidi"/>
+      <dep package="harfbuzz"/>
      </dependencies>
     <after>
       <dep package="gobject-introspection"/>
@@ -150,8 +153,8 @@
   </meson>
   
  <meson id="atk">
-    <branch module="atk/2.30/atk-2.30.0.tar.xz" version="2.30.0"
-            hash="sha256:dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b"/>
+    <branch module="atk/2.32/atk-2.32.0.tar.xz" version="2.32.0"
+            hash="sha256:cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc"/>
     <dependencies>
     </dependencies>
     <after>
@@ -162,8 +165,8 @@
   </meson>
 
   <meson id="gdk-pixbuf" mesonargs="-Dx11=false -Dman=false">
-    <branch module="gdk-pixbuf/2.38/gdk-pixbuf-2.38.0.tar.xz" version="2.38.0"
-            hash="sha256:dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47">
+    <branch module="gdk-pixbuf/2.38/gdk-pixbuf-2.38.1.tar.xz" version="2.38.1"
+            hash="sha256:f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a">
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gdk-pixbuf-loader-name.patch"; 
strip="1"/>
     </branch>
     <after>
@@ -200,17 +203,17 @@
   </autotools>
 
   <autotools id="xorg-util-macros">
-    <branch repo="freedesktop" version="1.19.1"
-            module="xorg/individual/util/util-macros-1.19.1.tar.bz2"/>
+    <branch repo="freedesktop" version="1.19.2"
+            module="xorg/individual/util/util-macros-1.19.2.tar.bz2"/>
   </autotools>
 
-  <autotools id="libepoxy" autogen-sh="configure">
-    <branch repo="github-tarball" version="1.4.1"
-            module="anholt/libepoxy/releases/download/1.4.2/libepoxy-1.4.2.tar.xz"/>
+  <meson id="libepoxy">
+    <branch repo="github-tarball" version="1.5.3"
+            module="anholt/libepoxy/releases/download/1.5.3/libepoxy-1.5.3.tar.xz"/>
     <dependencies>
       <dep package="xorg-util-macros"/>
     </dependencies>
-  </autotools>
+  </meson>
 
   <autotools id="gtk+-3.14" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
@@ -238,8 +241,8 @@
 
   <autotools id="gtk+-3.0" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.24/gtk+-3.24.8.tar.xz" version="3.24.8"
-            hash="sha256:666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799">
+    <branch module="gtk+/3.24/gtk+-3.24.10.tar.xz" version="3.24.10"
+            hash="sha256:35a8f107e2b90fda217f014c0c15cb20a6a66678f6fd7e36556d469372c01b03">
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -256,11 +259,9 @@
 
   <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx"
              autogen-sh="configure">
-    <branch version="0.34.0" module="pixman-0.34.0.tar.gz"
+    <branch version="0.38.4" module="pixman-0.38.4.tar.gz"
             repo="cairographics"
-            hash="sha1:a1b1683c1a55acce9d928fea1ab6ceb79142ddc7">
-      <!-- The patch can be removed at update to 0.34.1 or later, if there ever is one. At this writing 
0.34.0 is 2 years old. -->
-      <patch 
file="https://gitlab.freedesktop.org/pixman/pixman/uploads/1e170b5ee9a319118a2239189a0c4d7d/clang.patch"; 
strip="1"/>
+            hash="sha1:8594e0a31c1802ae0c155d6b502c0953aa862baa">
     </branch>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]