aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2017-05-31 17:31:57 -0700
committerDonald Carr2017-05-31 17:31:57 -0700
commit9eeb37be80aec4db8d99ba3aefe97ca8e6b91fff (patch)
treeed73a636e3ce44a76e76f52fbe0240704e635927
parent200252f1b24bebce48a369e713fc2b155d8b7300 (diff)
downloadaur-9eeb37be80aec4db8d99ba3aefe97ca8e6b91fff.tar.gz
Hopefully no longer need to force build of qtwebengine
-rw-r--r--PKGBUILD7
1 files changed, 2 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 0c62b0e50aa8..0195b8821302 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -261,7 +261,6 @@ build() {
local _basedir="${_srcdir}/qtbase"
local _waylanddir="${_srcdir}/qtwayland"
local _declarativedir="${_srcdir}/qtdeclarative"
- local _webenginedir="${_srcdir}/qtwebengine"
local _mkspec_dir="${_basedir}/mkspecs/devices/${_mkspec}"
cd ${_srcdir}
@@ -277,8 +276,6 @@ fi
if $_patching; then
# build qtwebengine with our mkspec
- local _webenginefileoverride="${_srcdir}/qtwebengine/tools/qmake/mkspecs/features/functions.prf"
- sed -i "s/linux-clang/linux*/" ${_webenginefileoverride} || exit 1
# hard coded off, so we have to hard code it on
local _reducerelocations="${_basedir}/config.tests/unix/reduce_relocs/bsymbolic_functions.c"
@@ -294,9 +291,9 @@ if $_patching; then
cd ${_waylanddir}
#patch -p1 < ${startdir}/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch
- cd ${_webenginedir}
+ #cd ${_webenginedir}
# reverse patch which breaks dynamic loading of EGL/GLESvs with rpi proprietary drivers
- patch -p1 < ${startdir}/0001-Revert-Fully-qualify-libEGL.so.1-libEGLESv2.so.2-lib.patch
+ #patch -p1 < ${startdir}/0001-Revert-Fully-qualify-libEGL.so.1-libEGLESv2.so.2-lib.patch
# Work around our embarresing propensity to stomp on your own tailored build configuration
# Now also present as we get complaints on the RPI 1 when Qt is left to use O3 about the