From 04fdea2a44ed9cff7445981a6c7d6fd5e3327a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 24 Feb 2023 22:42:56 +0700 Subject: [PATCH] qt6-webengine: cross build --- srcpkgs/qt6-webengine/template | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template index 10995994ac7e..99012732b53a 100644 --- a/srcpkgs/qt6-webengine/template +++ b/srcpkgs/qt6-webengine/template @@ -9,17 +9,18 @@ configure_args=" -DQT_FEATURE_webengine_system_gn=ON -DQT_FEATURE_webengine_system_icu=ON -DQT_FEATURE_webengine_webrtc_pipewire=ON + -DQT_FEATURE_webengine_embedded_build=OFF + -DQT_FEATURE_pdf_v8=ON -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja - -DQT_BUILD_EXAMPLES=ON - -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}" -hostmakedepends="qt6-base perl pkg-config nodejs python3-html5lib - qt6-declarative-tools protobuf gperf flex nss-devel libwebp-devel - icu-devel libevent-devel" + -DQT_BUILD_EXAMPLES=ON" +hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib + qt6-declarative-host-tools protobuf gperf flex nss-devel libwebp-devel + qt6-tools icu-devel libevent-devel" makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel qt6-tools-devel qt6-websockets-devel libflac-devel qt6-svg-devel alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel - re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel + re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel cups-devel nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel" @@ -33,13 +34,6 @@ homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebengine-everywhere-src-${version}.tar.xz" checksum=ffa945518d1cc8d9ee73523e8d9c2090844f5a2d9c7eac05c4ad079472a119c9 -nocross="until later, I need calibre first" - -if [ "$CROSS_BUILD" ];then - configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE" - configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake" -fi - if [ "$XBPS_LIBC" = "musl" ]; then hostmakedepends+=" musl-legacy-compat" fi @@ -137,6 +131,7 @@ pre_configure() { # _unbundle_libs _wrap_ninja export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release" + export PKG_CONFIG_HOST=${PKG_CONFIG_FOR_BUILD} } pre_build() {