| 1 |
commit: 86ee2059ef3322c2f01aaeac896b1d8a2ccb51ac |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 17 18:32:03 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 17 21:19:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ee2059 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: backport :6 favicon display fix |
| 9 |
|
| 10 |
Not worth a revbump rebuild, but is still annoying and |
| 11 |
wanted to toss it here at least for future builds. |
| 12 |
|
| 13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/qtwebengine-6.3.1-favicon.patch | 28 ++++++++++++++++++++++ |
| 16 |
dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild | 1 + |
| 17 |
2 files changed, 29 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.3.1-favicon.patch b/dev-qt/qtwebengine/files/qtwebengine-6.3.1-favicon.patch |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..8c9544b16935 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.3.1-favicon.patch |
| 24 |
@@ -0,0 +1,28 @@ |
| 25 |
+Backport dev branch fix for favicons sometime not showing in |
| 26 |
+some consumers like qutebrowser. Not currently included in |
| 27 |
+upcoming 6.3.2 so may be needed beyond 6.3.1. |
| 28 |
+ |
| 29 |
+https://bugreports.qt.io/browse/QTBUG-103735 |
| 30 |
+https://github.com/qt/qtwebengine/commit/c5de1b2123 |
| 31 |
+--- a/src/core/favicon_driver_qt.cpp |
| 32 |
++++ b/src/core/favicon_driver_qt.cpp |
| 33 |
+@@ -300,15 +300,15 @@ void FaviconDriverQt::DidStartNavigation(content::NavigationHandle *navigation_h |
| 34 |
+ return; |
| 35 |
+ |
| 36 |
+ m_faviconUrls.reset(); |
| 37 |
+- m_completedHandlersCount = 0; |
| 38 |
+- m_latestFavicon = FaviconStatusQt(); |
| 39 |
+ |
| 40 |
+ if (!navigation_handle->IsSameDocument()) { |
| 41 |
++ m_completedHandlersCount = 0; |
| 42 |
++ m_latestFavicon = FaviconStatusQt(); |
| 43 |
+ m_documentOnLoadCompleted = false; |
| 44 |
+ m_manifestUrl = GURL(); |
| 45 |
+- } |
| 46 |
+ |
| 47 |
+- m_viewClient->iconChanged(QUrl()); |
| 48 |
++ m_viewClient->iconChanged(QUrl()); |
| 49 |
++ } |
| 50 |
+ |
| 51 |
+ content::ReloadType reload_type = navigation_handle->GetReloadType(); |
| 52 |
+ if (reload_type == content::ReloadType::NONE || IsOffTheRecord()) |
| 53 |
|
| 54 |
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild |
| 55 |
index 468f7bbc29d7..91f14a1f75cf 100644 |
| 56 |
--- a/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild |
| 57 |
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild |
| 58 |
@@ -88,6 +88,7 @@ DEPEND="${RDEPEND} |
| 59 |
|
| 60 |
PATCHES=( |
| 61 |
"${FILESDIR}"/${P}-widevine.patch |
| 62 |
+ "${FILESDIR}"/${P}-favicon.patch |
| 63 |
) |
| 64 |
|
| 65 |
python_check_deps() { |
Archives