cairo-32: 1.16.0 -> 1.17.4

5 files changed, 33 insertions, 75 deletions

diff --git a/cairo-32/.footprint b/cairo-32/.footprint
index 2ea22a8c..88c97452 100644
--- a/cairo-32/.footprint
+++ b/cairo-32/.footprint
@@ -1,30 +1,18 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 drwxr-xr-x	root/root	usr/lib32/cairo/
--rw-r--r--	root/root	usr/lib32/cairo/cairo-fdr.a
--rwxr-xr-x	root/root	usr/lib32/cairo/cairo-fdr.la
--rwxr-xr-x	root/root	usr/lib32/cairo/cairo-fdr.so
--rw-r--r--	root/root	usr/lib32/cairo/cairo-sphinx.a
--rwxr-xr-x	root/root	usr/lib32/cairo/cairo-sphinx.la
--rwxr-xr-x	root/root	usr/lib32/cairo/cairo-sphinx.so
--rw-r--r--	root/root	usr/lib32/cairo/libcairo-trace.a
--rwxr-xr-x	root/root	usr/lib32/cairo/libcairo-trace.la
+-rwxr-xr-x	root/root	usr/lib32/cairo/libcairo-fdr.so
+-rwxr-xr-x	root/root	usr/lib32/cairo/libcairo-sphinx.so
 -rwxr-xr-x	root/root	usr/lib32/cairo/libcairo-trace.so
--rw-r--r--	root/root	usr/lib32/libcairo-gobject.a
--rwxr-xr-x	root/root	usr/lib32/libcairo-gobject.la
-lrwxrwxrwx	root/root	usr/lib32/libcairo-gobject.so -> libcairo-gobject.so.2.11600.0
-lrwxrwxrwx	root/root	usr/lib32/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11600.0
--rwxr-xr-x	root/root	usr/lib32/libcairo-gobject.so.2.11600.0
--rw-r--r--	root/root	usr/lib32/libcairo-script-interpreter.a
--rwxr-xr-x	root/root	usr/lib32/libcairo-script-interpreter.la
-lrwxrwxrwx	root/root	usr/lib32/libcairo-script-interpreter.so -> libcairo-script-interpreter.so.2.11600.0
-lrwxrwxrwx	root/root	usr/lib32/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11600.0
--rwxr-xr-x	root/root	usr/lib32/libcairo-script-interpreter.so.2.11600.0
--rw-r--r--	root/root	usr/lib32/libcairo.a
--rwxr-xr-x	root/root	usr/lib32/libcairo.la
-lrwxrwxrwx	root/root	usr/lib32/libcairo.so -> libcairo.so.2.11600.0
-lrwxrwxrwx	root/root	usr/lib32/libcairo.so.2 -> libcairo.so.2.11600.0
--rwxr-xr-x	root/root	usr/lib32/libcairo.so.2.11600.0
+lrwxrwxrwx	root/root	usr/lib32/libcairo-gobject.so -> libcairo-gobject.so.2
+lrwxrwxrwx	root/root	usr/lib32/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11704.0
+-rwxr-xr-x	root/root	usr/lib32/libcairo-gobject.so.2.11704.0
+lrwxrwxrwx	root/root	usr/lib32/libcairo-script-interpreter.so -> libcairo-script-interpreter.so.2
+lrwxrwxrwx	root/root	usr/lib32/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11704.0
+-rwxr-xr-x	root/root	usr/lib32/libcairo-script-interpreter.so.2.11704.0
+lrwxrwxrwx	root/root	usr/lib32/libcairo.so -> libcairo.so.2
+lrwxrwxrwx	root/root	usr/lib32/libcairo.so.2 -> libcairo.so.2.11704.0
+-rwxr-xr-x	root/root	usr/lib32/libcairo.so.2.11704.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-fc.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-ft.pc
@@ -39,4 +27,5 @@ drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-xcb.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-xlib-xrender.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-xlib.pc
+-rw-r--r--	root/root	usr/lib32/pkgconfig/cairo-xml.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/cairo.pc
diff --git a/cairo-32/.signature b/cairo-32/.signature
index 6658bd12..ac8d3b7d 100644
--- a/cairo-32/.signature
+++ b/cairo-32/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXaZR2+nzEIgyTV1RN2cutiO1oEj+55FNF4kj/bkcjb7N2Ie/3dHJbU3s86+cc3LrO5dkthHOVsDpaSxiycudJwk=
-SHA256 (Pkgfile) = de310f0bea7b875802418611606d542b28a0d55b2b6974a1479b7c32f6ec8abc
-SHA256 (.footprint) = a087ade34a40d027060631d10ceb0e8d4ad50e893a344d10c110c5a9eee1d531
-SHA256 (cairo-1.16.0.tar.xz) = 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
-SHA256 (cairo-xlib-endianness.patch) = 58d39311edee6d8ddf76deac1d2e3526b4c02d4aa1f35a6ca16ff50c8e65429f
-SHA256 (cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff) = 4c8b8095a41f244ddfbc9b24e2f73a6fd8d697f43903617e0519b95b27b30726
+RWSwxGo/zH7eXf9QLUtPIc2hnYv+NI3w+JU3MLGyyUdMe+l5cx/rlwVf0Odgj+uhPZ0oStda36DeKM7ce6xciY6I3rpKJU7Lfwk=
+SHA256 (Pkgfile) = 752ca883f3db5ab50f1abd7e7d7b5122bb2ee7b48e2053e247c47e1f1e0483cb
+SHA256 (.footprint) = 0041541eafb98048ad71581b908628e22362bfb0dc1a18f4fb18ac9c0729cdfa
+SHA256 (cairo-1.17.4.tar.xz) = 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705
+SHA256 (xlib-xcb.diff) = 70cd3783381bf73ea7fccd5c2db43956b10865a9c54d5edd251dbcdb9b595a43
+SHA256 (fix-library-versioning.diff) = ba678534bbfb2ae8d2397b015f77d30719efee7bb7992dbd2c8e5f2fa5fd8efc
diff --git a/cairo-32/Pkgfile b/cairo-32/Pkgfile
index ff924b7e..b5251b05 100644
--- a/cairo-32/Pkgfile
+++ b/cairo-32/Pkgfile
@@ -4,28 +4,25 @@
 # Depends on: cairo fontconfig-32 glib-32 xorg-libpixman-32 xorg-libxext-32 xorg-libxrender-32 xorg-xcb-util-32
 
 name=cairo-32
