aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-04-25 11:11:46 +0200
committerKevin Daudt <kdaudt@alpinelinux.org>2020-04-25 10:36:03 +0000
commit2128a12d985416db4134eafb7a4e1df7028e6623 (patch)
tree449b3fa0928b53d004433abfb46ab94ed5832496
parent447861be25cc9b5135112a26f75e1c04bca4e116 (diff)
downloadaports-2128a12d985416db4134eafb7a4e1df7028e6623.tar.bz2
aports-2128a12d985416db4134eafb7a4e1df7028e6623.tar.xz
main/pixman: upgrade to 0.40.0
Also increase the default stacksize. The patch to decrease the stacksize has been removed in aca640da654a97c6ad6f9423beda707cd14c8a42 and doesn't apply anymore. This fixes crashes in librsvg and GNOME Software[0]. Also increase the test timeout and re-enable them on all arches but s390x where the tests timed out. 0: https://gitlab.gnome.org/GNOME/librsvg/-/issues/595 fixes #11422
-rw-r--r--main/pixman/APKBUILD22
1 files changed, 7 insertions, 15 deletions
diff --git a/main/pixman/APKBUILD b/main/pixman/APKBUILD
index d48a8dc31d..210a132c6d 100644
--- a/main/pixman/APKBUILD
+++ b/main/pixman/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=pixman
-pkgver=0.38.4
+pkgver=0.40.0
pkgrel=1
pkgdesc="Low-level pixel manipulation library"
url="https://gitlab.freedesktop.org/pixman"
@@ -12,21 +12,13 @@ source="https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-$pkgver/pi
builddir="$srcdir/pixman-pixman-$pkgver"
case "$CARCH" in
-# tests are too slow due to softfloat
-mips*) options="!check" ;;
-
-# broken test (likely due to endianness assumptions)
-s390x) options="!check" ;;
-
-# tests are too slow
-ppc64le) options="!check" ;;
-
-# tests time out
-aarch64) options="!check" ;;
+ # broken test (likely due to endianness assumptions)
+ s390x) options="!check" ;;
esac
build() {
- meson \
+ # We need to increase the stacksize here: https://gitlab.gnome.org/GNOME/librsvg/-/issues/595
+ LDFLAGS="$LDFLAGS -Wl,-z,stack-size=2097152" meson \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
@@ -37,11 +29,11 @@ build() {
}
check() {
- ninja -C output test
+ meson test -C output -t 10
}
package() {
DESTDIR="$pkgdir" ninja -C output install
}
-sha512sums="b2ffd78e10a732f7be02348ae7e45bb233bb27a4f86a2a6b3e95195fe53eea020fb9d8df1516973332691e661af4732601cc19b6297b891c322f9f4a7135e7ba pixman-pixman-0.38.4.tar.gz"
+sha512sums="18774e22add5c5442edede5467fa07234c2b9e57a79d88110f25424e4253c6ab0c2921e951c5686cefebf4724ff19ad053d0c28f4d2f8d642bbcf6fc71764ef6 pixman-pixman-0.40.0.tar.gz"