From 87d788bf93950ef9542196628c12f66693bde9e8 Mon Sep 17 00:00:00 2001
From: Síle Ekaterin Liszka <sheila@vulpine.house>
Date: Fri, 21 Mar 2025 11:40:46 -0700
Subject: user/cairo: upgrade to 1.18.4
The infinality patchset was removed because the patches were
unmaintained and therefore wouldn't apply. Moreover, their source
repository has been made read-only.
---
user/cairo/APKBUILD | 58 +++++++++++++----------------------------------------
1 file changed, 14 insertions(+), 44 deletions(-)
(limited to 'user/cairo')
diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD
index d9be3529f..99b45658c 100644
--- a/user/cairo/APKBUILD
+++ b/user/cairo/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Zach van Rijn <me@zv.io>
pkgname=cairo
-pkgver=1.16.0
-pkgrel=3
+pkgver=1.18.4
+pkgrel=0
pkgdesc="A vector graphics library"
url="https://cairographics.org/"
arch="all"
@@ -10,16 +10,11 @@ license="LGPL-2.0+ AND MPL-1.1"
depends=""
depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev
xcb-util-dev libxext-dev $pkgname-tools"
-makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev cmd:which"
+makedepends="$depends_dev gtk-doc meson zlib-dev expat-dev glib-dev libpng-dev
+ cmd:which"
subpackages="$pkgname-dev $pkgname-doc $pkgname-gobject $pkgname-tools"
-# fontconfig-ultimate https://github.com/bohoomil/fontconfig-ultimate
-_ultver="2016-04-23"
source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz
- fontconfig-ultimate-$_ultver.tar.gz::https://github.com/bohoomil/fontconfig-ultimate/archive/$_ultver.tar.gz
musl-stacksize.patch
- CVE-2018-19876.patch
- CVE-2019-6462.patch
- CVE-2020-35492.patch
"
# secfixes:
@@ -29,42 +24,21 @@ source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz
# 1.16.0-r1:
# - CVE-2018-19876
-prepare() {
- default_prepare
-
- # infinality
- for j in "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/*.patch; do
- msg "Applying ${j}"
- patch -p1 -i $j
- done
-}
-
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
+ meson setup \
--prefix=/usr \
--sysconfdir=/etc \
+ --mandir=/usr/share/man \
--localstatedir=/var \
- --enable-ft \
- --enable-gobject \
- --enable-pdf \
- --enable-png \
- --enable-ps \
- --enable-svg \
- --enable-tee \
- --enable-x \
- --enable-xcb \
- --enable-xcb-shm \
- --enable-xlib \
- --enable-xlib-xrender \
- --disable-xlib-xcb \
- --disable-static
- make
+ --buildtype=release \
+ --wrap-mode=nofallback \
+ -Dgtk_doc=true \
+ build
+ meson compile -C build
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install -C build
}
gobject() {
@@ -81,9 +55,5 @@ tools() {
"$subpkgdir"/usr/lib/cairo/
}
-sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz
-d8185f4ec74f44c4746acf7e79bba7ff7ffd9d35bdabeb25e10b4e12825942d910931aa857f1645e5c8185bcb40a1f1ffe1e7e647428e9ea66618b2aec52fac3 fontconfig-ultimate-2016-04-23.tar.gz
-86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch
-9020c596caa54a2ac435d5dae0f121d36d3c3f34d487b9c1032665b1bd15813506adf31984e34b5dd328ee0e068de0627e1d061230758328cae4fa993c3a9209 CVE-2018-19876.patch
-ebe5d71b18aa9eefe1e0a6c150761bb7abef41f144f37eb0bfa8a01947aacb1292ac131cf815dcaaaa6478c0aac07ca5428fba28ad346a00c5aaa5fa64f6ff5b CVE-2019-6462.patch
-8dcb95b6a8e023ad5675f81f9a87a087868dc74113cd0ab96568d525582266c366064cc7cc168738dc75968385ab0444911f54754d31962dfe1235526afbd72c CVE-2020-35492.patch"
+sha512sums="863679f817ed67dc2c916c035d740916e27e7e69c04fca63936e37d274e7f4c79848d16c8f7c481798864602e8847c489f698df89b785cbc576c925dbd513316 cairo-1.18.4.tar.xz
+86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch"
--
cgit v1.2.3-70-g09d2