gentoo resync : 18.05.2019

9 files changed, 4 insertions, 454 deletions

diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index df60953b2e3a..47626e00b1b4 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,12 +1,5 @@
-AUX falkon-3.0.1-page-actions.patch 2375 BLAKE2B 1775ac6cdce4aac59a9c94f52eb0ce0bbab2fe0f7ae59998096fb0fcf50f5647254fe956031514929462d8ebdb7302bae248b38b04367d70e6618d92ae3866d5 SHA512 8775372f7870ff26a65cd52526764539a438628c5988caf0dcddadc3fe83b6f1245b5c2e3a7ebb2ceb603ae0153d1700d422e21e96dccacfdc7994b08f005752
-AUX falkon-3.0.1-pyside2-release.patch 806 BLAKE2B f17fdddb3605c22eda4d37e98055077f346a26526f4da990d634dab17ef3b074d4ddbbade358be7c2cb31ec061ae8979e05867bd67b73d38ad6322976268a024 SHA512 d9c578fa9c3fd77603e88f3de5f1faea983739e13a335756d4e76a5f627139c58635839adaea9ad4c5b0439d172f59735070020635278e411ca4cafb0c6838df
-AUX falkon-3.0.1-qiodevice-main-thread.patch 3340 BLAKE2B b2778d6c25f0d27d6831563f8ba94dafb6741ed93d07bfdd41c2b549640d455844a7822fd54b3c83586fac1a85b3c5cae74d82893d80f64a1a27b139ae0fee6c SHA512 5851fefa47ca9b890be6c14e9dc936d209fde138ba2f9324a761eee29b4d185a3ef448645dbb1ad2cc009cf7b35ee91b3c6c10a0d7893f4a3106a32b14d07839
-AUX falkon-3.0.1-qtwebengine-version.patch 2404 BLAKE2B 95e31533b7a377fc51fdd711f9ee2564a7a3dbcc4a9e65c8055c6ec5f7d2aa1fcff4d2120c74eac5e529423269eb95a15b528bf42b703efc3565f61d8607c123 SHA512 be5b8810c6453df4068a161e06492b1274c9f296856070506d494a547b32afb521ca920a86b68f4b5a5c1819851cc68b8923a264d4a20bc88c6a7cecd2a10ff6
-AUX falkon-3.0.1-webinspector.patch 3178 BLAKE2B 1c24ff92127cfa529c13b88f6e969a816d000d92d896601b5ff50548bfdce2966d7d9709312e6f9b518ad1d4314fb79bf3f7a01bca4f6110ce24b9f19a364982 SHA512 5ff6dcc9e494226a5a23657378ef170abfc4e315c2cf68a373ca57f91aa5ea38712a0c34e4239acdeff9b7af2b73300cdc150451e50b158318709544e7ced40f
 AUX falkon-3.1.0-fix-warn-registering-schemes.patch 3768 BLAKE2B 29b1f58f966344044ffd190aca463ec624c1cb4793d834d3c9fc56668d307d3b5e0143cfadc6efdc033dee5ea7ada5e66c9bd77fe0b997535263d95eb6984873 SHA512 360240fb6a6eb8179cd08e7b86922cb2a700485f906e7e1c0acf2a6904b4e56b7c5bf940925daab3b104d9bb91c0d6eb71b9a18555002ef2147130d783db04b3
 AUX falkon-3.1.0-use-cmake-find-intl.patch 2599 BLAKE2B 5c83209dd027ceb4973896f68a0b2fad4187dd8cb38eefe75f70a06bd96b905cc24c9af1cd395509ca7791d7eb4eae70a21db95dcd52ee7449414ae4d01d7bd1 SHA512 43ce52e1a280cbcd5d2ac6cac35e3b09c5c6efbd9dc1c6d343dfd85142e75a4534862fe9525a2b06466e191bb76ce1c7a7d60ccc759ad8736726f70ed0e13a68
