[PR PATCH] qutebrowser: switch backend to webengine for cross-build

[PR PATCH] qutebrowser: switch backend to webengine for cross-build

[sgn]

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

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages qutebrowser-webengine
https://github.com/void-linux/void-packages/pull/24294

qutebrowser: switch backend to webengine for cross-build


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

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

From 671b67898d8861731e2446530311238b092916cc 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: Sun, 16 Aug 2020 00:01:28 +0700
Subject: [PATCH] qutebrowser: switch backend to webengine for cross-build

---
 srcpkgs/qutebrowser/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 14204d37ae9..0ae66c4ba47 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -2,7 +2,7 @@
 # not noarch as the package might be built with different backend for each arch
 pkgname=qutebrowser
 version=1.13.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
@@ -22,11 +22,7 @@ desc_option_webengine="Build Qt5 WebEngine support"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	# qt5-webengine is only available for little-endian systems
-	if [ -z "$CROSS_BUILD" ]; then
-		# qt5-webengine can only be built when target and host bitness match
-		# python3-PyQt5-webengine is currently nocross
-		build_options_default="webengine"
-	fi
+	build_options_default="webengine"
 fi
 
 if [ "$build_option_webengine" ]; then

Re: qutebrowser: switch backend to webengine for cross-build

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#issuecomment-674424354

Comment:
this isn't good because webengine is not available on 32-bit crosstargets

Re: qutebrowser: switch backend to webengine for cross-build

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#issuecomment-674424354

Comment:
this isn't good because webengine is not available on 32-bit crosstargets

at most you can change the `if [ -z "$CROSS_BUILD" ]` to something like `if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]`

Re: qutebrowser: switch backend to webengine for cross-build

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#issuecomment-674424582

Comment:
ah, nevermind, you can't, because `python3-PyQt5-webengine` is still nocross

Re: qutebrowser: switch backend to webengine for cross-build

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#issuecomment-674424721

Comment:
On 2020-08-15 10:09:07-0700, Daniel Kolesa <notifications@github.com> wrote:
> this isn't good because webengine is not available on 32-bit crosstargets

Yes, I forgot about this. Will enable for WORDSIZE = 64 only?

Re: qutebrowser: switch backend to webengine for cross-build

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#issuecomment-674425005

Comment:
> ah, nevermind, you can't, because `python3-PyQt5-webengine` is still nocross

It's cross for `aarch64{,-musl}` now.

Re: [PR PATCH] [Updated] qutebrowser: switch backend to webengine for cross-build

[sgn]

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

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

https://github.com/sgn/void-packages qutebrowser-webengine
https://github.com/void-linux/void-packages/pull/24294

qutebrowser: switch backend to webengine for cross-build


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

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

From c5296007712d875d1eb58265225eb6c24052734b 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: Sun, 16 Aug 2020 00:01:28 +0700
Subject: [PATCH] qutebrowser: switch backend to webengine for 64 bit arch

---
 srcpkgs/qutebrowser/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 14204d37ae9..7b5f7f59b5d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -2,7 +2,7 @@
 # not noarch as the package might be built with different backend for each arch
 pkgname=qutebrowser
 version=1.13.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
@@ -22,9 +22,7 @@ desc_option_webengine="Build Qt5 WebEngine support"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	# qt5-webengine is only available for little-endian systems
-	if [ -z "$CROSS_BUILD" ]; then
-		# qt5-webengine can only be built when target and host bitness match
-		# python3-PyQt5-webengine is currently nocross
+	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
 		build_options_default="webengine"
 	fi
 fi

Re: [PR REVIEW] qutebrowser: switch backend to webengine for cross-build

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#discussion_r471152931

Comment:
Shouldn't this just copy the switch for `python3-PyQt5-webengine`? This will be broken for BE ppc when it should just pull `python3-PyQt5-webkit`.

Re: [PR REVIEW] qutebrowser: switch backend to webengine for cross-build

[Johnnynator]

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#discussion_r471157275

Comment:
Nah, `python3-PyQt5-webengine` doesn't even need a `broken=anything`, since `qt5-webengine` is already marked as broken and a dep of it.

Re: [PR REVIEW] qutebrowser: switch backend to webengine for cross-build

[Johnnynator]

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#discussion_r471157275

Comment:
Nah, `python3-PyQt5-webengine` doesn't even need a `broken=anything`, since `qt5-webengine` is already marked as broken and a dep of it. So if anything it should copy the behavior of `qt5-webengine`

Re: [PR REVIEW] qutebrowser: switch backend to webengine for cross-build

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#discussion_r471166411

Comment:
This is different, because the package shouldn't fail to build if webengine can't be built; it should just fall back to webkit.

Re: [PR REVIEW] qutebrowser: switch backend to webengine for cross-build

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#discussion_r471166689

Comment:
Reading this again, I agree. The word-size test seems best.

Re: [PR REVIEW] qutebrowser: switch backend to webengine for cross-build

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#discussion_r471844259

Comment:
I guess this is settled to current form, then?

Re: [PR REVIEW] qutebrowser: switch backend to webengine for cross-build

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24294#discussion_r471844521

Comment:
I think that's reasonable

Re: [PR PATCH] [Merged]: qutebrowser: switch backend to webengine for cross-build

[sgn]

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

There's a merged pull request on the void-packages repository

qutebrowser: switch backend to webengine for cross-build
https://github.com/void-linux/void-packages/pull/24294

Description: