diff options
| author | Bart Ribbers <bribbers@disroot.org> | 2020-03-29 16:46:38 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-03-29 16:09:37 +0000 |
| commit | 290a52431f26ee503306752c747805cafc7754cf (patch) | |
| tree | 95094d1d7edd0db68b43ab72247190309ca92d74 /community/qt5-qtwebkit | |
| parent | caa2e0d969a40d999a21b0543c8e993e4341651f (diff) | |
| download | aports-290a52431f26ee503306752c747805cafc7754cf.tar.bz2 aports-290a52431f26ee503306752c747805cafc7754cf.tar.xz | |
community/qt5-qtwebkit: fix ASM on aarch64
Diffstat (limited to 'community/qt5-qtwebkit')
| -rw-r--r-- | community/qt5-qtwebkit/APKBUILD | 8 | ||||
| -rw-r--r-- | community/qt5-qtwebkit/pic.patch | 11 |
2 files changed, 3 insertions, 16 deletions
diff --git a/community/qt5-qtwebkit/APKBUILD b/community/qt5-qtwebkit/APKBUILD index e0b27a4364..40f0ef587e 100644 --- a/community/qt5-qtwebkit/APKBUILD +++ b/community/qt5-qtwebkit/APKBUILD @@ -2,10 +2,10 @@ pkgname=qt5-qtwebkit pkgver=5.212.0_alpha4 _pkgver=${pkgver/_/-} -pkgrel=9 +pkgrel=10 pkgdesc="Qt5 - QtWebKit components" url="https://www.qt.io/developers/" -arch="all !armhf" # armhf blocked by qt5-qtdeclarative +arch="all" # armhf blocked by qt5-qtdeclarative license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" depends_dev=" qt5-qtbase-dev @@ -33,14 +33,13 @@ makedepends="$depends_dev subpackages="$pkgname-dev" source="https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz - pic.patch musl-mcontext.patch " builddir="$srcdir/qtwebkit-$_pkgver" build() { case "$CARCH" in - aarch64|ppc64le|s390x) _jit=FALSE ;; + ppc64le|s390x) _jit=FALSE ;; *) _jit=TRUE ;; esac @@ -60,5 +59,4 @@ package() { } sha512sums="33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6 qtwebkit-5.212.0-alpha4.tar.xz -9a62a5e7af91c44311b517608262f88b5bc607e75dc5878dd08b0a0872ec03fb7a566df0a41413f7e60beb1b9880e24f084b90c38ed50d4219ec2ad6af9bd62f pic.patch 11f6b4b5101f5e89917062483c0d55c4180dc4b8107bb3f6ad92ed4e56361ef1b604909056b383313c4072b1229dc9f6606ceacdd84efc1dc80dd1151294b195 musl-mcontext.patch" diff --git a/community/qt5-qtwebkit/pic.patch b/community/qt5-qtwebkit/pic.patch deleted file mode 100644 index ef8993ee3d..0000000000 --- a/community/qt5-qtwebkit/pic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Source/WTF/wtf/InlineASM.h.orig 2013-10-07 11:36:58.995128674 +0000 -+++ ./Source/WTF/wtf/InlineASM.h 2013-10-07 11:37:28.058792290 +0000 -@@ -42,7 +42,7 @@ - #define THUMB_FUNC_PARAM(name) - #endif - --#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64) -+#if (OS(LINUX) || OS(FREEBSD)) && (CPU(X86_64) || defined(__PIC__)) - #define GLOBAL_REFERENCE(name) #name "@plt" - #elif CPU(X86) && COMPILER(MINGW) - #define GLOBAL_REFERENCE(name) "@" #name "@4" |