From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6866D158090 for ; Sun, 22 May 2022 19:29:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95335E08DD; Sun, 22 May 2022 19:29:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77342E08DD for ; Sun, 22 May 2022 19:29:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A22A341E71 for ; Sun, 22 May 2022 19:29:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EC7E34E for ; Sun, 22 May 2022 19:29:46 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1653247667.874f09f1a84b759a1914e3d44c29a20ffbcf00f2.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/falkon/Manifest www-client/falkon/falkon-3.1.0-r1.ebuild www-client/falkon/files/falkon-3.1.0-fix-warn-registering-schemes.patch www-client/falkon/files/falkon-3.1.0-qt-5.14.patch www-client/falkon/files/falkon-3.1.0-qt-5.15.patch www-client/falkon/files/falkon-3.1.0-use-cmake-find-intl.patch X-VCS-Directories: www-client/falkon/ www-client/falkon/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 874f09f1a84b759a1914e3d44c29a20ffbcf00f2 X-VCS-Branch: master Date: Sun, 22 May 2022 19:29:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7c910d2c-36fc-4094-99ae-d1e29ead1343 X-Archives-Hash: f42a8bcda9030d6ffe9813a7ba223975 commit: 874f09f1a84b759a1914e3d44c29a20ffbcf00f2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 22 19:27:47 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 22 19:27:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874f09f1 www-client/falkon: Drop 3.1.0-r1 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> www-client/falkon/Manifest | 1 - www-client/falkon/falkon-3.1.0-r1.ebuild | 83 ---------------------- ...falkon-3.1.0-fix-warn-registering-schemes.patch | 83 ---------------------- www-client/falkon/files/falkon-3.1.0-qt-5.14.patch | 23 ------ www-client/falkon/files/falkon-3.1.0-qt-5.15.patch | 26 ------- .../files/falkon-3.1.0-use-cmake-find-intl.patch | 68 ------------------ 6 files changed, 284 deletions(-) diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest index 6a87fc326c08..faa2948607a5 100644 --- a/www-client/falkon/Manifest +++ b/www-client/falkon/Manifest @@ -1,3 +1,2 @@ DIST falkon-22.04.1.tar.xz 2492036 BLAKE2B c4af3894f5e93c75487e576c26e78b37615bff564729c57d4cd0c898473d2e6351b067acb49c916a0657b0ec2bdd62f7166e36609f90a48948abc664a9f02fc8 SHA512 3a1f587a70d9204ddb00dd5261e2fc9b52465206f1f489a5492606fdf5cd7c9eaaf4c22385dc43ed4038be5459b141ca7eeffd6f79a2e73033a913a12ad71cf4 -DIST falkon-3.1.0.tar.xz 2292692 BLAKE2B 1a5d8dd979afb3ef81ea5409314cc0971eaa0b5de54ed7e14668c6596d11cb86d9143acc5285d24d98a671c2486f83e626669d394670d72610b5ad8c68fada69 SHA512 c04f97869150b8ab81ae7b01c7137e35ca5c3103c057e01896454bbeda1075372a7831d2dfe7ab66794de0983593df6e46eff47c5cdc2bc959f81b022506f054 DIST falkon-3.2.0.tar.xz 2506692 BLAKE2B a94118e2bd8e97e00a5462d657ee07c06aed53f5bee21227f543f902588f68588c0f4e445bb5cae789d14dec25382802025f502138150db96fe636b20d257222 SHA512 1bc33a957dd265b3cdd944f85890500c7247d82752cc7d6847c61de2f810e75d10adddf81dc6bcb1e05e1cd3bda04767c66f1e16d7ed19634e3b80ad24ff6bc1 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/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 -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 -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 -+#include - - 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 -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 - #include - #include -+#include - #include - #include - #include --- -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 -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 -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