archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-02-16 23:57:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/qt5-webengine: fix

Browse source
This commit is contained in:
Kevin Mihelich 2019-07-01 14:16:10 +00:00
parent 56ec97a7f7
commit 5d2ec48ffe
3 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extra/qt5-webengine/0001-ARM-toolchain-fixes.patch
View file

@ -1,14 +1,14 @@
From 95504f7bfc9c85d3148cec9c46084a8ab5e6ce8d Mon Sep 17 00:00:00 2001
From dd9b2eeaa1212cde95b26accbf271fb00f865331 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 4 Jul 2017 11:54:39 -0600
Subject: [PATCH] ARM toolchain fixes
Subject: [PATCH 1/2] ARM toolchain fixes
---
chromium/build/toolchain/linux/BUILD.gn | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/chromium/build/toolchain/linux/BUILD.gn b/chromium/build/toolchain/linux/BUILD.gn
index 86cd7dabc6..4b1e73b1ac 100644
index 1b0f2205927..9727519cdd0 100644
--- a/chromium/build/toolchain/linux/BUILD.gn
+++ b/chromium/build/toolchain/linux/BUILD.gn
@@ -22,15 +22,13 @@ clang_toolchain("clang_arm64") {
@ -54,5 +54,5 @@ index 86cd7dabc6..4b1e73b1ac 100644
toolchain_args = {
current_cpu = "arm"
--
2.13.2
2.21.0

25
extra/qt5-webengine/0002-Fix-ARM-skia-ICE.patch Normal file
View file

@ -0,0 +1,25 @@
From 85f28ac094883e20d31775cba258b7e2a333866c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 1 Jul 2019 07:10:36 -0600
Subject: [PATCH 2/2] Fix ARM skia ICE
---
chromium/third_party/skia/third_party/skcms/src/Transform_inl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h b/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h
index 9a69fcf1b90..ffb1aaac1f8 100644
--- a/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h
+++ b/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h
@@ -559,7 +559,7 @@ SI void sample_clut_16(const skcms_A2B* a2b, I32 ix, F* r, F* g, F* b) {
// GCC 7.2.0 hits an internal compiler error with -finline-functions (or -O3)
// when targeting MIPS 64, I think attempting to inline clut() into exec_ops().
-#if 1 && defined(__GNUC__) && !defined(__clang__) && defined(__mips64)
+#if 1 && defined(__GNUC__) && !defined(__clang__) && (defined(__mips64) || defined(__arm__))
#define MAYBE_NOINLINE __attribute__((noinline))
#else
#define MAYBE_NOINLINE
--
2.21.0

8
extra/qt5-webengine/PKGBUILD
View file

@ -3,6 +3,7 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - patch for chromium GN
# - patch for chromium skia
buildarch=12
highmem=1
@ -22,10 +23,12 @@ groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
qtwebengine-glibc-2.29.patch
0001-ARM-toolchain-fixes.patch)
0001-ARM-toolchain-fixes.patch
0002-Fix-ARM-skia-ICE.patch)
sha256sums=('e0af82ecee1ab41b6732697f667b98b7b0c53164bebcfaad8070e88b2e064efe'
'dd791f154b48e69cd47fd94753c45448655b529590995fd71ac1591c53a3d60c'
'8202b09a1caa82538a2eacd79b62b61d8661c65cdfb275560d231aa31a362b12')
'f03455dd16275f8abb432278abb908ebdd5f8cf83db73ae63de7a105bbf47109'
'2a363b44b8291512bb2bcbce1370b8abfb8a57961e0e5e34150da6e337155a05')
prepare() {
mkdir -p build
@ -36,6 +39,7 @@ prepare() {
cd ..
patch -p1 -i ${srcdir}/0001-ARM-toolchain-fixes.patch
patch -p1 -i ${srcdir}/0002-Fix-ARM-skia-ICE.patch
}
build() {