* [gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/, www-client/qutebrowser/, profiles/arch/arm64/
@ 2021-06-27 4:23 Stefan Strogin
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Strogin @ 2021-06-27 4:23 UTC (permalink / raw
To: gentoo-commits
commit: 429d211b13cfd976895270e875e506d0194c719d
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 27 03:50:19 2021 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun Jun 27 04:18:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429d211b
www-client/qutebrowser: add USE=adblock, other improvements
- Add USE=adblock, enable it by default.
- Mask adblock on x86 and arm64, as dev-python/adblock is not
keyworded there yet.
- Drop scripts flag from IUSE. There is no reason not to install
userscripts. Let's always install them.
- Install scripts from "scripts" directory (not just "userscripts").
Closes: https://bugs.gentoo.org/773643
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
profiles/arch/arm64/package.use.mask | 4 ++
profiles/arch/x86/package.use.mask | 4 ++
www-client/qutebrowser/metadata.xml | 2 +
...er-2.2.3.ebuild => qutebrowser-2.2.3-r1.ebuild} | 62 +++++++++++-----------
4 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index cfa6f8f09ee..e9bd1aaf19c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Stefan Strogin <steils@gentoo.org> (2021-06-27)
+# Requires dev-python/adblock which is not keyworded on arm64 yet
+www-client/qutebrowser adblock
+
# Sam James <sam@gentoo.org> (2021-04-14)
# Supports 64-bit NEON
# Note: libpng-compat 1.5.30 does NOT seem to.
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index f33dedb8b8d..9532c7c62a5 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Stefan Strogin <steils@gentoo.org> (2021-06-27)
+# Requires dev-python/adblock which is not keyworded on x86 yet
+www-client/qutebrowser adblock
+
# Andreas Sturmlechner <asturm@gentoo.org> (2020-04-25)
# Depends on either unkeyworded dev-java/openjdk:11
# or unavailable >=dev-java/icedtea-4, bug #785640
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index c915949c2ca..8eb60f40da2 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -17,6 +17,8 @@
<remote-id type="github">qutebrowser/qutebrowser</remote-id>
</upstream>
<use>
+ <flag name="adblock">Enable Brave's ABP-style adblocker library
+ for improved adblocking</flag>
<flag name="scripts">Installs userscripts from the misc/userscripts
directory to /usr/share/qutebrowser/userscripts.</flag>
</use>
diff --git a/www-client/qutebrowser/qutebrowser-2.2.3.ebuild b/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
similarity index 60%
rename from www-client/qutebrowser/qutebrowser-2.2.3.ebuild
rename to www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
index ab48622e1e2..a546f877c3d 100644
--- a/www-client/qutebrowser/qutebrowser-2.2.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="scripts test"
+IUSE="+adblock test"
BDEPEND="app-text/asciidoc"
RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
@@ -26,7 +26,8 @@ RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
dev-python/typing-extensions[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]"
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
distutils_enable_tests setup.py
@@ -39,39 +40,38 @@ python_compile_all() {
}
python_install_all() {
+ insinto /usr/share/metainfo
+ doins misc/org.qutebrowser.qutebrowser.appdata.xml
doman doc/${PN}.1
domenu misc/org.${PN}.${PN}.desktop
+ for s in 16 24 32 48 64 128 256 512; do
+ doicon -s ${s} icons/qutebrowser-${s}x${s}.png
+ done
doicon -s scalable icons/${PN}.svg
- if use scripts; then
- insinto /usr/share/qutebrowser/userscripts/
- doins misc/userscripts/README.md
- exeinto /usr/share/qutebrowser/userscripts/
- doexe misc/userscripts/add-nextcloud-bookmarks \
- misc/userscripts/add-nextcloud-cookbook \
- misc/userscripts/cast \
- misc/userscripts/dmenu_qutebrowser \
- misc/userscripts/format_json \
- misc/userscripts/getbib \
- misc/userscripts/kodi \
- misc/userscripts/open_download \
- misc/userscripts/openfeeds \
- misc/userscripts/password_fill \
- misc/userscripts/qr \
- misc/userscripts/qute-bitwarden \
- misc/userscripts/qutedmenu \
- misc/userscripts/qute-keepass \
- misc/userscripts/qute-keepassxc \
- misc/userscripts/qute-lastpass \
- misc/userscripts/qute-pass \
- misc/userscripts/readability \
- misc/userscripts/readability-js \
- misc/userscripts/ripbang \
- misc/userscripts/rss \
- misc/userscripts/taskadd \
- misc/userscripts/tor_identity \
- misc/userscripts/view_in_mpv
- fi
+ insinto /usr/share/qutebrowser/userscripts
+ doins misc/userscripts/README.md
+ exeinto /usr/share/qutebrowser/userscripts
+ for f in misc/userscripts/*; do
+ if [[ "${f}" == "__pycache__" ]]; then
+ continue
+ fi
+ doexe "${f}"
+ done
+
+ exeinto /usr/share/qutebrowser/scripts
+ for f in scripts/*; do
+ if [[ "${f}" == "scripts/__init__.py" || \
+ "${f}" == "scripts/__pycache__" || \
+ "${f}" == "scripts/dev" || \
+ "${f}" == "scripts/testbrowser" || \
+ "${f}" == "scripts/asciidoc2html.py" || \
+ "${f}" == "scripts/setupcommon.py" || \
+ "${f}" == "scripts/link_pyqt.py" ]]; then
+ continue
+ fi
+ doexe "${f}"
+ done
distutils-r1_python_install_all
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/, www-client/qutebrowser/, profiles/arch/arm64/
@ 2021-10-15 15:53 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2021-10-15 15:53 UTC (permalink / raw
To: gentoo-commits
commit: fd172713cff3fe36c322fd9718ae972d3270dcd8
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 12 17:20:15 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 15 15:43:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd172713
www-client/qutebrowser: add IUSE=widevine
Modifying qtwebengine could be an option instead, but don't
want to burden something as big as qtwebengine with more
patches. Here it's very trivial to control and rebuild.
Closes: https://bugs.gentoo.org/635532
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
profiles/arch/arm64/package.use.mask | 1 +
profiles/arch/x86/package.use.mask | 1 +
www-client/qutebrowser/metadata.xml | 2 ++
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 10 ++++++++--
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index ddc7dccfcf5..b240d240249 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -299,6 +299,7 @@ net-fs/samba dmapi
sci-libs/gdal armadillo netcdf
sys-fs/btrfs-progs reiserfs
www-client/chromium widevine
+www-client/qutebrowser widevine
www-client/vivaldi widevine
www-client/vivaldi-snapshot widevine
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index ba6a25a1b82..a72391fac54 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -307,6 +307,7 @@ dev-db/mariadb -jdbc
# Mike Gilbert <floppym@gentoo.org> (2016-03-03)
# chrome-binary-plugins dropped x86 support
www-client/chromium widevine
+www-client/qutebrowser widevine
www-client/vivaldi widevine
www-client/vivaldi-snapshot widevine
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index c3857041d96..bfc1e23ae3f 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -26,5 +26,7 @@
for improved adblocking</flag>
<flag name="scripts">Installs userscripts from the misc/userscripts
directory to /usr/share/qutebrowser/userscripts.</flag>
+ <flag name="widevine">Unsupported closed-source DRM capability
+ (required by Netflix VOD)</flag>
</use>
</pkgmetadata>
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
index f5481f420b5..510e711ce98 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.qutebrowser.org/"
LICENSE="GPL-3+"
SLOT="0"
-IUSE="+adblock"
+IUSE="+adblock widevine"
# Tests depend (misc/requirements/requirements-tests.txt) on plugins
# we don't have packages for.
RESTRICT="test"
@@ -40,7 +40,8 @@ RDEPEND="
dev-python/typing-extensions[${PYTHON_USEDEP}]
dev-python/zipp[${PYTHON_USEDEP}]
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
- ')"
+ ')
+ widevine? ( www-plugins/chrome-binary-plugins )"
BDEPEND="app-text/asciidoc"
distutils_enable_tests pytest
@@ -48,6 +49,11 @@ distutils_enable_tests pytest
python_prepare_all() {
distutils-r1_python_prepare_all
+ if use widevine; then
+ sed "/yield from _qtwebengine_settings_args/a\ yield '--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'" \
+ -i ${PN}/config/qtargs.py || die
+ fi
+
sed -i '/setup.py/d' misc/Makefile || die
[[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-15 15:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-15 15:53 [gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/, www-client/qutebrowser/, profiles/arch/arm64/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2021-06-27 4:23 Stefan Strogin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox