gentoo resync : 29.12.2022

8 files changed, 10 insertions, 313 deletions

diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index fde1802a5606..03767c096053 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,11 +1,5 @@
-AUX falkon-3.1.0-fix-warn-registering-schemes.patch 3768 BLAKE2B 29b1f58f966344044ffd190aca463ec624c1cb4793d834d3c9fc56668d307d3b5e0143cfadc6efdc033dee5ea7ada5e66c9bd77fe0b997535263d95eb6984873 SHA512 360240fb6a6eb8179cd08e7b86922cb2a700485f906e7e1c0acf2a6904b4e56b7c5bf940925daab3b104d9bb91c0d6eb71b9a18555002ef2147130d783db04b3
-AUX falkon-3.1.0-qt-5.14.patch 691 BLAKE2B d8244527cfb5d5f732074e26a1363b5fa42b2a4ebccf35a2ed1c920d156d11b20db7ceef99ff8059bf27094788d001e5c542312f8eeb87ba57b921acf032aa81 SHA512 6294228a6880b6551c9ebe0b64b71f710a92ebd38cdfd140ff941ab9ec1fef04be279aedb50986d9b8b0128459d600fbc91d90616d81e0fafaec335d138fad69
-AUX falkon-3.1.0-qt-5.15.patch 722 BLAKE2B 27e4f7d667d36293a2349a73dc0b71bd420f097a2a4900bc29a0d5071debc1f12ae615a5e589a353f1ee2a53327ce8847efc6eff7a68f169b0d8219422e3f3ab SHA512 eb4b3836318d218d006c1d06d555d3dfcc4fcbb44ada0390cab80c3365ffe7a3be6002a9a6ca82bc236791c596e121f55f889348097e9d94af0a1e43e9623814
-AUX falkon-3.1.0-use-cmake-find-intl.patch 2599 BLAKE2B 5c83209dd027ceb4973896f68a0b2fad4187dd8cb38eefe75f70a06bd96b905cc24c9af1cd395509ca7791d7eb4eae70a21db95dcd52ee7449414ae4d01d7bd1 SHA512 43ce52e1a280cbcd5d2ac6cac35e3b09c5c6efbd9dc1c6d343dfd85142e75a4534862fe9525a2b06466e191bb76ce1c7a7d60ccc759ad8736726f70ed0e13a68
-DIST falkon-22.04.0.tar.xz 2492228 BLAKE2B b8e5c59a6e90c5b34a0e9b234ca586d8d95c16b661adb6f991458c480fbb8839bb53b2228aad5fc16adb6f414ff0e092c0c9a32c76cdb5df68f7a0f25e961de2 SHA512 bc8f0ac1ceb809c61073537787cf6e3a347a0ddd0217da2ecde2bad43e9169de15a587e971b0ddaae33e6efa38378f2034f70445ff98243da83e33ec721c42a1
-DIST falkon-3.1.0.tar.xz 2292692 BLAKE2B 1a5d8dd979afb3ef81ea5409314cc0971eaa0b5de54ed7e14668c6596d11cb86d9143acc5285d24d98a671c2486f83e626669d394670d72610b5ad8c68fada69 SHA512 c04f97869150b8ab81ae7b01c7137e35ca5c3103c057e01896454bbeda1075372a7831d2dfe7ab66794de0983593df6e46eff47c5cdc2bc959f81b022506f054
+DIST falkon-22.04.2.tar.xz 2493084 BLAKE2B 556fa5419b83401ae71541343f4ec1ecf57b3983f8f389aa21d84a18882d7c13c2dfdebfce1a201cf754f71bd523fbd10acb5e80edef8c539acfb533599cbf63 SHA512 b98231f71802f1d123705270c7597fcdb0e1ee2e5374472c9a89b78bfde24f1efd802c36721379211ac2c40822ef812574a540209e4802fd4d3735b6128f93da
 DIST falkon-3.2.0.tar.xz 2506692 BLAKE2B a94118e2bd8e97e00a5462d657ee07c06aed53f5bee21227f543f902588f68588c0f4e445bb5cae789d14dec25382802025f502138150db96fe636b20d257222 SHA512 1bc33a957dd265b3cdd944f85890500c7247d82752cc7d6847c61de2f810e75d10adddf81dc6bcb1e05e1cd3bda04767c66f1e16d7ed19634e3b80ad24ff6bc1
