Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] qt6-webengine: cross build
Date: Sat, 25 Feb 2023 01:34:45 +0100	[thread overview]
Message-ID: <20230225003445.OEZXjg7hzfUT8_BfK9ibXXbuDfKxkzDWG3RYhiCISuw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42427@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages qt6-webengine-cross
https://github.com/void-linux/void-packages/pull/42427

qt6-webengine: cross build
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42427.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-cross-42427.patch --]
[-- Type: text/x-diff, Size: 2677 bytes --]

From 3cc657fd3e46262c1a1debc5ce83b6bbea079e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
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() {

  reply	other threads:[~2023-02-25  0:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-24 15:44 [PR PATCH] " sgn
2023-02-25  0:34 ` sgn [this message]
2023-02-25  0:43 ` [PR PATCH] [Updated] " sgn
2023-02-25  5:41 ` [PR PATCH] [Merged]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230225003445.OEZXjg7hzfUT8_BfK9ibXXbuDfKxkzDWG3RYhiCISuw@z \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).