-DIST falkon-3.0.1.tar.xz 2219444 BLAKE2B 013d29925f9a1c7e77d5f194eb4a1371dadda05de01a0c103902acfbb16941c6fa9c7256a98ef1965c622222ccfcee8b44c48076cb00bd892378157502f73916 SHA512 e2384cb49d4e1ec52ff7804cf798688be2d80fa5957c72accb09376aa0c41ee491c45234fd53c79871bc474a8d0677e40ddb48241a70d77102c67406b0719191
 DIST falkon-3.1.0.tar.xz 2292692 BLAKE2B 1a5d8dd979afb3ef81ea5409314cc0971eaa0b5de54ed7e14668c6596d11cb86d9143acc5285d24d98a671c2486f83e626669d394670d72610b5ad8c68fada69 SHA512 c04f97869150b8ab81ae7b01c7137e35ca5c3103c057e01896454bbeda1075372a7831d2dfe7ab66794de0983593df6e46eff47c5cdc2bc959f81b022506f054
-EBUILD falkon-3.0.1-r1.ebuild 2076 BLAKE2B 036b50adbfd2a441ac16317ac729aac9f6e2337e37f668ec3f0ed7dbf4d6ce4c3771d30481c3a86ace0d8e0546d5707ff199d02538bbe7d24857f99d6231314f SHA512 e385c794e9b8a0c04d412e93dfa008587e83c3d8ca6604c3c0832ba57537689b34070303168ca6f33975a0a0eb910cf59c741702a9bca88cd8982a5d43dd13cb
-EBUILD falkon-3.1.0.ebuild 2050 BLAKE2B 9565dc7ad386b47aacae93eb986ef3ff074783f5d940339d0382d8f95bfa4c7777fedf61ad9f21a1a69db2495a1e8f4d0eefc3695e1a1f0aefbc35fba616dc48 SHA512 62228bd01a0892640f70407a43a5f000a2a64d2ab2ae9873185bc475259aa2fb5ac63d457a43fe09d5cade6931a4ce39e07108f46a053652178c6d8a861d3f53
-MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
+EBUILD falkon-3.1.0-r1.ebuild 2081 BLAKE2B 0ec2033bc09f9cb17d1e57168356dbd3fb75c17287942b997804592b4aca012dae2dc7a7f2c9a35cae24713d4f1e1ff3564894170bbf8b2a605af99113cd4fd0 SHA512 9fdc596a3e08a7215a6d993ddc51c8ae2bac0eafb4bf127c6568282c5141ef961ecfb48f6a8f487330280d729a6cf428503eb8827e89e9feafb847f61df6c01e
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/www-client/falkon/falkon-3.0.1-r1.ebuild b/www-client/falkon/falkon-3.0.1-r1.ebuild
deleted file mode 100644
index 46eecff477bc..000000000000
--- a/www-client/falkon/falkon-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.falkon.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="dbus gnome-keyring kwallet libressl +X"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwebchannel)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	dbus? ( $(add_qt_dep qtdbus) )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kwallet? ( $(add_frameworks_dep kwallet) )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb:=
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-	$(add_qt_dep qtconcurrent)
-	gnome-keyring? ( virtual/pkgconfig )
-"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	DEPEND+=" $(add_frameworks_dep ki18n)"
-fi
-RDEPEND="${COMMON_DEPEND}
-	!www-client/qupzilla
-	$(add_qt_dep qtsvg)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-pyside2-release.patch"
-	"${FILESDIR}/${P}-qiodevice-main-thread.patch"
-	"${FILESDIR}/${P}-page-actions.patch"
-	"${FILESDIR}/${P}-qtwebengine-version.patch"
-	"${FILESDIR}/${P}-webinspector.patch"
-)
-
-# bug 653046
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PySide2=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Shiboken2=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
-		-DDISABLE_DBUS=$(usex !dbus)
-		-DBUILD_KEYRING=$(usex gnome-keyring)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-		-DNO_X11=$(usex !X)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "If you were previously using QupZilla, you can manually migrate your profiles"
-	elog "by moving the config directory from ~/.config/qupzilla to ~/.config/falkon"
-}
diff --git a/www-client/falkon/falkon-3.1.0.ebuild b/www-client/falkon/falkon-3.1.0-r1.ebuild
index 5b109200aa5e..2be2a9a92493 100644
--- a/www-client/falkon/falkon-3.1.0.ebuild
+++ b/www-client/falkon/falkon-3.1.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Cross-platform web browser using QtWebEngine"
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 		$(add_frameworks_dep kcrash)
 		$(add_frameworks_dep kio)
 		$(add_frameworks_dep kwallet)
