Update cairo to 1.18.0

Disable Pango tests as they rely on no longer exposed cairo internals.
dehesselle · Oct 1, 2023 · 3b9ee60 · 3b9ee60
1 parent 76d9b1c
commit 3b9ee60
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 887 deletions.
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
@@ -203,19 +203,10 @@
     they are both built into cairo.
   -->
   <meson id="cairo">
-    <!--
-      This is Cairo 1.17.8+ because of quartz colorspace performance improvements.
-    -->
-    <branch module="83db2efe/cairo-83db2efe.tar.bz2"
-            version="83db2efe"
-            hash="sha256:e61d0a8261b844241b53dbfa40cd6195c35d9acdfed7271cff33e14605ec2ea5"
-            repo="cairographics-temp">
-      <!--
-        patch has been recalled due to problems with 1.17.8 on windows
-      <patch file="cairo-pixman_dithering.patch"
-             strip="1" />
-      -->
-    </branch>
+    <branch module="releases/cairo-1.18.0.tar.xz"
+            version="1.18.0"
+            hash="sha256:243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64"
+            repo="cairographics" />
     <dependencies>
       <dep package="pixman" />
       <dep package="meta-gtk-osx-bootstrap" />
@@ -270,6 +261,8 @@
     <branch module="pango/1.50/pango-1.50.14.tar.xz"
             version="1.50.14"
             hash="sha256:1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8">
+      <patch file="pango-disable-tests.patch"
+             strip="1" />
     </branch>
     <dependencies>
       <dep package="glib" />