gentoo resync : 05.04.2019

2 files changed, 151 insertions, 0 deletions

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