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 @@
library
2D graphics library with bindings of many programming languages
Cairo is a 2D graphics library with support for multiple output devices (and fileformats).
- https://download.gnome.org/sources/cairo/1.17/cairo-1.17.6.tar.xz
+ https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.17.8/cairo-1.17.8.tar.bz2
+ meson
lzo-devel
zlib-devel
glib2-devel
@@ -41,7 +42,7 @@
- cairo_script_interpreter_pkgconfig.patch
+
@@ -77,6 +78,7 @@
cairo
glib2-devel
+ zlib-devel
libX11-devel
libpng-devel
libxcb-devel
@@ -101,6 +103,7 @@
emul32
libglvnd-32bit
+ lzo-32bit
zlib-32bit
glib2-32bit
libX11-32bit
@@ -122,6 +125,7 @@
cairo
libglvnd-32bit
+ lzo-32bit
zlib-32bit
glib2-32bit
libX11-32bit
@@ -140,6 +144,13 @@
+
+ 2023-04-05
+ 1.17.8
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2022-07-29
1.17.6