aboutsummaryrefslogtreecommitdiffstats
path: root/main/cairo/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'main/cairo/APKBUILD')
-rw-r--r--main/cairo/APKBUILD70
1 files changed, 27 insertions, 43 deletions
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index e4b684c330b..b5c8cd8947a 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cairo
-pkgver=1.16.0
-pkgrel=3
+pkgver=1.18.0
+pkgrel=0
pkgdesc="A vector graphics library"
url="https://cairographics.org/"
arch="all"
options="!check" # Recursive dependency on gtk+2.0 for check.
-license="LGPL-2.0-or-later MPL-1.1"
+license="LGPL-2.1-or-later OR MPL-1.1"
depends_dev="
- $pkgname-tools
+ $pkgname-tools=$pkgver-r$pkgrel
fontconfig-dev
freetype-dev
libxext-dev
@@ -16,64 +16,51 @@ depends_dev="
pixman-dev
xcb-util-dev
"
-makedepends="$depends_dev
- autoconf
- automake
+makedepends="
+ $depends_dev
expat-dev
glib-dev
+ gtk-doc
libpng-dev
- libtool
+ meson
zlib-dev
"
subpackages="
+ $pkgname-dbg
$pkgname-static
$pkgname-dev
$pkgname-doc
$pkgname-gobject
$pkgname-tools
- $pkgname-dbg
"
-source="https://cairographics.org/releases/cairo-$pkgver.tar.xz
+source="https://gitlab.freedesktop.org/cairo/cairo/-/archive/$pkgver/cairo-$pkgver.tar.bz2
musl-stacksize.patch
- CVE-2018-19876.patch
- pdf-flush.patch
- fix-mask-usage-in-image-compositor.patch
- composite_color_glyphs.patch
- cff-allow-empty-array-of-operands-for-certain-operat.patch
"
-builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
+# 1.17.4-r1:
+# - CVE-2019-6462
# 1.16.0-r2:
# - CVE-2020-35492
# 1.16.0-r1:
# - CVE-2018-19876
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --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
- make
+ abuild-meson \
+ -Db_lto=true \
+ -Ddefault_library=both \
+ -Dgtk_doc=true \
+ -Dtests="$(want_check && echo enabled || echo disabled)" \
+ . output
+ meson compile -C output
+}
+
+check() {
+ meson test --no-rebuild --print-errorlogs -C output
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
gobject() {
@@ -89,10 +76,7 @@ tools() {
amove usr/lib/cairo/libcairo-trace.*
}
-sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz
+sha512sums="
+bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40 cairo-1.18.0.tar.bz2
86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch
-8f13cdcae0f134e04778cf5915f858fb8d5357a7e0a454791c93d1566935b985ec66dfe1683cd0b74a1cb44a130923d7a27cf006f3fc70b9bee93abd58a55aa3 CVE-2018-19876.patch
-533ea878dc7f917af92e2694bd3f535a09cde77f0ecd0cc00881fbc9ec1ea86f60026eacc76129705f525f6672929ad8d15d8cfe1bfa61e9962e805a7fbded81 pdf-flush.patch
-20699d2dd10531f99587cdcd187a23e23bca5a9f031255c95aade4dadb79bbb62118c7ddff677c2fd20e4ba7694eee4debcd79a4d0736d62951a4fcee56ccae0 fix-mask-usage-in-image-compositor.patch
-a056e85549e8410782674cb4ce7b38b035cdde8f4319c18dd942a18b33d35c5be4d0c0c34081ee556473df4f2725cdba508a387ee6222214484b10a5d9eaad90 composite_color_glyphs.patch
-ae079840a842ec645ab3c9a2d5db8d3f8bb4e25ce4090afc3d226ba292f15b85bdaaed0967bb12bfa429d7f6376a28c87518df194ab6b1d2a2e7c96ab6df8ba2 cff-allow-empty-array-of-operands-for-certain-operat.patch"
+"