New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
qutebrowser: update to 2.0.1 #28286
qutebrowser: update to 2.0.1 #28286
Conversation
Please add |
I don't understand, my native arch is x86_64 and building it in a vm(that didn't have the previous version or anything related) with xbps-src works too |
This is running the tests, which you can do by running Also, please squash the commits. |
srcpkgs/qutebrowser/template
Outdated
revision=1 | ||
build_style=python3-module | ||
hostmakedepends="python3-setuptools asciidoc" | ||
depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2 | ||
python3-yaml python3-attrs python3-PyQt5-opengl python3-PyQt5-sql | ||
qt5-plugin-sqlite python3-setuptools" | ||
checkdepends="$depends" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
try adding python3-pytest
Well the tests are causing the issue and when I look at the build logs for the older versions they skipped the tests, so I'm wondering if the previous versions passed the tests, I'll try it |
Should we do something to #27490 too? qutebrowser 2.0.0 comes with the adblocking feature |
2.0.1 has been released: https://github.com/qutebrowser/qutebrowser/releases/tag/v2.0.1 |
So I tried running the test and found out that the test needs a running Xorg server to function(it displays a window) and it is also deprecated, I'm not sure how to change the build so that it doesn't run the tests |
Please apply this patch: diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index c80d32792f..4c160a1adf 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -7,7 +7,7 @@ hostmakedepends="python3-setuptools asciidoc"
depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
python3-yaml python3-attrs python3-PyQt5-opengl python3-PyQt5-sql
qt5-plugin-sqlite python3-setuptools"
- checkdepends="$depends python3-pytest"
+checkdepends="$depends python3-pytest xvfb-run"
short_desc="Keyboard-focused browser with a minimal GUI"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
@@ -37,6 +37,12 @@ pre_build() {
a2x -f manpage doc/qutebrowser.1.asciidoc
}
+do_check() {
+ # testing with pytest would be nice, but requires unpackaged plugins:
+ # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-mock, pytest-qt, pytest-rerunfailures
+ :
+}
+
post_install() {
vman doc/qutebrowser.1
vinstall misc/org.qutebrowser.qutebrowser.desktop 644 usr/share/applications |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In addition to bumping to the fresh 2.0.1, you need to go through the Quick checklist for packages provided by the project. The dependencies need to be brought in line with upstream recommendation.
Regarding python3-Pygments
becoming optional, it would be nice to know where in qutebrowser it is used so we can decide if it should be retained as a dependency of this package.
@ericonr We do provide |
@ahesford we also provide pytest-qt, fwiw. The issue is that the tests seem to check for these plugins at startup, and it complains immediatelly about them not being there, instead of being runtime failures. |
@ahesford python3-Pygments is used for syntax highlighting when viewing page source(only with :view-source --pygments or on WebKit) and also when formatting JSON files |
Syntax highlighting of source and JSON seems worth keeping the Pygments dependency. The other obsolete dependencies still need to be dropped. |
I checked the dependencies, only python3-pyPEG2 shouldn't be required. Also the python3-Pygments are only used if you choose to use :view-source with the --pygments flag or when using a userscript that is in the official repo or when you use QtWebKit instead of QtWebEngine |
From the list:
If the Pygments support really requires a |
I didn't notice the attrs dependency removal, sorry. What I meant with the Pygments also was that to use it you have to do |
python3-pyPEG2 isn't used anywhere else, so it should be safe to drop the package (upstream dead) |
srcpkgs/qutebrowser/template
Outdated
qt5-plugin-sqlite python3-setuptools" | ||
depends="python3-PyQt5-quick python3-Jinja2 python3-yaml python3-PyQt5-opengl python3-PyQt5-sql | ||
qt5-plugin-sqlite" | ||
checkdepends="$depends python3-pytest xvfb-run" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you're skipping tests, don't add checkdepends.
add checkdepends line add python3-pytest update checksum, bump version to 2.0.1 add do_check() patch remove excess line remove unneeded dependencies remove checkdepends
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This update is working for me.
What do you think about adding pdf.js as a dependency. It's an optional dependency which allows showing PDF files inside the browser (Ctrl+p in the download dialog). |
I wouldn't add that dependency. When the browser presents the option to display PDFs, I think it is pretty clear that it wants pdf.js, so users should know where to look if they want to enable support. |
Closes: void-linux#28286 [via git-merge-pr]
General
Have the results of the proposed changes been tested?