diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-04-10 10:52:31 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-04-10 11:01:43 +0200 |
| commit | 2edb15dec95097e45c960d433bc3bd9ffb99d4ea (patch) | |
| tree | f611dd437950c702d0b03114512a92b80f660c1e | |
| parent | 7f045aae9a022d2554ba93c7d62ddd8df29e97aa (diff) | |
| download | aports-2edb15dec95097e45c960d433bc3bd9ffb99d4ea.tar.bz2 aports-2edb15dec95097e45c960d433bc3bd9ffb99d4ea.tar.xz | |
community/gjs: fix rebuild against libffi.so.7
During the previous rebuild (d95e2bc8267a) something else still pulled
in the old libffo.so.6, so it didn't get rebuilt correctly
Also enable tests on 32-bits, the 1.64.1 upgrade to gobject-introspection
fixed them
| -rw-r--r-- | community/gjs/APKBUILD | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/community/gjs/APKBUILD b/community/gjs/APKBUILD index 81831ad4b3..d93388e51e 100644 --- a/community/gjs/APKBUILD +++ b/community/gjs/APKBUILD @@ -2,22 +2,17 @@ # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=gjs pkgver=1.64.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME javascript library" url="https://wiki.gnome.org/Projects/Gjs" arch="all !s390x !mips !mips64" license="MIT AND LGPL-2.0-or-later" makedepends="dbus gobject-introspection-dev mozjs68-dev mozjs68 - gtk+3.0-dev cairo-dev meson" + gtk+3.0-dev cairo-dev meson libffi>=3.3" checkdepends="xvfb-run" subpackages="$pkgname-dev" source="https://download.gnome.org/sources/gjs/${pkgver%.*}/gjs-$pkgver.tar.xz" -# Tests fail on 32-bit: https://gitlab.gnome.org/GNOME/gjs/-/issues/312 -case "$CARCH" in - x86|armv7|armhf) options="!check";; -esac - build() { meson \ --buildtype=plain \ @@ -32,7 +27,8 @@ build() { } check() { - xvfb-run ninja -C output test + # Tests can take a while on armv7 + xvfb-run meson test -C output -t 10 } package() { |