+		$(add_frameworks_dep purpose)
 	)
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/www-client/falkon/files/falkon-3.0.1-page-actions.patch b/www-client/falkon/files/falkon-3.0.1-page-actions.patch
deleted file mode 100644
index be48f000817d..000000000000
--- a/www-client/falkon/files/falkon-3.0.1-page-actions.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 53e0a43762523185fb98bf705f85cf0dfa27247f Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Sun, 8 Jul 2018 20:34:58 +0200
-Subject: NavigationBar: Correctly reconnect to page actions
-
-BUG: 395828
-FIXED-IN: 3.0.2
----
- src/lib/navigation/navigationbar.cpp | 27 ++++++++++++++++-----------
- 1 file changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/src/lib/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp
-index 0339b55..622622d 100644
---- a/src/lib/navigation/navigationbar.cpp
-+++ b/src/lib/navigation/navigationbar.cpp
-@@ -230,19 +230,24 @@ void NavigationBar::setCurrentView(TabbedWebView *view)
-         return;
-     }
- 
--    auto updateButton = [](ToolButton *button, QAction *action) {
--        button->setEnabled(action->isEnabled());
-+    auto connectPageActions = [this](QWebEnginePage *page) {
-+        auto updateButton = [](ToolButton *button, QAction *action) {
-+            button->setEnabled(action->isEnabled());
-+        };
-+        auto updateBackButton = std::bind(updateButton, m_buttonBack, page->action(QWebEnginePage::Back));
-+        auto updateForwardButton = std::bind(updateButton, m_buttonForward, page->action(QWebEnginePage::Forward));
-+
-+        updateBackButton();
-+        updateForwardButton();
-+
-+        disconnect(m_backConnection);
-+        disconnect(m_forwardConnection);
-+        m_backConnection = connect(page->action(QWebEnginePage::Back), &QAction::changed, this, updateBackButton);
-+        m_forwardConnection = connect(page->action(QWebEnginePage::Forward), &QAction::changed, this, updateForwardButton);
-     };
--    auto updateBackButton = std::bind(updateButton, m_buttonBack, view->pageAction(QWebEnginePage::Back));
--    auto updateForwardButton = std::bind(updateButton, m_buttonForward, view->pageAction(QWebEnginePage::Forward));
- 
--    updateBackButton();
--    updateForwardButton();
--
--    disconnect(m_backConnection);
--    disconnect(m_forwardConnection);
--    m_backConnection = connect(view->pageAction(QWebEnginePage::Back), &QAction::changed, this, updateBackButton);
--    m_forwardConnection = connect(view->pageAction(QWebEnginePage::Forward), &QAction::changed, this, updateForwardButton);
-+    connectPageActions(view->page());
-+    connect(view, &TabbedWebView::pageChanged, this, connectPageActions);
- }
- 
- void NavigationBar::showReloadButton()
--- 
-cgit v1.1
diff --git a/www-client/falkon/files/falkon-3.0.1-pyside2-release.patch b/www-client/falkon/files/falkon-3.0.1-pyside2-release.patch
deleted file mode 100644
index 13ebb423af96..000000000000
--- a/www-client/falkon/files/falkon-3.0.1-pyside2-release.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4c83ba3d6c609a704a31c419b5d89dd1947aa11a Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Mon, 18 Jun 2018 13:39:46 +0200
-Subject: PyFalkon: Fix build with PySide2 release
-
----
- src/plugins/PyFalkon/pyfalkon_global.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/plugins/PyFalkon/pyfalkon_global.h b/src/plugins/PyFalkon/pyfalkon_global.h
-index d41da24..0305b67 100644
---- a/src/plugins/PyFalkon/pyfalkon_global.h
-+++ b/src/plugins/PyFalkon/pyfalkon_global.h
-@@ -19,6 +19,10 @@
- // Make "signals:", "slots:" visible as access specifiers
- #define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a)))
- 
-+// PYSIDE-711
-+#include <QHstsPolicy>
-+#include <QWebEngineContextMenuData>
-+
- // 3rdparty
- #include "lineedit.h"
- #include "squeezelabelv1.h"
--- 
-cgit v1.1
diff --git a/www-client/falkon/files/falkon-3.0.1-qiodevice-main-thread.patch b/www-client/falkon/files/falkon-3.0.1-qiodevice-main-thread.patch
deleted file mode 100644
index 2606dc508857..000000000000
--- a/www-client/falkon/files/falkon-3.0.1-qiodevice-main-thread.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From a7d2f8757919b4db63867ecbb4fb64c11d64f453 Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Sun, 22 Jul 2018 15:17:04 +0200
-Subject: FalkonSchemeHandler: Make sure to load data on main thread
-
-QIODevice::read is called on WebEngine IO thread.
----
- .../network/schemehandlers/falkonschemehandler.cpp | 41 +++++++++++-----------
- .../network/schemehandlers/falkonschemehandler.h   |  2 ++
- 2 files changed, 23 insertions(+), 20 deletions(-)
-
-diff --git a/src/lib/network/schemehandlers/falkonschemehandler.cpp b/src/lib/network/schemehandlers/falkonschemehandler.cpp
-index 5706c04..4e01897 100644
---- a/src/lib/network/schemehandlers/falkonschemehandler.cpp
-+++ b/src/lib/network/schemehandlers/falkonschemehandler.cpp
-@@ -89,8 +89,7 @@ FalkonSchemeReply::FalkonSchemeReply(QWebEngineUrlRequestJob *job, QObject *pare
- {
-     m_pageName = m_job->requestUrl().path();
- 
--    open(QIODevice::ReadOnly);
--    m_buffer.open(QIODevice::ReadWrite);
-+    QTimer::singleShot(0, this, &FalkonSchemeReply::loadPage);
- }
- 
- void FalkonSchemeReply::loadPage()
-@@ -98,38 +97,40 @@ void FalkonSchemeReply::loadPage()
-     if (m_loaded)
-         return;
- 
--    QTextStream stream(&m_buffer);
--    stream.setCodec("UTF-8");
-+    QString contents;
- 
-     if (m_pageName == QLatin1String("about")) {
--        stream << aboutPage();
--    }
--    else if (m_pageName == QLatin1String("start")) {
--        stream << startPage();
--    }
--    else if (m_pageName == QLatin1String("speeddial")) {
--        stream << speeddialPage();
--    }
--    else if (m_pageName == QLatin1String("config")) {
--        stream << configPage();
--    }
--    else if (m_pageName == QLatin1String("restore")) {
--        stream << restorePage();
-+        contents = aboutPage();
-+    } else if (m_pageName == QLatin1String("start")) {
-+        contents = startPage();
-+    } else if (m_pageName == QLatin1String("speeddial")) {
-+        contents = speeddialPage();
-+    } else if (m_pageName == QLatin1String("config")) {
-+        contents = configPage();
-+    } else if (m_pageName == QLatin1String("restore")) {
-+        contents = restorePage();
-     }
- 
--    stream.flush();
--    m_buffer.reset();
-+    QMutexLocker lock(&m_mutex);
-+    m_buffer.setData(contents.toUtf8());
-+    m_buffer.open(QIODevice::ReadOnly);
-+    lock.unlock();
-+
-+    open(QIODevice::ReadOnly);
-+    emit readyRead();
-+
-     m_loaded = true;
- }
- 
- qint64 FalkonSchemeReply::bytesAvailable() const
- {
-+    QMutexLocker lock(&m_mutex);
-     return m_buffer.bytesAvailable();
- }
- 
- qint64 FalkonSchemeReply::readData(char *data, qint64 maxSize)
- {
--    loadPage();
-+    QMutexLocker lock(&m_mutex);
-     return m_buffer.read(data, maxSize);
- }
- 
-diff --git a/src/lib/network/schemehandlers/falkonschemehandler.h b/src/lib/network/schemehandlers/falkonschemehandler.h
-index 2c071a7..b92969d 100644
---- a/src/lib/network/schemehandlers/falkonschemehandler.h
-+++ b/src/lib/network/schemehandlers/falkonschemehandler.h
-@@ -18,6 +18,7 @@
- #ifndef FALKONSCHEMEHANDLER_H
- #define FALKONSCHEMEHANDLER_H
- 
-+#include <QMutex>
- #include <QBuffer>
- #include <QIODevice>
- #include <QWebEngineUrlSchemeHandler>
-@@ -60,6 +61,7 @@ private:
-     QBuffer m_buffer;
-     QString m_pageName;
-     QWebEngineUrlRequestJob *m_job;
-+    mutable QMutex m_mutex;
- };
- 
- #endif // FALKONSCHEMEHANDLER_H
--- 
-cgit v1.1
diff --git a/www-client/falkon/files/falkon-3.0.1-qtwebengine-version.patch b/www-client/falkon/files/falkon-3.0.1-qtwebengine-version.patch
deleted file mode 100644
index 7634c30f6164..000000000000
--- a/www-client/falkon/files/falkon-3.0.1-qtwebengine-version.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Combined diffs:
-
-From d06a0d60e0ff3e9e3d5dbaec17b3447fca665b92 Mon Sep 17 00:00:00 2001
-From: Kevin Kofler <kevin.kofler@chello.at>
-Date: Sat, 12 May 2018 03:15:56 +0200
-Subject: Fix the fix for #391300 to require only QtWebEngine 5.10, not Qt 5.10
-
-QtWebEngine can be newer than the rest of Qt (e.g., on Fedora 27).
-
-From 9f0f688ee8ed7d454713db5418c9a86f80fd5850 Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Mon, 14 May 2018 13:53:05 +0200
-Subject: Use QTWEBENGINE_VERSION instead of QT_VERSION
-
-Fixes build against separate QtWebEngine releases.
-
-* asturm@gentoo.org: Make #ifdef obsolete by requiring Qt 5.11.0.
-
---- b/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,7 +45,7 @@
- 
- # Mandatory: Qt5
--set(QT_MIN_VERSION "5.9.0")
-+set(QT_MIN_VERSION "5.11.0")
--find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network Sql QuickWidgets PrintSupport WebEngineWidgets WebChannel)
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network Sql QuickWidgets PrintSupport WebEngine WebEngineWidgets WebChannel)
- if (BUILD_TESTING)
-     find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test)
- endif()
---- a/src/lib/CMakeLists.txt
-+++ b/src/lib/CMakeLists.txt
-@@ -297,6 +297,9 @@ qt5_add_resources(SRCS
- 
- add_library(FalkonPrivate SHARED ${SRCS})
- 
-+get_property(QT_WEBENGINE_INCLUDE_DIRS TARGET Qt5::WebEngine PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-+target_include_directories(FalkonPrivate SYSTEM PUBLIC ${QT_WEBENGINE_INCLUDE_DIRS})
-+
- target_link_libraries(FalkonPrivate
-     Qt5::Widgets
-     Qt5::WebEngineWidgets
---- a/src/lib/app/qzcommon.h
-+++ b/src/lib/app/qzcommon.h
-@@ -20,6 +20,7 @@
- 
- #include <QDebug>
- #include <QFlags>
-+#include <QtWebEngineVersion>
- 
- #ifdef FALKON_SHAREDLIBRARY
- #define FALKON_EXPORT Q_DECL_EXPORT
---- a/src/lib/webengine/webview.cpp	2018-12-09 17:12:29.659899904 +0100
-+++ b/src/lib/webengine/webview.cpp	2018-12-09 17:21:26.083044301 +0100
-@@ -495,7 +495,6 @@
- 
- void WebView::savePageAs()
- {
--#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-     page()->runJavaScript(QSL("document.contentType"), WebPage::SafeJsWorld, [this](const QVariant &res) {
-         const QSet<QString> webPageTypes = {
-             QSL("text/html"),
-@@ -507,9 +506,6 @@
-             page()->download(url());
-         }
-     });
--#else
--    triggerPageAction(QWebEnginePage::SavePage);
--#endif
- }
- 
- void WebView::copyImageToClipboard()
diff --git a/www-client/falkon/files/falkon-3.0.1-webinspector.patch b/www-client/falkon/files/falkon-3.0.1-webinspector.patch
deleted file mode 100644
index 9cfea7e42dc9..000000000000
--- a/www-client/falkon/files/falkon-3.0.1-webinspector.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 48ca42d645b155069a57eaede3e560874ed07bc7 Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Thu, 1 Mar 2018 15:14:15 +0100
-Subject: WebInspector: Don't require remote debugging with QtWebEngine 5.11
-
----
- src/lib/webengine/webinspector.cpp | 11 ++++++++++-
- src/lib/webengine/webinspector.h   | 11 ++++-------
- 2 files changed, 14 insertions(+), 8 deletions(-)
-
-* asturm@gentoo.org: Make #ifdef obsolete by requiring Qt 5.11.0.
-
- diff -u b/src/lib/webengine/webinspector.cpp b/src/lib/webengine/webinspector.cpp
---- b/src/lib/webengine/webinspector.cpp
-+++ b/src/lib/webengine/webinspector.cpp
-@@ -19,6 +19,8 @@
- #include "mainapplication.h"
- #include "networkmanager.h"
- #include "settings.h"
-+#include "webview.h"
-+#include "webpage.h"
- 
- #include <QJsonArray>
- #include <QJsonObject>
-@@ -60,27 +62,13 @@
-     }
- }
- 
--void WebInspector::setView(QWebEngineView *view)
-+void WebInspector::setView(WebView *view)
- {
-     m_view = view;
-     Q_ASSERT(isEnabled());
- 
--    int port = qEnvironmentVariableIntValue("QTWEBENGINE_REMOTE_DEBUGGING");
--    QUrl inspectorUrl = QUrl(QSL("http://localhost:%1").arg(port));
--    int index = s_views.indexOf(m_view);
--
--    QNetworkReply *reply = mApp->networkManager()->get(QNetworkRequest(inspectorUrl.resolved(QUrl("json/list"))));
--    connect(reply, &QNetworkReply::finished, this, [=]() {
--        QJsonArray clients = QJsonDocument::fromJson(reply->readAll()).array();
--        QUrl pageUrl;
--        if (clients.size() > index) {
--            QJsonObject object = clients.at(index).toObject();
--            pageUrl = inspectorUrl.resolved(QUrl(object.value(QSL("devtoolsFrontendUrl")).toString()));
--        }
--        load(pageUrl);
--        pushView(this);
--        show();
--    });
-+    page()->setInspectedPage(m_view->page());
-+    connect(m_view, &WebView::pageChanged, this, &WebInspector::deleteLater);
- }
- 
- void WebInspector::inspectElement()
-@@ -90,9 +78,6 @@
- 
- bool WebInspector::isEnabled()
- {
--    if (!qEnvironmentVariableIsSet("QTWEBENGINE_REMOTE_DEBUGGING")) {
--        return false;
--    }
-     if (!mApp->webSettings()->testAttribute(QWebEngineSettings::JavascriptEnabled)) {
-         return false;
-     }
---- a/src/lib/webengine/webinspector.h
-+++ b/src/lib/webengine/webinspector.h
-@@ -15,14 +15,13 @@
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * ============================================================ */
--#ifndef WEBINSPECTORDOCKWIDGET_H
--#define WEBINSPECTORDOCKWIDGET_H
-+#pragma once
- 
- #include <QWebEngineView>
- 
- #include "qzcommon.h"
- 
--class ToolButton;
-+class WebView;
- 
- class FALKON_EXPORT WebInspector : public QWebEngineView
- {
-@@ -32,7 +31,7 @@ public:
-     explicit WebInspector(QWidget *parent = Q_NULLPTR);
-     ~WebInspector();
- 
--    void setView(QWebEngineView *view);
-+    void setView(WebView *view);
-     void inspectElement();
- 
-     static bool isEnabled();
-@@ -53,7 +52,5 @@ private:
-     int m_height;
-     QSize m_windowSize;
-     bool m_inspectElement = false;
--    QWebEngineView *m_view;
-+    WebView *m_view;
- };
--
--#endif // WEBINSPECTORDOCKWIDGET_H
diff --git a/www-client/falkon/metadata.xml b/www-client/falkon/metadata.xml
index 080de1ce90f6..2fdbf33d963d 100644
--- a/www-client/falkon/metadata.xml
+++ b/www-client/falkon/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
-	</use>
 </pkgmetadata>