From 1272e255e2b218187f3fa9e4bb29691318834e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 6 Mar 2017 21:17:32 +0100 Subject: [PATCH] qt5-webkit: fix cross + clean up Don't use build style qmake, but override do_configure, do_build and do_install in the template. Switch to out-of-source-tree build and add missing makedepends libjpeg-turbo-devel. --- srcpkgs/qt5-webkit/template | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 089f8b6b29d..8542f4916da 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -1,12 +1,10 @@ # Template file for 'qt5-webkit' pkgname=qt5-webkit version=5.8.0 -revision=1 -build_style=qmake +revision=2 wrksrc=qtwebkit-opensource-src-${version} -hostmakedepends="bison flex gperf perl python ruby pkg-config - qt5-host-tools qt5-declarative-devel" -makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel +hostmakedepends="bison flex gperf perl python ruby pkg-config" +makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel libjpeg-turbo-devel gst-plugins-base1-devel qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-webchannel-devel" short_desc="A cross-platform application and UI framework (Qt5) - WebKit2 component" @@ -16,18 +14,31 @@ homepage="https://www.qt.io/" distfiles="https://download.qt.io/community_releases/${version%.*}/${version}-final/qtwebkit-opensource-src-${version}.tar.xz" checksum=79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec -CXXFLAGS="-fno-delete-null-pointer-checks" +CXXFLAGS="-std=c++11 -fno-delete-null-pointer-checks" +LDFLAGS="-ldl" if [ -n "$CROSS_BUILD" ]; then - # Can't use gold linker when cross compiling - configure_args+=" QMAKE_LFLAGS_USE_GOLD=" + hostmakedepends+=" qt5-host-tools qt5-declarative-devel libjpeg-turbo-devel" fi -pre_configure() { +do_configure() { + mkdir -p build + cd build # Generate headers - syncqt.pl-qt5 -version ${version} Source/sync.profile + syncqt.pl-qt5 -version ${version} ${wrksrc}/Source/sync.profile + # Patch for QtWebProcess LFLAGS + sed -i ${wrksrc}/Source/WebKit2/WebProcess.pro \ + -e"/TARGET = QtWebProcess/i QMAKE_LFLAGS = $LDFLAGS" + qmake PREFIX=/usr LIB=/usr/lib QMAKE_LFLAGS_USE_GOLD= ${wrksrc} } -post_install() { - # QMAKE_PRL_BUILD_DIR contains a reference the build dir; drop it +do_build() { + cd build + make ${makejobs} CC=$CC CXX=$CXX LINK=$CXX LD=$CXX \ + AR="$AR cru" RANLIB=$RANLIB +} +do_install() { + cd build + make PREFIX=/usr INSTALL_ROOT=${DESTDIR} install + # QMAKE_PRL_BUILD_DIR contains a reference to the build dir; drop it find ${DESTDIR}/usr/lib -type f -name '*.prl' -exec \ sed -i "{}" -e "/^QMAKE_PRL_BUILD_DIR/d" \; }