[PR PATCH] qutebrowser: disable webengine build option where it's broken

[PR PATCH] qutebrowser: disable webengine build option where it's broken

[ahesford]

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

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

https://github.com/ahesford/void-packages qutebrowser
https://github.com/void-linux/void-packages/pull/23546

qutebrowser: disable webengine build option where it's broken


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

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

From 20fec27a59e10d69ff7ba46a13662090525ee52d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 13 Jul 2020 12:57:42 -0400
Subject: [PATCH] qutebrowser: disable webengine build option where it's broken

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

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 6c0d25a4d7b..4f09931994f 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.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
@@ -20,11 +20,9 @@ nostrip=yes
 build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
 
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
-		build_options_default="webengine"
-	fi
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|ppc64le*) build_options_default="webengine" ;;
+esac
 
 if [ "$build_option_webengine" ]; then
 	depends+=" python3-PyQt5-webengine"

Re: [PR PATCH] [Updated] qutebrowser: disable webengine build option where it's broken

[ahesford]

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

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

https://github.com/ahesford/void-packages qutebrowser
https://github.com/void-linux/void-packages/pull/23546

qutebrowser: disable webengine build option where it's broken


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

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

From 70cf72055587f45bbfb82c536f0937adb5e212ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 13 Jul 2020 14:47:35 -0400
Subject: [PATCH 1/2] python-PyQt5-webengine: mark nocross due to broken
 package configure script

---
 srcpkgs/python-PyQt5-webengine/template | 41 ++++++-------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template
index 3a925a224e9..d11a226bc04 100644
--- a/srcpkgs/python-PyQt5-webengine/template
+++ b/srcpkgs/python-PyQt5-webengine/template
@@ -1,14 +1,11 @@
 # Template file for 'python-PyQt5-webengine'
 pkgname=python-PyQt5-webengine
 version=5.13.2
-revision=2
+revision=3
 wrksrc="PyQtWebEngine-${version}"
-pycompile_module="PyQt5WebEngine"
-hostmakedepends="pkg-config qt5-qmake
- qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
- python-devel python3-devel python-PyQt5-devel
- qt5-webengine-devel"
-makedepends="${hostmakedepends/pkg-config/}"
+hostmakedepends="pkg-config qt5-qmake python python-PyQt5 python3-PyQt5"
+makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
+ qt5-webengine-devel python-devel python3-devel python-PyQt5-devel"
 depends="python-PyQt5-${version}_${revision} python-PyQt5-webchannel-${version}_${revision}"
 short_desc="Python2 bindings for the Qt5 toolkit - webengine module"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -17,6 +14,7 @@ homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine-${version}.tar.gz"
 checksum=4264911b5847c75721d8c9c30af92e58a216bd25ceef37f7abf921005c1d45a9
 lib32disabled=yes
+nocross="file-based configuration mechanism is broken"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) ;;
@@ -34,34 +32,15 @@ pre_build() {
 }
 
 do_build() {
-	local _sysroot= _configuration= py_abiver= qt_version
 	for pyver in $py2_ver $py3_ver; do
-		if [ "$pyver" = "$py3_ver" ]; then
-			py_abiver="$py3_abiver"
-		fi
-
 		cd $wrksrc/pyqt5-$pyver
-		if [ "$CROSS_BUILD" ]; then
-			qt_version=$(qmake -query QT_VERSION)
-cat > pyqt5_${XBPS_CROSS_TRIPLET}.cfg <<EOF
-py_platform = linux
-py_inc_dir = %(sysroot)/usr/include/python%(py_major).%(py_minor)${py_abiver}
-py_pyshlib = python%(py_major).%(py_minor)${py_abiver}.so
-pyqt_disabled_features = PyQt_Desktop_OpenGL PyQt_qreal_double
-
-qt_shared = True
-
-[Qt ${qt_version}]
-pyqt_modules = QtWebEngine QtWebEngineCore QtWebEngineWidgets
-EOF
 
-			_sysroot="--sysroot $XBPS_CROSS_BASE"
-			_configuration="--configuration $wrksrc/pyqt5-$pyver/pyqt5_${XBPS_CROSS_TRIPLET}.cfg"
-		fi
+		python${pyver} configure.py --no-dist-info \
+			QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
+			QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
+			QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}"
+			QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
 
-		python${pyver} configure.py --no-dist-info $_sysroot $_configuration \
-			QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
-			QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
 		make ${makejobs}
 	done
 }

From f5c3f8fad6acc90be3f137068e3c4f181f658659 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 13 Jul 2020 14:53:01 -0400
Subject: [PATCH 2/2] qutebrowser: disable webengine for cross builds

python3-PyQt5-webengine is nocross because its configure script is
broken for anything but native builds. Better to have a current
qutebrowser that uses -webkit than a stale package with old -webengine.
---
 srcpkgs/qutebrowser/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 6c0d25a4d7b..848546131d5 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.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
@@ -21,7 +21,10 @@ build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+	# qt5-webengine is only available for little-endian systems
+	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" -a -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
 fi

Re: qutebrowser: disable webengine build option where it's broken

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23546#issuecomment-657738441

Comment:
After a closer look at `python*-PyQt5-webengine` and a comment from @Johnnynator, I realized that the file-based configuration mechanism for `python*-PyQt5-webengine` is broken and cross builds are simply not possible. This masqueraded as an `aarch64` problem because those are the only architectures CI and the builders cross-compile that wasn't already broken for other reasons. I don't think this is worth fixing at least until PyQt5 5.15 can be packaged (which brings its own challenges), so I'm marking `nocross` for now.

To allow an up-to-date `qutebrowser` on those architectures where `python*-PyQt5-webengine` is no longer available, I've disabled the `webengine` default build option for cross builds.

cc: @Chocimier 

Re: [PR REVIEW] qutebrowser: disable webengine build option where it's broken

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23546#discussion_r453875175

Comment:
Native build imply wordsize equality.

Re: [PR PATCH] [Updated] qutebrowser: disable webengine build option where it's broken

[ahesford]

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

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

https://github.com/ahesford/void-packages qutebrowser
https://github.com/void-linux/void-packages/pull/23546

qutebrowser: disable webengine build option where it's broken


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

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

From 9c7dcb6c4657c447b7469871082b25ccdbf3407b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 13 Jul 2020 14:47:35 -0400
Subject: [PATCH 1/2] python-PyQt5-webengine: mark nocross due to broken
 package configure script

---
 srcpkgs/python-PyQt5-webengine/template | 42 ++++++-------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template
index 3a925a224e9..5e38b2a036b 100644
--- a/srcpkgs/python-PyQt5-webengine/template
+++ b/srcpkgs/python-PyQt5-webengine/template
@@ -1,14 +1,11 @@
 # Template file for 'python-PyQt5-webengine'
 pkgname=python-PyQt5-webengine
 version=5.13.2
-revision=2
+revision=3
 wrksrc="PyQtWebEngine-${version}"
-pycompile_module="PyQt5WebEngine"
-hostmakedepends="pkg-config qt5-qmake
- qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
- python-devel python3-devel python-PyQt5-devel
- qt5-webengine-devel"
-makedepends="${hostmakedepends/pkg-config/}"
+hostmakedepends="pkg-config qt5-qmake python python-PyQt5 python3-PyQt5"
+makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
+ qt5-webengine-devel python-devel python3-devel python-PyQt5-devel"
 depends="python-PyQt5-${version}_${revision} python-PyQt5-webchannel-${version}_${revision}"
 short_desc="Python2 bindings for the Qt5 toolkit - webengine module"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -17,12 +14,12 @@ homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine-${version}.tar.gz"
 checksum=4264911b5847c75721d8c9c30af92e58a216bd25ceef37f7abf921005c1d45a9
 lib32disabled=yes
+nocross="configure script is broken for cross builds"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) ;;
 	ppc*) broken="no webengine for big endian ppc";;
 	arm*) broken="depends on qt5-webengine";;
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64_builder/builds/20955/steps/shell_3/logs/stdio";;
 esac
 
 pre_build() {
@@ -34,34 +31,15 @@ pre_build() {
 }
 
 do_build() {
-	local _sysroot= _configuration= py_abiver= qt_version
 	for pyver in $py2_ver $py3_ver; do
-		if [ "$pyver" = "$py3_ver" ]; then
-			py_abiver="$py3_abiver"
-		fi
-
 		cd $wrksrc/pyqt5-$pyver
-		if [ "$CROSS_BUILD" ]; then
-			qt_version=$(qmake -query QT_VERSION)
-cat > pyqt5_${XBPS_CROSS_TRIPLET}.cfg <<EOF
-py_platform = linux
-py_inc_dir = %(sysroot)/usr/include/python%(py_major).%(py_minor)${py_abiver}
-py_pyshlib = python%(py_major).%(py_minor)${py_abiver}.so
-pyqt_disabled_features = PyQt_Desktop_OpenGL PyQt_qreal_double
-
-qt_shared = True
-
-[Qt ${qt_version}]
-pyqt_modules = QtWebEngine QtWebEngineCore QtWebEngineWidgets
-EOF
 
-			_sysroot="--sysroot $XBPS_CROSS_BASE"
-			_configuration="--configuration $wrksrc/pyqt5-$pyver/pyqt5_${XBPS_CROSS_TRIPLET}.cfg"
-		fi
+		python${pyver} configure.py --no-dist-info \
+			QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
+			QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
+			QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}"
+			QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
 
-		python${pyver} configure.py --no-dist-info $_sysroot $_configuration \
-			QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
-			QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
 		make ${makejobs}
 	done
 }

From c2da4556fd75206268e0bc0ffac8a72de11a9c6b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 13 Jul 2020 14:53:01 -0400
Subject: [PATCH 2/2] qutebrowser: disable webengine for cross builds

python3-PyQt5-webengine is nocross because its configure script is
broken for anything but native builds. Better to have a current
qutebrowser that uses -webkit than a stale package with old -webengine.
---
 srcpkgs/qutebrowser/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 6c0d25a4d7b..bdcf47619a6 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.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
@@ -21,7 +21,10 @@ build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; 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
 fi

Re: [PR REVIEW] qutebrowser: disable webengine build option where it's broken

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23546#discussion_r453882775

Comment:
Good point, thanks. I also forgot to remote `broken` for `aarch64*` in `python-PyQt5-webengine`, which is not needed with `nocross`. Both are fixed.

Re: [PR PATCH] [Merged]: qutebrowser: disable webengine build option where it's broken

[ahesford]

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

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

qutebrowser: disable webengine build option where it's broken
https://github.com/void-linux/void-packages/pull/23546

Description: