[PR PATCH] qutebrowser: update to 3.0.0, use Qt6 by default

[PR PATCH] qutebrowser: update to 3.0.0, use Qt6 by default

[ahesford]

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

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

https://github.com/ahesford/void-packages qb
https://github.com/void-linux/void-packages/pull/45665

qutebrowser: update to 3.0.0, use Qt6 by default
We can make Qt6 a (default, when possible) build option to allow people to build Qt5 versions if desired, and also force the WebKit backend (which implies Qt5) when WebEngine is unavailable.

#### Testing the changes
- I tested the changes in this PR: **briefly** (I'm using it now)

cc: @daniel-eys

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

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

From 7b76ba9fbb7cac420aa0beae02e4bb2759ad5c5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 18 Aug 2023 16:07:06 -0400
Subject: [PATCH] qutebrowser: update to 3.0.0, use Qt6 when possible

---
 srcpkgs/qutebrowser/template | 42 ++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 1c1f8114371a6..b06a4ae4cda04 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,37 +1,47 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.5.4
+version=3.0.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
-depends="python3-PyQt5-quick python3-Jinja2 python3-yaml
- python3-PyQt5-opengl python3-PyQt5-sql qt5-plugin-sqlite"
+depends="python3-Jinja2 python3-yaml"
 short_desc="Keyboard-focused browser with a minimal GUI"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=a460b2202527e42a670c26d225d9fa6417d092cc1f16f3a95e7bc95dd89c1ab1
+checksum=39eaf4a7f0f051f39e8d40a04824a432f2cb023372271e75aa037b6dc410d8fc
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
 make_check=no
 
-build_options="webengine"
-desc_option_webengine="Build Qt5 WebEngine support"
+build_options="qt6 webkit"
+desc_option_qt6="Use Qt6 GUI and WebEngine backend"
+desc_option_webkit="Use Qt5 WebKit backend"
 
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	# qt5-webengine is only available for little-endian systems
-	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
-		build_options_default="webengine"
-	fi
+vopt_conflict qt6 webkit
+
+# WebEngine is unavailable on BE systems or when host & target word sizes differ
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	build_options_default="webkit"
+elif [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+	build_options_default="webkit"
+elif [ "$XBPS_WORDSIZE" != 32 ]; then
+	# qt6-webengine is broken on 32-bit systems
+	build_options_default="qt6"
 fi
 
-if [ "$build_option_webengine" ]; then
-	depends+=" python3-PyQt5-webengine"
+if [ "$build_option_qt6" ]; then
+	depends+=" python3-pyqt6-declarative python3-pyqt6-gui
+	 python3-pyqt6-sql python3-pyqt6-webengine python3-pyqt6-webchannel
+	 python3-pyqt6-widgets python3-pyqt6-network python3-pyqt6-dbus
+	 python3-pyqt6-printsupport qt6-plugin-sqlite"
 else
-	depends+=" python3-PyQt5-webkit"
+	depends+=" python3-PyQt5-quick python3-PyQt5-opengl
+	 python3-PyQt5-sql qt5-plugin-sqlite
+	 $(vopt_if webkit python3-PyQt5-webkit python3-PyQt5-webengine)"
 fi
 
 pre_build() {
@@ -48,10 +58,10 @@ post_install() {
 
 	local dim
 	for dim in 16 24 32 48 64 96 128 256 512; do
-		vinstall icons/qutebrowser-${dim}x${dim}.png 644 \
+		vinstall qutebrowser/icons/qutebrowser-${dim}x${dim}.png 644 \
 			usr/share/icons/hicolor/${dim}x${dim}/apps qutebrowser.png
 	done
 
-	vinstall icons/qutebrowser.svg 644 \
+	vinstall qutebrowser/icons/qutebrowser.svg 644 \
 		usr/share/icons/hicolor/scalable/apps qutebrowser.svg
 }

Re: qutebrowser: update to 3.0.0, use Qt6 by default

[loosefish-scapegrace]

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

New comment by loosefish-scapegrace on void-packages repository

https://github.com/void-linux/void-packages/pull/45665#issuecomment-1687141214

Comment:
I had some problems with the `fixed` bitmap font when i tried this (it had artifacts and rendered quite slowly), but i think that's a qt6 issue and not a qutebrowser issue. Apparently it was fixed in qt 6.5.2, which void has not packaged?

Re: qutebrowser: update to 3.0.0, use Qt6 by default

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45665#issuecomment-1687557689

Comment:
I imagine the font rendering issue can be worked around by disabling bitmap fonts as was the case with recent Firefox updates. This with a compelling need for bitmap fonts (I'm curious to know what such a need might be) can either build the browser with the `qt6` option disabled, or just manually install the Qt5 dependencies and pick that version with a command-line flag.

The fact that `qt5-webengine` is stuck at Chromium 8x and increasingly triggers warnings from websites looking to drop support (or functionality altogether) strongly motivates the move to Qt6 by default wherever possible. 

Re: qutebrowser: update to 3.0.0, use Qt6 by default

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45665#issuecomment-1687557689

Comment:
I imagine the font rendering issue can be worked around by disabling bitmap fonts, as was the case with recent Firefox updates. This with a compelling need for bitmap fonts (I'm curious to know what such a need might be) can either build the browser with the `qt6` option disabled, or just manually install the Qt5 dependencies and pick that version with a command-line flag.

The fact that `qt5-webengine` is stuck at Chromium 8x and increasingly triggers warnings from websites looking to drop support (or functionality altogether) strongly motivates the move to Qt6 by default wherever possible. 

Re: qutebrowser: update to 3.0.0, use Qt6 by default

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45665#issuecomment-1687557689

Comment:
I imagine the font rendering issue can be worked around by disabling bitmap fonts, as was the case with recent Firefox updates. Those with a compelling need for bitmap fonts (I'm curious to know what such a need might be) can either build the browser with the `qt6` option disabled; alternatively, just manually install the Qt5 dependencies and pick that version with a command-line flag.

The fact that `qt5-webengine` is stuck at Chromium 8x and increasingly triggers warnings from websites looking to drop support (or functionality altogether) strongly motivates the move to Qt6 by default wherever possible. 

Re: [PR PATCH] [Updated] qutebrowser: update to 3.0.0, use Qt6 by default

[ahesford]

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

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

https://github.com/ahesford/void-packages qb
https://github.com/void-linux/void-packages/pull/45665

qutebrowser: update to 3.0.0, use Qt6 by default
We can make Qt6 a (default, when possible) build option to allow people to build Qt5 versions if desired, and also force the WebKit backend (which implies Qt5) when WebEngine is unavailable.

#### Testing the changes
- I tested the changes in this PR: **briefly** (I'm using it now)

cc: @daniel-eys

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

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

From b7ebf7374e8647ffbd7ae739269166e77cd9aba1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 18 Aug 2023 16:07:06 -0400
Subject: [PATCH] qutebrowser: update to 3.0.0, use Qt6 when possible

---
 srcpkgs/qutebrowser/template | 42 ++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 1c1f8114371a6..b06a4ae4cda04 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,37 +1,47 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.5.4
+version=3.0.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
-depends="python3-PyQt5-quick python3-Jinja2 python3-yaml
- python3-PyQt5-opengl python3-PyQt5-sql qt5-plugin-sqlite"
+depends="python3-Jinja2 python3-yaml"
 short_desc="Keyboard-focused browser with a minimal GUI"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=a460b2202527e42a670c26d225d9fa6417d092cc1f16f3a95e7bc95dd89c1ab1
+checksum=39eaf4a7f0f051f39e8d40a04824a432f2cb023372271e75aa037b6dc410d8fc
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
 make_check=no
 
-build_options="webengine"
-desc_option_webengine="Build Qt5 WebEngine support"
+build_options="qt6 webkit"
+desc_option_qt6="Use Qt6 GUI and WebEngine backend"
+desc_option_webkit="Use Qt5 WebKit backend"
 
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	# qt5-webengine is only available for little-endian systems
-	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
-		build_options_default="webengine"
-	fi
+vopt_conflict qt6 webkit
+
+# WebEngine is unavailable on BE systems or when host & target word sizes differ
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	build_options_default="webkit"
+elif [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+	build_options_default="webkit"
+elif [ "$XBPS_WORDSIZE" != 32 ]; then
+	# qt6-webengine is broken on 32-bit systems
+	build_options_default="qt6"
 fi
 
-if [ "$build_option_webengine" ]; then
-	depends+=" python3-PyQt5-webengine"
+if [ "$build_option_qt6" ]; then
+	depends+=" python3-pyqt6-declarative python3-pyqt6-gui
+	 python3-pyqt6-sql python3-pyqt6-webengine python3-pyqt6-webchannel
+	 python3-pyqt6-widgets python3-pyqt6-network python3-pyqt6-dbus
+	 python3-pyqt6-printsupport qt6-plugin-sqlite"
 else
-	depends+=" python3-PyQt5-webkit"
+	depends+=" python3-PyQt5-quick python3-PyQt5-opengl
+	 python3-PyQt5-sql qt5-plugin-sqlite
+	 $(vopt_if webkit python3-PyQt5-webkit python3-PyQt5-webengine)"
 fi
 
 pre_build() {
@@ -48,10 +58,10 @@ post_install() {
 
 	local dim
 	for dim in 16 24 32 48 64 96 128 256 512; do
-		vinstall icons/qutebrowser-${dim}x${dim}.png 644 \
+		vinstall qutebrowser/icons/qutebrowser-${dim}x${dim}.png 644 \
 			usr/share/icons/hicolor/${dim}x${dim}/apps qutebrowser.png
 	done
 
-	vinstall icons/qutebrowser.svg 644 \
+	vinstall qutebrowser/icons/qutebrowser.svg 644 \
 		usr/share/icons/hicolor/scalable/apps qutebrowser.svg
 }

Re: [PR PATCH] [Merged]: qutebrowser: update to 3.0.0, use Qt6 by default

[ahesford]

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

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

qutebrowser: update to 3.0.0, use Qt6 by default
https://github.com/void-linux/void-packages/pull/45665

Description:
We can make Qt6 a (default, when possible) build option to allow people to build Qt5 versions if desired, and also force the WebKit backend (which implies Qt5) when WebEngine is unavailable.

#### Testing the changes
- I tested the changes in this PR: **briefly** (I'm using it now)

cc: @daniel-eys

Re: qutebrowser: update to 3.0.0, use Qt6 by default

[vlur]

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

New comment by vlur on void-packages repository

https://github.com/void-linux/void-packages/pull/45665#issuecomment-1710818102

Comment:
Hi, since upgrading qutebrowser to v3.0, Invidious videos don't play in browser. Instead they throw the error "No compatible source found for this media". [qutebrowser issue #7185](https://github.com/qutebrowser/qutebrowser/issues/7185) says this is due to the QtWebEngine binary not being built with proprietary codec support.

Dev of qutebrowser The_Compiler [says](https://old.reddit.com/r/qutebrowser/comments/165kwqg/with_the_new_qutebrowser_update_some_videos/):

>Looks like Void Linux [builds Qt 5](https://github.com/void-linux/void-packages/blob/master/srcpkgs/qt5-webengine/template#L12) with proprietary codec support, but [does not](https://github.com/void-linux/void-packages/blob/master/srcpkgs/qt6-webengine/template) pass the same option for Qt 6. You might want to open an issue in their packaging repo for this, as it doesn't seem intentional.

I am not OP in that thread, but I am experiencing the same error. I can open an issue if that is preferred but I thought it might be better to just give you a heads up since this is probably a simple fix.

Re: qutebrowser: update to 3.0.0, use Qt6 by default

[loosefish-scapegrace]

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

New comment by loosefish-scapegrace on void-packages repository

https://github.com/void-linux/void-packages/pull/45665#issuecomment-1710916174

Comment:
There's an open issue (#44293) about enabling proprietary codec support in qt6-webengine

Re: qutebrowser: update to 3.0.0, use Qt6 by default

[vlur]

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

New comment by vlur on void-packages repository

https://github.com/void-linux/void-packages/pull/45665#issuecomment-1710924352

Comment:
Ah, alright, my mistake. I tried to look for open issues first. Guess I missed it. Cheers.

Re: qutebrowser: update to 3.0.0, use Qt6 by default

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45665#issuecomment-1710962469

Comment:
Until qt6-webengine is rebuilt with the necessary codecs, you can always manually install the PyQt5 dependencies and launch qutebrowser with qt5-webengine.