| 1 |
commit: 1ea73a813f311897ff6ed9fe4bdceaf36bb24213 |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 27 16:13:16 2020 +0000 |
| 4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 27 16:17:25 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea73a81 |
| 7 |
|
| 8 |
www-client/qutebrowser: add patch to fix session breakage with Qt 5.15 |
| 9 |
|
| 10 |
See also: https://github.com/qutebrowser/qutebrowser/issues/5359 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 13 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/qutebrowser-1.11.1-session-restore.patch | 45 ++++++++++++++++++++++ |
| 16 |
...-1.11.1.ebuild => qutebrowser-1.11.1-r1.ebuild} | 2 + |
| 17 |
2 files changed, 47 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..060c94eee6b |
| 22 |
--- /dev/null |
| 23 |
+++ b/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch |
| 24 |
@@ -0,0 +1,45 @@ |
| 25 |
+From 22e15acc1e617174a9fde3e53100a1b71ca7f462 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Florian Bruhin <me@××××××××××××.org> |
| 27 |
+Date: Tue, 26 May 2020 16:48:00 +0200 |
| 28 |
+Subject: [PATCH] Update Qt 5.15 session workaround for lazy_restore |
| 29 |
+ |
| 30 |
+See #5359 |
| 31 |
+ |
| 32 |
+(cherry picked from commit 093a454bf4e386eda8715bc3ea2b217760d5f070) |
| 33 |
+Upstream-Status: Accepted |
| 34 |
+[https://github.com/qutebrowser/qutebrowser/commit/093a454bf4e386eda8715bc3ea2b217760d5f070 |
| 35 |
+expected in v1.12.0] |
| 36 |
+--- |
| 37 |
+ qutebrowser/browser/webengine/webenginetab.py | 6 +++++- |
| 38 |
+ qutebrowser/html/warning-sessions.html | 1 + |
| 39 |
+ 2 files changed, 6 insertions(+), 1 deletion(-) |
| 40 |
+ |
| 41 |
+diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py |
| 42 |
+index 647fa60abc..f61404f4ea 100644 |
| 43 |
+--- a/qutebrowser/browser/webengine/webenginetab.py |
| 44 |
++++ b/qutebrowser/browser/webengine/webenginetab.py |
| 45 |
+@@ -648,7 +648,11 @@ def load_items(self, items): |
| 46 |
+ if qtutils.version_check('5.15', compiled=False): |
| 47 |
+ # WORKAROUND for https://github.com/qutebrowser/qutebrowser/issues/5359 |
| 48 |
+ if items: |
| 49 |
+- self._tab.load_url(items[-1].url) |
| 50 |
++ url = items[-1].url |
| 51 |
++ if ((url.scheme(), url.host()) == ('qute', 'back') and |
| 52 |
++ len(items) >= 2): |
| 53 |
++ url = items[-2].url |
| 54 |
++ self._tab.load_url(url) |
| 55 |
+ return |
| 56 |
+ |
| 57 |
+ if items: |
| 58 |
+diff --git a/qutebrowser/html/warning-sessions.html b/qutebrowser/html/warning-sessions.html |
| 59 |
+index f93971c6ab..dd0c4127b6 100644 |
| 60 |
+--- a/qutebrowser/html/warning-sessions.html |
| 61 |
++++ b/qutebrowser/html/warning-sessions.html |
| 62 |
+@@ -15,6 +15,7 @@ <h1>{{ title }}</h1> |
| 63 |
+ |
| 64 |
+ <ul> |
| 65 |
+ <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> |
| 66 |
++ <li>Due to that, the <span class="mono">session.lazy_restore</span> setting does not have any effect.</li> |
| 67 |
+ <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> |
| 68 |
+ </ul> |
| 69 |
+ |
| 70 |
|
| 71 |
diff --git a/www-client/qutebrowser/qutebrowser-1.11.1.ebuild b/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild |
| 72 |
similarity index 97% |
| 73 |
rename from www-client/qutebrowser/qutebrowser-1.11.1.ebuild |
| 74 |
rename to www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild |
| 75 |
index aa75aa62045..2cfc68ac7db 100644 |
| 76 |
--- a/www-client/qutebrowser/qutebrowser-1.11.1.ebuild |
| 77 |
+++ b/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild |
| 78 |
@@ -38,6 +38,8 @@ distutils_enable_tests setup.py |
| 79 |
# isn't complete and X11 is required in order to start up qutebrowser. |
| 80 |
RESTRICT="test" |
| 81 |
|
| 82 |
+PATCHES=( "${FILESDIR}"/${P}-session-restore.patch ) |
| 83 |
+ |
| 84 |
python_compile_all() { |
| 85 |
a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page" |
| 86 |
} |
Archives