-version=1.16.0
+version=1.17.4
 release=1
-source=(https://cairographics.org/releases/${name%-*}-$version.tar.xz
-	cairo-xlib-endianness.patch
-	cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff)
+source=(https://cairographics.org/snapshots/${name%-*}-$version.tar.xz
+	xlib-xcb.diff fix-library-versioning.diff)
 
 build() {
-	cd ${name%-*}-$version
+	patch -p1 -d ${name%-*}-$version -i $SRC/fix-library-versioning.diff
+	patch -p1 -d ${name%-*}-$version -i $SRC/xlib-xcb.diff
 
-	patch -p1 -i $SRC/cairo-xlib-endianness.patch
-	patch -p1 -i $SRC/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
+	meson setup build ${name%-*}-$version \
+		--prefix=/usr \
+		--libdir=lib32 \
+		--buildtype=plain \
+		-D spectre=disabled \
+		-D tee=enabled \
+		-D tests=disabled
 
-	./configure --prefix=/usr \
-		--libdir=/usr/lib32 \
-		--enable-xcb=yes \
-		--enable-ps \
-		--enable-pdf \
-		--disable-gtk-doc \
-		--enable-tee=yes
+	meson compile -C build
+	DESTDIR=$PKG meson install -C build
 
-	make
-	make DESTDIR=$PKG install
-
-	rm -r $PKG/usr/{bin,include,share}
+	rm -r $PKG/usr/{bin,include}
 }
diff --git a/cairo-32/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff b/cairo-32/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
deleted file mode 100644
index 29e2b5ee..00000000
--- a/cairo-32/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: cairo-1.15.4/src/cairo-ft-font.c
-===================================================================
---- cairo-1.15.4.orig/src/cairo-ft-font.c
-+++ cairo-1.15.4/src/cairo-ft-font.c
-@@ -1149,7 +1149,7 @@ _get_bitmap_surface (FT_Bitmap		     *bi
-     width = bitmap->width;
-     height = bitmap->rows;
- 
--    if (width == 0 || height == 0) {
-+    if (width == 0 || height == 0 || bitmap->buffer == NULL) {
- 	*surface = (cairo_image_surface_t *)
- 	    cairo_image_surface_create_for_data (NULL, format, 0, 0, 0);
- 	return (*surface)->base.status;
diff --git a/cairo-32/cairo-xlib-endianness.patch b/cairo-32/cairo-xlib-endianness.patch
deleted file mode 100644
index 68086d1f..00000000
--- a/cairo-32/cairo-xlib-endianness.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- cairo/src/cairo-xlib-render-compositor.c	2013-04-12 11:22:48.010384018 +0200
-+++ cairo/src/cairo-xlib-render-compositor.c.new	2013-04-12 11:23:54.362925287 +0200
-@@ -1318,10 +1318,10 @@
- 	    }
- 	    n = new;
- 	    d = (uint32_t *) data;
--	    do {
-+	    while (c--) {
- 		*n++ = bswap_32 (*d);
- 		d++;
--	    } while (--c);
-+	    }
- 	    data = (uint8_t *) new;
- 	}
- 	break;