-EBUILD falkon-22.04.0.ebuild 2095 BLAKE2B a35a12dc1dc4445910baac1c951022543efd1928a3c87558579302b4948575badfe1669800b5eb4f7e6f0d72f941eba82521826f3136afba078c40a8c1e15118 SHA512 0d2829c2d438da9995fc567811a8daa3e51263139a5e9b28dc68812873dd71a7aa7fa82dbf06e1b12ce666f2a5008e34abfb35252d1c565420d1a4f56a424cac
-EBUILD falkon-3.1.0-r1.ebuild 1971 BLAKE2B e172274e35382e5bae4a0006aa9ed127797688ba52d834556d0a3830589104733bfaaef49493cc38c7371fb5a785fe56d038e8b3a8a7c57655116d0608e6535e SHA512 a0a2dc36ec2c33103f86177d2ec601ab8047ec7c82021a70adad44a59d5b8ff21838a10a42fba78b9514cb297763996ba7d1c2405ec5f820adc3ea5a62787a03
-EBUILD falkon-3.2.0-r1.ebuild 2180 BLAKE2B fa974daa909336af0655c072b6ef4877f56692fdec2ece1a57559039a504ae2c02a191c65bbc0cc0ca5d46e19e2b270928f23261ee66e69a8d544a20b32d6412 SHA512 ed98a539a190692349b5b6472b5a84488cc3ea3fad790e1ce6ebb2a524b8dfc7ac381d27e2f11efb62ba955200684afb107c54ac76f8d700bb072d0c5bbfc5a1
+EBUILD falkon-22.04.2.ebuild 2095 BLAKE2B 55faeb0e86a82ecbd6ca6264aed27653e40862d523f2713f2bac3e1398202f6f020e85d60bd3b17c9f6fc98bdd223ebb638295e9999cdb8af650ab303c25b65b SHA512 1a6ffacd161bcf74c759f5de3e65b6adf8f5b57a8e3d10f5c222d47d275989efa7a7e96e82586bcbb8d29c24232b8916d0dbc972831aea9404f365f91b4f9699
+EBUILD falkon-3.2.0-r1.ebuild 1841 BLAKE2B dd37bad81f33ea432a15591f37d7ff7b8482085c507a738a71c99a8cea2fab0366b93573350dc47d028ef92e17f51a933cab3def7d942040ea64279b5a2b8c7a SHA512 37d5b1385c7105614c4331b649183723fd1f97822865c75e1a59eea3a06ab151264433f638135d31683254c9ddae73e325eeec09379a4896d860ed31cfdcd3be
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/www-client/falkon/falkon-22.04.0.ebuild b/www-client/falkon/falkon-22.04.2.ebuild
index 6ab782b709e2..ddbc1ccda58a 100644
--- a/www-client/falkon/falkon-22.04.0.ebuild
+++ b/www-client/falkon/falkon-22.04.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_TEST="true"
 KDE_GEAR="true"
 KFMIN=5.92.0
