commit: 70e4bb05d4fbde54ded8fdef1aec5b1f5e5f3bcb Author: Stefan Strogin <steils <AT> gentoo <DOT> org> AuthorDate: Thu Jul 9 17:09:25 2020 +0000 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> CommitDate: Thu Jul 9 17:15:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e4bb05
www-client/qutebrowser: drop old 1.11.1-r1 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> www-client/qutebrowser/Manifest | 1 - .../files/qutebrowser-1.11.1-session-restore.patch | 45 ------------- .../qutebrowser/qutebrowser-1.11.1-r1.ebuild | 77 ---------------------- 3 files changed, 123 deletions(-) diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index 61af532234d..086064b7539 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,3 +1,2 @@ -DIST qutebrowser-1.11.1.tar.gz 6789139 BLAKE2B 0f13c30a629a7ce6339a8506f1a16bbe6123fd28de9ada2f8105a2434d8493549aa79e5d42e7b871dc25e23866b36ecbb712ddfdfc4db139b2a6ee712f8aeb4a SHA512 56f18bc4d9a64e37f73a6ea69953c1a6a06d88c033c2484528b19475616c3229c2aa75f4fbf27668aef7a08358491eb27b3d8e16049021478ba8b4be7433f61f DIST qutebrowser-1.12.0.tar.gz 3979851 BLAKE2B 1a55c8b10aea5b618c0aa730828a123b127f1185d4e3f57b48f5c741c1bd5600e92b5e1bd48a1d3df94449eec650bb6f0d8b84a0c1f6f5ece045a6a0bce5583f SHA512 a8d979310f7c00a64b8cf976529def09b9a42542c80dd7055e2a38a174d9ef51834de6e816739911454a73ad9cc79a7d3e1fcda7d76bade463bc253aeb9ef608 DIST qutebrowser-1.13.0.tar.gz 4015550 BLAKE2B cc2f2779ca994da48e85156d5bba0a70f6f5380bc6c362e05944a2454e22ee99acf15875def448675ea86af8a919290dfaca5abf97ee5603e6c2b0d2ed41fabb SHA512 ee598db9416e4efcf5d8bc6aaa3d373637ed67f181e67e56c04fd7f2c12ebaf185f67a9463fff195d74ff7a239ce0a88c24bf35d3ad627116e2fa5ebed973d3d diff --git a/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch b/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch deleted file mode 100644 index 060c94eee6b..00000000000 --- a/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 22e15acc1e617174a9fde3e53100a1b71ca7f462 Mon Sep 17 00:00:00 2001 -From: Florian Bruhin <m...@the-compiler.org> -Date: Tue, 26 May 2020 16:48:00 +0200 -Subject: [PATCH] Update Qt 5.15 session workaround for lazy_restore - -See #5359 - -(cherry picked from commit 093a454bf4e386eda8715bc3ea2b217760d5f070) -Upstream-Status: Accepted -[https://github.com/qutebrowser/qutebrowser/commit/093a454bf4e386eda8715bc3ea2b217760d5f070 -expected in v1.12.0] ---- - qutebrowser/browser/webengine/webenginetab.py | 6 +++++- - qutebrowser/html/warning-sessions.html | 1 + - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py -index 647fa60abc..f61404f4ea 100644 ---- a/qutebrowser/browser/webengine/webenginetab.py -+++ b/qutebrowser/browser/webengine/webenginetab.py -@@ -648,7 +648,11 @@ def load_items(self, items): - if qtutils.version_check('5.15', compiled=False): - # WORKAROUND for https://github.com/qutebrowser/qutebrowser/issues/5359 - if items: -- self._tab.load_url(items[-1].url) -+ url = items[-1].url -+ if ((url.scheme(), url.host()) == ('qute', 'back') and -+ len(items) >= 2): -+ url = items[-2].url -+ self._tab.load_url(url) - return - - if items: -diff --git a/qutebrowser/html/warning-sessions.html b/qutebrowser/html/warning-sessions.html -index f93971c6ab..dd0c4127b6 100644 ---- a/qutebrowser/html/warning-sessions.html -+++ b/qutebrowser/html/warning-sessions.html -@@ -15,6 +15,7 @@ <h1>{{ title }}</h1> - - <ul> - <li>Loading a session with this release will <b>only load the most recently opened page</b> for every tab. As a result, the back/forward-history of every tab <b>will be lost</b> as soon as the session is saved again.</li> -+ <li>Due to that, the <span class="mono">session.lazy_restore</span> setting does not have any effect.</li> - <li>A one-time backup of the session folder has been created at <span class="mono">{{ datadir }}{{ sep }}sessions{{ sep }}before-qt-515</span>.</li> - </ul> - diff --git a/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild b/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild deleted file mode 100644 index 2cfc68ac7db..00000000000 --- a/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -DISTUTILS_USE_SETUPTOOLS="rdepend" - -inherit desktop distutils-r1 eutils xdg-utils - -DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine" -HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"; -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="scripts test" - -BDEPEND=" - app-text/asciidoc" -RDEPEND=" - >=dev-python/attrs-19.3.0[${PYTHON_USEDEP}] - >=dev-python/colorama-0.4.3[${PYTHON_USEDEP}] - >=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}] - >=dev-python/jinja-2.11.2[${PYTHON_USEDEP}] - >=dev-python/markupsafe-1.1.1[${PYTHON_USEDEP}] - >=dev-python/pygments-2.6.1[${PYTHON_USEDEP}] - >=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}] - >=dev-python/PyQt5-5.14.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] - >=dev-python/PyQtWebEngine-5.14.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml] -" - -distutils_enable_tests setup.py - -# Tests restricted as the deplist (misc/requirements/requirements-tests.txt) -# isn't complete and X11 is required in order to start up qutebrowser. -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${P}-session-restore.patch ) - -python_compile_all() { - a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page" -} - -python_install_all() { - doman doc/${PN}.1 - domenu misc/org.${PN}.${PN}.desktop - doicon -s scalable icons/${PN}.svg - - if use scripts; then - # Install only those userscripts that have an explicit license header - exeinto /usr/share/qutebrowser/userscripts/ - doexe misc/userscripts/dmenu_qutebrowser - doexe misc/userscripts/openfeeds - doexe misc/userscripts/qute-keepass - doexe misc/userscripts/qute-pass - doexe misc/userscripts/rss - doexe misc/userscripts/tor_identity - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "PDF display support" www-plugins/pdfjs - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -}
