aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-04-17 11:29:41 +0200
committerBart Ribbers <bribbers@disroot.org>2021-04-21 15:11:58 +0000
commit77a28855a0d8526e7c9b966d14f1f323a45b0ca7 (patch)
tree2a0686aac4dfe8764d77cc4d3df6e4512fac3b01
parent05b6b970687b7943f760aa4ee97be9a4ccfc15ef (diff)
downloadaports-77a28855a0d8526e7c9b966d14f1f323a45b0ca7.tar.gz
aports-77a28855a0d8526e7c9b966d14f1f323a45b0ca7.tar.bz2
aports-77a28855a0d8526e7c9b966d14f1f323a45b0ca7.tar.xz
WIP: community/qt5-qtwebengine: fix compilation on armv7
-rw-r--r--community/qt5-qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch44
-rw-r--r--community/qt5-qtwebengine/APKBUILD9
2 files changed, 49 insertions, 4 deletions
diff --git a/community/qt5-qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch b/community/qt5-qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch
new file mode 100644
index 0000000000..e8a1d8454d
--- /dev/null
+++ b/community/qt5-qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch
@@ -0,0 +1,44 @@
+From ce23b6a6e5a5ebae15dedeebf7044ac9a0249a80 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Jul 2017 15:24:49 -0700
+Subject: [PATCH] chromium: musl: Match syscalls to match musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ chromium/third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
+index 80a3e56..1e57b1a 100644
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -794,6 +794,14 @@ struct kernel_statfs {
+ #endif
+
+
++#undef stat64
++#undef fstat64
++
++#ifndef __NR_fstatat
++#define __NR_fstatat __NR_fstatat64
++#endif
++
++
+ #if defined(__x86_64__)
+ #ifndef ARCH_SET_GS
+ #define ARCH_SET_GS 0x1001
+@@ -1211,6 +1219,14 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate 285
+ #endif
++
++#ifndef __NR_pread
++#define __NR_pread __NR_pread64
++#endif
++#ifndef __NR_pwrite
++#define __NR_pwrite __NR_pwrite64
++#endif
++
+ /* End of x86-64 definitions */
+ #elif defined(__mips__)
+ #if _MIPS_SIM == _MIPS_SIM_ABI32
diff --git a/community/qt5-qtwebengine/APKBUILD b/community/qt5-qtwebengine/APKBUILD
index 65d3baa357..9b1d20d997 100644
--- a/community/qt5-qtwebengine/APKBUILD
+++ b/community/qt5-qtwebengine/APKBUILD
@@ -1,15 +1,14 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=qt5-qtwebengine
pkgver=5.15.3_git20200401
-pkgrel=2
+pkgrel=3
_commit="e0b4b9436033e9bc376597ed90dd1fca9cdc90ff"
pkgdesc="Qt5 - QtWebEngine components"
url="https://www.qt.io/developers/"
# ppc64le and s390x are not supported
# mips is also not supported
# armhf blocked by qt5-qtdeclarative
-# armv7 fails to build https://gitlab.alpinelinux.org/alpine/aports/-/issues/12613
-arch="aarch64 x86 x86_64"
+arch="aarch64 armv7 x86 x86_64"
license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
depends_dev="
ffmpeg-dev
@@ -90,6 +89,7 @@ source="https://dev.alpinelinux.org/archive/qt5-qtwebengine/qtwebengine-$_commit
musl-hacks.patch
remove-glibc-check.patch
0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch
+ 0010-chromium-musl-Match-syscalls-to-match-musl.patch
"
builddir="$srcdir/qtwebengine"
@@ -141,4 +141,5 @@ f6712b3986597df082e22b5b091994d629e7f704332bb94f821e3de893559531e5f476b64a15326b
9add958caa0d6acb2866d3927aadfa6b378c92d62463f1b3d65ae1e5400915d89388ac54beb30c4d4d42d2901ee28f404d8574b771854556f6a75698301870eb nasm.patch
b99eaa4a0b06ab1cb461fc4bfc7416c779ba1e847614b96f08de97a137a09577ea642813e5e3235167ccc5180c6ffcc06ebf2a61e3b4c210de9dee765e0e7404 musl-hacks.patch
7153ce7372fed73dccb676079bc5af37f56be113f42ee64ed48cd7997dc2a4aa287523f36f0b8d3c717f1c4ad7f796843850b86a2dce50de5f0ade6a47785bee remove-glibc-check.patch
-487e3d3e338cab5becb6073e8587c200653af8a35ac507bcfae5267b9d4f11e0b2b18447ffde1ef9d25f2a2ec5661982b50fcb1d3a683cd76e59fa7f37e531ce 0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch"
+487e3d3e338cab5becb6073e8587c200653af8a35ac507bcfae5267b9d4f11e0b2b18447ffde1ef9d25f2a2ec5661982b50fcb1d3a683cd76e59fa7f37e531ce 0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch
+a0d1f44403fa21aed1cfd7390287fc8b9fc4ad559ecc982ed1e8f9cf05ce0a772982e47df1e0af69caf517545dc14e21460e70dfd4b77a859b8b502b00752686 0010-chromium-musl-Match-syscalls-to-match-musl.patch"