gentoo resync : 24.03.2019

4 files changed, 243 insertions, 0 deletions

diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index 6c02e2b4b513..5ba341d195a4 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -3,6 +3,10 @@ AUX falkon-3.0.1-pyside2-release.patch 806 BLAKE2B f17fdddb3605c22eda4d37e980550
 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 2200 BLAKE2B d71b6f29a44ee5e556b4e32d230c362f748218e00fd9ed4c513945bb578ab199dfb7193ddb11ba12cf958d3b032aa8816f3c60a3f4d53e6c6dc267792f365566 SHA512 3fe6779a3dae59118b6920f9c1653a7e19d7d40032d57242a13eb2aba73b1fc16a6f152177b361b4f1cb3c9fab8657d5511f1e2b5322a814b69421f09785332d
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/www-client/falkon/falkon-3.1.0.ebuild b/www-client/falkon/falkon-3.1.0.ebuild
new file mode 100644
index 000000000000..b246a3809b85
--- /dev/null
+++ b/www-client/falkon/falkon-3.1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Cross-platform web browser using QtWebEngine"
+HOMEPAGE="https://www.falkon.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="dbus gnome-keyring kde libressl +X"
+
+# drop qtwebengine subslot operator when QT_MINIMAL >= 5.12.0
+BDEPEND="gnome-keyring? ( virtual/pkgconfig )"
+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' '' '5=')
+	$(add_qt_dep qtwidgets)
+	virtual/libintl
+	dbus? ( $(add_qt_dep qtdbus) )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	kde? (
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kcrash)
+		$(add_frameworks_dep kio)
+		$(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)
+"
+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}-use-cmake-find-intl.patch"
+	"${FILESDIR}/${P}-fix-warn-registering-schemes.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 kde KF5Wallet)
+		$(cmake-utils_use_find_package kde KF5KIO)
+		-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/files/falkon-3.1.0-fix-warn-registering-schemes.patch b/www-client/falkon/files/falkon-3.1.0-fix-warn-registering-schemes.patch
new file mode 100644
index 000000000000..4bd760bfe308
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.1.0-fix-warn-registering-schemes.patch
@@ -0,0 +1,83 @@
+From 067155d53af52b0b6e26801fa3a7ec59a93aeb7f Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep@gmail.com>
+Date: Wed, 20 Mar 2019 12:01:01 +0100
+Subject: NetworkManager: Fix QtWebEngine warning about registering schemes
+
+---
+ src/lib/app/mainapplication.cpp    |  2 ++
+ src/lib/network/networkmanager.cpp | 26 +++++++++++++++-----------
+ src/lib/network/networkmanager.h   |  2 ++
+ 3 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
+index 1e89d16..d6c622f 100644
+--- a/src/lib/app/mainapplication.cpp
++++ b/src/lib/app/mainapplication.cpp
+@@ -281,6 +281,8 @@ MainApplication::MainApplication(int &argc, char** argv)
+ 
+     Settings::createSettings(DataPaths::currentProfilePath() + QLatin1String("/settings.ini"));
+ 
++    NetworkManager::registerSchemes();
++
+     m_webProfile = isPrivate() ? new QWebEngineProfile(this) : QWebEngineProfile::defaultProfile();
+     connect(m_webProfile, &QWebEngineProfile::downloadRequested, this, &MainApplication::downloadRequested);
+ 
+diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp
+index 773e116..0c11aff 100644
+--- a/src/lib/network/networkmanager.cpp
++++ b/src/lib/network/networkmanager.cpp
+@@ -52,17 +52,6 @@ NetworkManager::NetworkManager(QObject *parent)
+     // Create scheme handlers
+     m_extensionScheme = new ExtensionSchemeManager();
+ 
+-#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 12, 0)
+-    QWebEngineUrlScheme falkonScheme("falkon");
+-    falkonScheme.setFlags(QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::ContentSecurityPolicyIgnored);
+-    falkonScheme.setSyntax(QWebEngineUrlScheme::Syntax::Path);
+-    QWebEngineUrlScheme::registerScheme(falkonScheme);
+-    QWebEngineUrlScheme extensionScheme("extension");
+-    extensionScheme.setFlags(QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::ContentSecurityPolicyIgnored);
+-    extensionScheme.setSyntax(QWebEngineUrlScheme::Syntax::Path);
+-    QWebEngineUrlScheme::registerScheme(extensionScheme);
+-#endif
+-
+     mApp->webProfile()->installUrlSchemeHandler(QByteArrayLiteral("falkon"), new FalkonSchemeHandler());
+     mApp->webProfile()->installUrlSchemeHandler(QByteArrayLiteral("extension"), m_extensionScheme);
+     WebPage::addSupportedScheme(QSL("falkon"));
+@@ -309,6 +298,21 @@ void NetworkManager::shutdown()
+     mApp->webProfile()->setRequestInterceptor(nullptr);
+ }
+ 
++// static
++void NetworkManager::registerSchemes()
++{
++#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 12, 0)
++    QWebEngineUrlScheme falkonScheme("falkon");
++    falkonScheme.setFlags(QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::ContentSecurityPolicyIgnored);
++    falkonScheme.setSyntax(QWebEngineUrlScheme::Syntax::Path);
++    QWebEngineUrlScheme::registerScheme(falkonScheme);
++    QWebEngineUrlScheme extensionScheme("extension");
++    extensionScheme.setFlags(QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::ContentSecurityPolicyIgnored);
++    extensionScheme.setSyntax(QWebEngineUrlScheme::Syntax::Path);
++    QWebEngineUrlScheme::registerScheme(extensionScheme);
++#endif
++}
++
+ QNetworkReply *NetworkManager::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
+ {
+     QNetworkRequest req = request;
+diff --git a/src/lib/network/networkmanager.h b/src/lib/network/networkmanager.h
+index af7475b..638b263 100644
+--- a/src/lib/network/networkmanager.h
++++ b/src/lib/network/networkmanager.h
+@@ -48,6 +48,8 @@ public:
+     void loadSettings();
+     void shutdown();
+ 
++    static void registerSchemes();
++
+ protected:
+     QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) override;
+ 
+-- 
+cgit v1.1
diff --git a/www-client/falkon/files/falkon-3.1.0-use-cmake-find-intl.patch b/www-client/falkon/files/falkon-3.1.0-use-cmake-find-intl.patch
new file mode 100644
index 000000000000..29791378eb20
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.1.0-use-cmake-find-intl.patch
@@ -0,0 +1,68 @@
+From 71b54b5bbfd58e2b3ca84398e7b2fe1c93474092 Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep@gmail.com>
+Date: Wed, 20 Mar 2019 11:40:11 +0100
+Subject: Use correct package name for Intl
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fe9de5a..94fe67e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,7 +129,7 @@ if (PySide2_FOUND AND Shiboken2_FOUND AND PythonLibs_FOUND)
+     set(ENABLE_PYTHON_PLUGINS TRUE)
+ endif()
+ 
+-find_package(LibIntl)
++find_package(Intl)
+ 
+ # Git revision
+ if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+
+From 797e4c12a26196b3811848fc8b40f1bb19c5c2ce Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep@gmail.com>
+Date: Wed, 20 Mar 2019 11:53:31 +0100
+Subject: QML Plugins: Fix exporting i18n functions
+
+---
+ CMakeLists.txt                          | 3 +++
+ src/lib/plugins/qml/qmlpluginloader.cpp | 8 ++++----
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 94fe67e..5977df0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -130,6 +130,9 @@ if (PySide2_FOUND AND Shiboken2_FOUND AND PythonLibs_FOUND)
+ endif()
+ 
+ find_package(Intl)
++if (Intl_FOUND)
++    set(HAVE_LIBINTL TRUE)
++endif()
+ 
+ # Git revision
+ if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+diff --git a/src/lib/plugins/qml/qmlpluginloader.cpp b/src/lib/plugins/qml/qmlpluginloader.cpp
+index 8159b4b..2f393ff 100644
+--- a/src/lib/plugins/qml/qmlpluginloader.cpp
++++ b/src/lib/plugins/qml/qmlpluginloader.cpp
+@@ -69,10 +69,10 @@ void QmlPluginLoader::initEngineAndComponent()
+ #if HAVE_LIBINTL
+     auto i18n = new QmlI18n(m_name);
+     m_engine->globalObject().setProperty(QSL("__falkon_i18n"), m_engine->newQObject(i18n));
+-    m_engine->globalObject().setProperty(QSL("i18n"), m_engine->evaluate(QSL("function (s) { return __falkon_i18n.i18n(s) }")));
+-    m_engine->globalObject().setProperty(QSL("i18np"), m_engine->evaluate(QSL("function (s1, s2) { return __falkon_i18n.i18np(s1, s2) }")));
++    m_engine->evaluate(QSL("i18n = function (s) { return __falkon_i18n.i18n(s) };"));
++    m_engine->evaluate(QSL("i18np = function (s1, s2) { return __falkon_i18n.i18np(s1, s2) }"));
+ #else
+-    m_engine->globalObject().setProperty(QSL("i18n"), m_engine->evaluate(QSL("function (s) { return s }")));
+-    m_engine->globalObject().setProperty(QSL("i18np"), m_engine->evaluate(QSL("function (s1, s2) { return s1 }")));
++    m_engine->evaluate(QSL("i18n = function (s) { return s; };"));
++    m_engine->evaluate(QSL("i18np = function (s1, s2) { return s1; }"));
+ #endif
+ }
+-- 
+cgit v1.1