-QTMIN=5.15.2
+QTMIN=5.15.3
 PYTHON_COMPAT=( python3_{8..10} )
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org python-single-r1
diff --git a/www-client/falkon/falkon-3.1.0-r1.ebuild b/www-client/falkon/falkon-3.1.0-r1.ebuild
deleted file mode 100644
index cd45fbe8e777..000000000000
--- a/www-client/falkon/falkon-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.falkon.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="dbus kde +X"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwebchannel-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5=[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	virtual/libintl
-	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	kde? (
-		>=kde-frameworks/kcoreaddons-${KFMIN}:5
-		>=kde-frameworks/kcrash-${KFMIN}:5
-		>=kde-frameworks/kio-${KFMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-		>=kde-frameworks/purpose-${KFMIN}:5
-	)
-	dev-libs/openssl:0=
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb:=
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:5"
-fi
-RDEPEND="${COMMON_DEPEND}
-	!www-client/qupzilla
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-use-cmake-find-intl.patch"
-	"${FILESDIR}/${P}-fix-warn-registering-schemes.patch"
-	"${FILESDIR}/${P}-qt-5.14.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-# bug 653046
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KEYRING=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_PySide2=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Shiboken2=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
-		-DDISABLE_DBUS=$(usex !dbus)
-		$(cmake_use_find_package kde KF5Wallet)
-		$(cmake_use_find_package kde KF5KIO)
-		-DNO_X11=$(usex !X)
-	)
-	ecm_src_configure
-}
diff --git a/www-client/falkon/falkon-3.2.0-r1.ebuild b/www-client/falkon/falkon-3.2.0-r1.ebuild
index 617c1b0a9d8d..f9dc201c1622 100644
--- a/www-client/falkon/falkon-3.2.0-r1.ebuild
+++ b/www-client/falkon/falkon-3.2.0-r1.ebuild
@@ -6,23 +6,21 @@ EAPI=8
 ECM_TEST="true"
 KFMIN=5.88.0
 QTMIN=5.15.2
-PYTHON_COMPAT=( python3_{8..10} )
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
+inherit ecm kde.org
 
 DESCRIPTION="Cross-platform web browser using QtWebEngine"
 HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="dbus kde python +X"
+IUSE="dbus kde +X"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test" # bug 653046
 
 COMMON_DEPEND="
@@ -45,13 +43,6 @@ COMMON_DEPEND="
 		>=kde-frameworks/kwallet-${KFMIN}:5
 		>=kde-frameworks/purpose-${KFMIN}:5
 	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pyside2[designer,gui,webengine,widgets,${PYTHON_USEDEP}]
-			dev-python/shiboken2[${PYTHON_USEDEP}]
-		')
-	)
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
 		x11-libs/libxcb:=
@@ -71,18 +62,13 @@ BDEPEND="
 	>=dev-qt/linguist-tools-${QTMIN}:5
 "
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_KEYRING=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_PySide2=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Shiboken2=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
 		-DDISABLE_DBUS=$(usex !dbus)
-		$(cmake_use_find_package python PySide2)
-		$(cmake_use_find_package python Shiboken2)
-		$(cmake_use_find_package python Python3)
 		$(cmake_use_find_package kde KF5Wallet)
 		$(cmake_use_find_package kde KF5KIO)
 		-DNO_X11=$(usex !X)
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
deleted file mode 100644
index 4bd760bfe308..000000000000
--- a/www-client/falkon/files/falkon-3.1.0-fix-warn-registering-schemes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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-qt-5.14.patch b/www-client/falkon/files/falkon-3.1.0-qt-5.14.patch
deleted file mode 100644
index 54481d23ad61..000000000000
--- a/www-client/falkon/files/falkon-3.1.0-qt-5.14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bbde5c6955c43bc744ed2c4024598495de908f2a Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Mon, 2 Dec 2019 13:30:36 +0100
-Subject: Add missing include in last qt5.14
-
----
- src/plugins/VerticalTabs/verticaltabsplugin.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
-index c1cfac4..d179bb1 100644
---- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp
-+++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
-@@ -30,6 +30,7 @@
- #include "../config.h"
- 
- #include <QSettings>
-+#include <QFile>
- 
- VerticalTabsPlugin::VerticalTabsPlugin()
-     : QObject()
--- 
-cgit v1.1
diff --git a/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch b/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch
deleted file mode 100644
index 2ca9783f2ac2..000000000000
--- a/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Sun, 29 Mar 2020 12:53:00 +0200
-Subject: Fix build with Qt 5.15
-
-QPainterPath is no longer included via qtransform.h (since
-5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
----
- src/lib/tools/qztools.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp
-index 499b225..04f19b7 100644
---- a/src/lib/tools/qztools.cpp
-+++ b/src/lib/tools/qztools.cpp
-@@ -25,6 +25,7 @@
- #include <QByteArray>
- #include <QPixmap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QBuffer>
- #include <QFile>
- #include <QDir>
--- 
-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
deleted file mode 100644
index 29791378eb20..000000000000
--- a/www-client/falkon/files/falkon-3.1.0-use-cmake-find-intl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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