From 39da3d1471d610f27cd58019b97c94d31ca9c04b Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Wed, 5 Apr 2023 03:16:18 +0300
Subject: [PATCH] cairo-1.17.8

---
 desktop/toolkit/gtk/cairo/actions.py | 28 +++++++---------------------
 desktop/toolkit/gtk/cairo/pspec.xml  | 15 +++++++++++++--
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/desktop/toolkit/gtk/cairo/actions.py b/desktop/toolkit/gtk/cairo/actions.py
index 3469cc9e6c..44437e1983 100644
--- a/desktop/toolkit/gtk/cairo/actions.py
+++ b/desktop/toolkit/gtk/cairo/actions.py
@@ -7,34 +7,20 @@
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import mesontools
 from pisi.actionsapi import get
 
 def setup():
     pisitools.flags.add("-flto -ffat-lto-objects")
-    autotools.autoreconf("-vfi")
-    autotools.configure("--disable-static \
-                         --enable-xlib \
-                         --disable-drm \
-                         --enable-xml=yes \
-                         --enable-ft \
-                         --enable-ps \
-                         --enable-pdf \
-                         --enable-svg \
-                         --enable-tee=yes \
-                         --enable-gl=yes \
-                         --enable-gobject \
-                         --enable-xcb \
-                         --disable-gtk-doc")
 
-    pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""')
-    pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE")
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+    mesontools.configure("-Dtests=disabled \
+                          -Dsymbol-lookup=disabled \
+                          -Dspectre=disabled")
 
 def build():
-    autotools.make()
+    mesontools.build()
 
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    mesontools.install()
 
-    #pisitools.removeDir("/usr/share/gtk-doc")
-    pisitools.dodoc("AUTHORS", "README", "ChangeLog", "NEWS", "COPYING", "COPYING-LGPL-2.1", "COPYING-MPL-1.1")
+    pisitools.dodoc("AUTHORS", "README*", "NEWS", "COPYING*")
diff --git a/desktop/toolkit/gtk/cairo/pspec.xml b/desktop/toolkit/gtk/cairo/pspec.xml
index adccc2e25b..d32926bb71 100644
--- a/desktop/toolkit/gtk/cairo/pspec.xml
+++ b/desktop/toolkit/gtk/cairo/pspec.xml
@@ -13,8 +13,9 @@
         <IsA>library</IsA>
         <Summary>2D graphics library with bindings of many programming languages</Summary>
         <Description>Cairo is a 2D graphics library with support for multiple output devices (and fileformats).</Description>
-        <Archive sha1sum="5e42be0361fca6e81b7f8502e150df6c23c2dd0c" type="tarxz">https://download.gnome.org/sources/cairo/1.17/cairo-1.17.6.tar.xz</Archive>
+        <Archive sha1sum="e06c570fea30f8c9056af765abb0cfb4dfe140d4" type="tarbz2">https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.17.8/cairo-1.17.8.tar.bz2</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
             <Dependency>lzo-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>glib2-devel</Dependency>
@@ -41,7 +42,7 @@
             <!-- <Patch level="1">0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch</Patch> -->
             <!-- <Patch level="1">0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch</Patch> -->
             <!-- <Patch level="1">git_fixes.diff</Patch> -->
-            <Patch level="1">cairo_script_interpreter_pkgconfig.patch</Patch>
+<!--             <Patch level="1">cairo_script_interpreter_pkgconfig.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -77,6 +78,7 @@
         <RuntimeDependencies>
             <Dependency release="current">cairo</Dependency>
             <Dependency>glib2-devel</Dependency>
+            <Dependency>zlib-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
             <Dependency>libpng-devel</Dependency>
             <Dependency>libxcb-devel</Dependency>
@@ -101,6 +103,7 @@
         <BuildType>emul32</BuildType>
         <BuildDependencies>
             <Dependency>libglvnd-32bit</Dependency>
+            <Dependency>lzo-32bit</Dependency>
             <Dependency>zlib-32bit</Dependency>
             <Dependency>glib2-32bit</Dependency>
             <Dependency>libX11-32bit</Dependency>
@@ -122,6 +125,7 @@
         <RuntimeDependencies>
             <Dependency release="current">cairo</Dependency>
             <Dependency>libglvnd-32bit</Dependency>
+            <Dependency>lzo-32bit</Dependency>
             <Dependency>zlib-32bit</Dependency>
             <Dependency>glib2-32bit</Dependency>
             <Dependency>libX11-32bit</Dependency>
@@ -140,6 +144,13 @@
     </Package>
 
     <History>
+        <Update release="14">
+            <Date>2023-04-05</Date>
+            <Version>1.17.8</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="13">
             <Date>2022-07-29</Date>
             <Version>1.17.6</Version>