From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- www-client/qutebrowser/Manifest | 3 +- .../files/qutebrowser-1.11.1-session-restore.patch | 45 +++++++++++++ .../qutebrowser/qutebrowser-1.11.1-r1.ebuild | 77 ++++++++++++++++++++++ www-client/qutebrowser/qutebrowser-1.11.1.ebuild | 75 --------------------- 4 files changed, 124 insertions(+), 76 deletions(-) create mode 100644 www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch create mode 100644 www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild delete mode 100644 www-client/qutebrowser/qutebrowser-1.11.1.ebuild (limited to 'www-client/qutebrowser') diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index 11e85440ba2e..f011ec877094 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,4 +1,5 @@ +AUX qutebrowser-1.11.1-session-restore.patch 2163 BLAKE2B bd71cebb3f7f19cfe5360cdfc945ac4676b78d15dcc34b6919c2a020a7bb5a4d1548847484469326790b44d05bfaf14b0d505b0e877da63158d2b0b4f9ed8a88 SHA512 bf648f72fd739fc14350b7bfbcdb2b5a24c8ab4dee6b98fc023be2698a2b57005e16bb04c0c64fe5fd2e640a9ca63c26ee6a245ea9ab7345436179c9145d4c31 DIST qutebrowser-1.11.1.tar.gz 6789139 BLAKE2B 0f13c30a629a7ce6339a8506f1a16bbe6123fd28de9ada2f8105a2434d8493549aa79e5d42e7b871dc25e23866b36ecbb712ddfdfc4db139b2a6ee712f8aeb4a SHA512 56f18bc4d9a64e37f73a6ea69953c1a6a06d88c033c2484528b19475616c3229c2aa75f4fbf27668aef7a08358491eb27b3d8e16049021478ba8b4be7433f61f -EBUILD qutebrowser-1.11.1.ebuild 2198 BLAKE2B 8e24b987ad9f82d76b7c28e31249e2b816394a86d65ecb9cc7559f9ac1322054a1625576dd8d47fe036e68516ee145176d402a5e22d8512d3d5172aa8d748028 SHA512 6b9f463433cd6641a5810c3c1db85aa2c9e72077594c3445336ceaeeea25d09e00adfb83fa6fdfbf1aa9e0e92f7b7405fb73bce6215e55ed246bddaa3da75441 +EBUILD qutebrowser-1.11.1-r1.ebuild 2252 BLAKE2B 84bf1336ed704d766a6aec05bd21310ba37595530020ca0f9a38742783ed8109b3d2bfe1225d790a5641f12c5d20378951ff87fb03e444e4e63cf67ed5ce60c9 SHA512 fcfc34a06c7441529b951ff52e37060976551837139a8c3f1986da196563025a8198a1948a07edbd70d7a1326b6185beed93eb745d38b71a3af1ae5526511216 EBUILD qutebrowser-9999.ebuild 2309 BLAKE2B 8ad5278826aca46bf3a087775c28978ef0d645acddf16c524c1555477dd626388ca5ebd1543a7516e0aa864b9ab8d2c56bce908312b7371e93c47f5c09e4d5c6 SHA512 40b5f53be2a741267ccf00903634b499ff3263aa85e5611fa113a312aa87856c08e38d954705c53eb74a7c1794367f5a42ae01cd9e2cc2cafedc50995e447da9 MISC metadata.xml 604 BLAKE2B c597b4466b3954d0c328b376636a8dca286c212c3e857692ee5f039d94cb89c42cbb10e764c5323948cdb7a3d1fd11648bb057f65b7ee7b2e899529d294f7972 SHA512 92eeea88dbe246d8211a84d616772600aaeee95d9e135eb9b5ea38e488f844440ba97373fa302ee52f8486d7d1dae4c5008ce3e1ceaf3062e9d406b1ff0cb565 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 new file mode 100644 index 000000000000..060c94eee6b4 --- /dev/null +++ b/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch @@ -0,0 +1,45 @@ +From 22e15acc1e617174a9fde3e53100a1b71ca7f462 Mon Sep 17 00:00:00 2001 +From: Florian Bruhin +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 @@

{{ title }}

+ + + diff --git a/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild b/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild new file mode 100644 index 000000000000..2cfc68ac7db0 --- /dev/null +++ b/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild @@ -0,0 +1,77 @@ +# 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 +} diff --git a/www-client/qutebrowser/qutebrowser-1.11.1.ebuild b/www-client/qutebrowser/qutebrowser-1.11.1.ebuild deleted file mode 100644 index aa75aa620455..000000000000 --- a/www-client/qutebrowser/qutebrowser-1.11.1.ebuild +++ /dev/null @@ -1,75 +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" - -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 -} -- cgit v1.2.3