Update gtk-osx modules.

gpodder · Jan 5, 2023 · faa8b4c · faa8b4c
1 parent 7665b1d
commit faa8b4c
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 87 deletions.
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -13,9 +13,9 @@ rm -f "$HOME/.config/jhbuildrc-custom"
 
 mkdir -p "$HOME/.config"
 cp misc/jhbuildrc-custom "$HOME/.config/jhbuildrc-custom"
-git clone  https://gitlab.gnome.org/GNOME/gtk-osx.git _gtk-osx
-# try latest commit (2022-02-18)
-(cd _gtk-osx && git checkout 6be92a11)
+git clone https://gitlab.gnome.org/GNOME/gtk-osx.git _gtk-osx
+# try latest commit (2023-01-03)
+(cd _gtk-osx && git checkout 78bd3324)
 # fix boostrap failure: error message on pip download
 sed -i '' s,https://bootstrap.pypa.io/2.7/get-pip.py,https://bootstrap.pypa.io/pip/2.7/get-pip.py, _gtk-osx/gtk-osx-setup.sh
 sed -i '' 's:curl -ks :curl -ksS :' _gtk-osx/gtk-osx-setup.sh

diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
@@ -2,8 +2,8 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-  <repository type="tarball" name="ftp.gnome.org" default="yes"
-              href="http://ftp.gnome.org/pub/GNOME/sources/"/>
+  <repository type="tarball" name="download.gnome.org" default="yes"
+              href="https://download.gnome.org/sources/"/>
   <repository type="tarball" name="cairographics"
               href="https://www.cairographics.org/"/>
   <repository type="tarball" name="cairographics-temp"
@@ -71,11 +71,11 @@
     </after>
   </metamodule>
 
-  <autotools id="libffi" autogenargs="--disable-builddir"
+  <autotools id="libffi" autogenargs="--disable-multi-os-directory"
              autogen-sh="configure">
-    <branch module="libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz"
-            repo="github-tarball" version="3.3"
-            hash="sha256:72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"/>
+    <branch module="libffi/libffi/releases/download/v3.4.3/libffi-3.4.3.tar.gz"
+            repo="github-tarball" version="3.4.3"
+            hash="sha256:4416dd92b6ae8fcb5b10421e711c4d3cb31203d77521a77d85d0102311e6c3b8"/>
   </autotools>
 
   <autotools id="libpcre" autogen-sh="configure"
@@ -100,7 +100,7 @@
        then build harfbuzz without cairo because cairo requires
        harfbuzz. -->
    <!-- gpodder github action needs to disable BrotliDec -->
-  <cmake id="freetype-no-harfbuzz" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
+  <cmake id="freetype-no-harfbuzz" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE">
     <branch module="freetype/freetype-2.11.1.tar.gz" version="2.11.1"
             repo="sourceforge"
             hash="sha256:f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b"/>
@@ -109,7 +109,7 @@
     </dependencies>
   </cmake>
 
-  <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=disabled">
+  <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=disabled">
     <branch repo="github-tarball" version="4.1.0"
             module="harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz" 
             hash="sha256:f7984ff4241d4d135f318a93aa902d910a170a8265b7eaf93b5d9a504eed40c8">
@@ -122,8 +122,9 @@
   </meson>
 
    <!-- gpodder github action needs to disable BrotliDec -->
-  <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
+  <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE">
     <branch module="freetype/freetype-2.11.1.tar.gz" version="2.11.1"
+            hash="sha256:f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b"/>
             repo="sourceforge"/>
     <dependencies>
       <dep package="harfbuzz-no-cairo"/>
@@ -183,10 +184,10 @@
     </after>
   </meson>
 
-  <meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=enabled">
+  <meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=enabled">
     <branch repo="github-tarball" version="4.1.0"
-            module="harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz" 
->
+            module="harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz"
+            hash="sha256:f7984ff4241d4d135f318a93aa902d910a170a8265b7eaf93b5d9a504eed40c8">
     </branch>
     <dependencies>
       <dep package="gobject-introspection"/>
@@ -220,7 +221,7 @@
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </meson>
-  
+
   <meson id="atk">
     <branch module="atk/2.36/atk-2.36.0.tar.xz" version="2.36.0"
             hash="sha256:fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788"/>
@@ -266,10 +267,9 @@
 
   <!-- gtk3 is in maintenance mode with 3.24 the final release series. -->
   <meson id="gtk+-3.0" mesonargs="-Dx11_backend=false">
-    <branch module="gtk+/3.24/gtk+-3.24.33.tar.xz" version="3.24.33"
-            hash="sha256:588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801">
-      <patch file="gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch" strip="1"/>
-      <patch file="gtk-3.24.33-quartz-window-transient-for.patch" strip="1"/>
+    <branch module="gtk+/3.24/gtk+-3.24.36.tar.xz" version="3.24.36"
+            hash="sha256:27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691">
+      <patch file="gtk-3-24-36-image-recolor-load-crash.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -287,8 +287,8 @@
 
   <meson id="graphene" mesonargs="-Dtests=false">
     <branch repo="github-tarball" version="1.10.6"
-            module="ebassi/graphene/releases/download/1.10.6/graphene-1.10.6.tar.xz"/>
-      <!--      hash="sha256:"/ -->
+            module="ebassi/graphene/releases/download/1.10.6/graphene-1.10.6.tar.xz"
+            hash="sha256:80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -300,11 +300,11 @@
     <branch repo="github-tarball" version="3.6.5"
             module="sass/libsass/archive/refs/tags/3.6.5.tar.gz"
             rename-tarball="libsass-3.6.5.tar.gz"
-            checkoutdir="libsass-3.6.5"/>
-            <!--hash="sha256:"/ -->
+            checkoutdir="libsass-3.6.5"
+            hash="sha256:89d8f2c46ae2b1b826b58ce7dde966a176bac41975b82e84ad46b01a55080582"/>
   </autotools>
 
-  <meson id="gtk-4" mesonargs="-Dx11-backend=false">
+  <meson id="gtk-4" mesonargs="-Dx11-backend=false -Dmedia-gstreamer=disabled">
     <branch module="gtk/4.6/gtk-4.6.2.tar.xz" version="4.6.2"
             hash="sha256:ff263af609a50eb76056653592d929459aef4819a444c436f6d52c6f63c1faec"/>
       <dependencies>
@@ -325,11 +325,8 @@
       <patch file="gtk-mac-integration-work-around-svg-locale-bug.patch" strip="1"/>
     </branch>
     <dependencies>
-    </dependencies>
-    <after>
-      <dep package="gtk+-2.0"/>
       <dep package="gtk+-3.0"/>
-    </after>
+    </dependencies>
   </autotools>
 
   <autotools id="librsvg" autogen-sh="autoreconf"
@@ -343,9 +340,9 @@
       <dep package="freetype"/>
     </dependencies>
     <after>
-      <!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
-      <dep package="gtk+-2.0"/>
+	  <!-- Circular dependency if we depend on meta-gtk-osx-gtk3 -->
       <dep package="gtk+-3.0"/>
+      <dep package="gtk-4"/>
     </after>
   </autotools>
 

diff --git a/modulesets/patches/gtk-3-24-36-image-recolor-load-crash.patch b/modulesets/patches/gtk-3-24-36-image-recolor-load-crash.patch
@@ -0,0 +1,35 @@
+From 40bcba64548bb29b6a6209030eeb06bf13ca98f9 Mon Sep 17 00:00:00 2001
+From: John Ralls <[email protected]>
+Date: Fri, 23 Dec 2022 13:27:50 -0800
+Subject: [PATCH] Don't rely on gtk_icon_info_load_symbolic to set a GError.
+
+---
+ gtk/gtkcssimagerecolor.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtkcssimagerecolor.c b/gtk/gtkcssimagerecolor.c
+index 1c38654cfa..db7d08f008 100644
+--- a/gtk/gtkcssimagerecolor.c
++++ b/gtk/gtkcssimagerecolor.c
+@@ -125,12 +125,17 @@ gtk_css_image_recolor_load (GtkCssImageRecolor  *recolor,
+       if (gerror)
+         {
+           char *uri;
++          char *msg;
++          if (local_error && local_error->message)
++               msg = local_error->message;
++          else
++               msg = "gtk_icon_info_load_symbolic did not set the passed-in GError.";
+
+           uri = g_file_get_uri (url->file);
+           g_set_error (gerror,
+                        GTK_CSS_PROVIDER_ERROR,
+                        GTK_CSS_PROVIDER_ERROR_FAILED,
+-                       "Error loading image '%s': %s", uri, local_error->message);
++                       "Error loading image '%s': %s", uri, msg);
+           g_error_free (local_error);
+           g_free (uri);
+        }
+-- 
+2.37.1 (Apple Git-137.1)
+
diff --git a/modulesets/patches/gtk-3.24.33-quartz-window-transient-for.patch b/modulesets/patches/gtk-3.24.33-quartz-window-transient-for.patch
diff --git a/modulesets/patches/gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch b/modulesets/patches/gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch