From a9814f549ceecfab703a3d43e6febf76820ea5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 14 Jan 2017 11:34:27 +0100 Subject: [PATCH] qt-webkit: undo native build changes --- srcpkgs/qt-webkit/template | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template index 9ecb4dc6b5d..f36eb0a874d 100644 --- a/srcpkgs/qt-webkit/template +++ b/srcpkgs/qt-webkit/template @@ -5,8 +5,6 @@ revision=3 _qtver=4.8.7 wrksrc="qtwebkit-${version}" create_wrksrc=yes -build_style=cmake -configure_args="-DPORT=Efl" hostmakedepends="automake libtool bison flex gperf ruby pkg-config qt-qmake" makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel" @@ -36,8 +34,19 @@ post_extract() { mv qt-everywhere-opensource-src-${_qtver} .. } -post_build() { - cd ${wrksrc}/../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview +do_configure() { + : +} + +do_build() { + local opts="--qt --prefix=/usr --no-webkit2" + case "$XBPS_TARGET_MACHINE" in + i686*) opts+=" --no-force-sse2" ;; + esac + export QTDIR=/usr + export PATH="/usr/lib/qt/bin:$PATH" + Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts} + cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview qmake CC="$CC" CXX="$CXX" LINK="$CXX" make ${makejobs} }