* [gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/
@ 2018-12-09 20:32 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-12-09 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 50c1efe4e4631026b9a04a726c36e10c7d99c729
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 9 20:29:31 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 9 20:32:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c1efe4
www-client/falkon: Enable webinspector, fix mouse navigation
Disable finding PySide2 as long as it is not a thing in Gentoo.
mouse navigation:
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=395828
webinspector:
Reported-by: nekoexmachina in #gentoo-kde
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
www-client/falkon/falkon-3.0.1-r1.ebuild | 79 +++++++++++++++
.../falkon/files/falkon-3.0.1-page-actions.patch | 53 +++++++++++
.../files/falkon-3.0.1-pyside2-release.patch | 26 +++++
.../files/falkon-3.0.1-qiodevice-main-thread.patch | 106 +++++++++++++++++++++
.../files/falkon-3.0.1-qtwebengine-version.patch | 72 ++++++++++++++
.../falkon/files/falkon-3.0.1-webinspector.patch | 102 ++++++++++++++++++++
6 files changed, 438 insertions(+)
diff --git a/www-client/falkon/falkon-3.0.1-r1.ebuild b/www-client/falkon/falkon-3.0.1-r1.ebuild
new file mode 100644
index 00000000000..71fb406ee4a
--- /dev/null
+++ b/www-client/falkon/falkon-3.0.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 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 ~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"
+)
+
+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/files/falkon-3.0.1-page-actions.patch b/www-client/falkon/files/falkon-3.0.1-page-actions.patch
new file mode 100644
index 00000000000..be48f000817
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.0.1-page-actions.patch
@@ -0,0 +1,53 @@
+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
new file mode 100644
index 00000000000..13ebb423af9
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.0.1-pyside2-release.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 00000000000..2606dc50885
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.0.1-qiodevice-main-thread.patch
@@ -0,0 +1,106 @@
+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
new file mode 100644
index 00000000000..7634c30f616
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.0.1-qtwebengine-version.patch
@@ -0,0 +1,72 @@
+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
new file mode 100644
index 00000000000..9cfea7e42dc
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.0.1-webinspector.patch
@@ -0,0 +1,102 @@
+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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/
@ 2019-03-20 12:29 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-03-20 12:29 UTC (permalink / raw
To: gentoo-commits
commit: f21805b9ae0d9020cf7d9f05177fba74f7fe2898
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 12:12:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 12:29:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f21805b9
www-client/falkon: 3.1.0 version bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
www-client/falkon/Manifest | 1 +
www-client/falkon/falkon-3.1.0.ebuild | 88 ++++++++++++++++++++++
...falkon-3.1.0-fix-warn-registering-schemes.patch | 83 ++++++++++++++++++++
.../files/falkon-3.1.0-use-cmake-find-intl.patch | 68 +++++++++++++++++
4 files changed, 240 insertions(+)
diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index 2089017eebf..b2a60b4272a 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1 +1,2 @@
DIST falkon-3.0.1.tar.xz 2219444 BLAKE2B 013d29925f9a1c7e77d5f194eb4a1371dadda05de01a0c103902acfbb16941c6fa9c7256a98ef1965c622222ccfcee8b44c48076cb00bd892378157502f73916 SHA512 e2384cb49d4e1ec52ff7804cf798688be2d80fa5957c72accb09376aa0c41ee491c45234fd53c79871bc474a8d0677e40ddb48241a70d77102c67406b0719191
+DIST falkon-3.1.0.tar.xz 2292692 BLAKE2B 1a5d8dd979afb3ef81ea5409314cc0971eaa0b5de54ed7e14668c6596d11cb86d9143acc5285d24d98a671c2486f83e626669d394670d72610b5ad8c68fada69 SHA512 c04f97869150b8ab81ae7b01c7137e35ca5c3103c057e01896454bbeda1075372a7831d2dfe7ab66794de0983593df6e46eff47c5cdc2bc959f81b022506f054
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 00000000000..b246a3809b8
--- /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 00000000000..4bd760bfe30
--- /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 00000000000..29791378eb2
--- /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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/
@ 2020-04-18 19:33 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-04-18 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 88f036d302734f8ca783fa807788786ceba04240
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 19:09:21 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 19:32:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f036d3
www-client/falkon: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
www-client/falkon/falkon-3.1.0-r1.ebuild | 1 +
www-client/falkon/files/falkon-3.1.0-qt-5.15.patch | 26 ++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/www-client/falkon/falkon-3.1.0-r1.ebuild b/www-client/falkon/falkon-3.1.0-r1.ebuild
index 687be8779fb..3534c91a317 100644
--- a/www-client/falkon/falkon-3.1.0-r1.ebuild
+++ b/www-client/falkon/falkon-3.1.0-r1.ebuild
@@ -63,6 +63,7 @@ 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
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
new file mode 100644
index 00000000000..2ca9783f2ac
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch
@@ -0,0 +1,26 @@
+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
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/
@ 2022-05-22 19:29 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-05-22 19:29 UTC (permalink / raw
To: gentoo-commits
commit: 874f09f1a84b759a1914e3d44c29a20ffbcf00f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 19:27:47 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 <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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-22 19:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-18 19:33 [gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-05-22 19:29 Andreas Sturmlechner
2019-03-20 12:29 Andreas Sturmlechner
2018-12-09 20:32 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox