3 files changed, 83 insertions, 101 deletions
diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index b0ec04d4cbad..21709c727562 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,4 +1,5 @@
-AUX falkon-24.08.3-fix-printing.patch 3375 BLAKE2B 220d83cbba1d18be9c2eeeae813806d4c9f025de62000af9b9257bbbc0ffd235a0fa29d1a4aa9ff830b463c1ea9653c620f2c448658eb2ae2147bc2fc0e229e2 SHA512 bcfcace0f5887dc1b2ffc67721aaaa7561d8ebde56ecd263a0b94797821d0c4aec8bb74a4fe02af49214cd05edc2661b115923819cd89ca3d078213f2059c9ae
 DIST falkon-24.12.3.tar.xz 2654604 BLAKE2B 6e7f3f84a2a8218f837ae68c9f598354b1a0a527b01131231a300c0d8be62b5ac2dcac604d9b02441a169224cd1e0968d4d2934458bdbd576330ca73793936d3 SHA512 565dd3c0f9338745547cbe334e9af10157e34ddb0426a55ee95e43c56bfe08b81ea01bbd09da42a4fec4f8da48c15644b9753377ae20880575904dda4f7fa240
+DIST falkon-25.04.1.tar.xz 2706012 BLAKE2B 883f33effa75c899e716bc7d474670ee6bc04d4dd43d9bdcb58c7293600e42542c2bd1abb35941cfb72c23f55b5f7f8f14a6f69b9021552a64d5c449d0ff0003 SHA512 a5675450ed41f157ded142c756997f0a5c8f7d8131551cc038c646f187f07b91568a5b7da66d2db957a9b5839b6432dcb76999b2866b2123fbc2ef0f2c082639
 EBUILD falkon-24.12.3.ebuild 2070 BLAKE2B a41a01756ad013499327078f8b26f44cdbd843486ccd4bd2e075d9de39c87e2f7f1041b69f47b20c91c30d69ebd2423dfda6b1e846f8d40b46f611ef8f6c9718 SHA512 764801788b7cdbd43a47a51873b947afff27bb1bd30571e378910ce8a11958cb88052523dfc24201522b2385315998adff54cc46f00929e5c89a59c68d0a218d
+EBUILD falkon-25.04.1.ebuild 2062 BLAKE2B d23498073deef048fa22175e792c36df2afc35e6a50f48c387e37ddefe4fa756b841030895f70b15ab8114bb50db2f5a5bb9f9bded91080b298fd140a1d6c7aa SHA512 4ad40f3351f5dd9d04335cdca9b8a05b563e15b844a2ecd2e2ba8fde92a25540f969f7c4057eb97fd9b23aa9a6ce2e10c6792b82bcbb65bbae37e559ff51130d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/www-client/falkon/falkon-25.04.1.ebuild b/www-client/falkon/falkon-25.04.1.ebuild
new file mode 100644
index 000000000000..f8e7434b074d
--- /dev/null
+++ b/www-client/falkon/falkon-25.04.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.13.0
+QTMIN=6.7.2
+PYTHON_COMPAT=( python3_{10..13} )
+inherit ecm gear.kde.org python-single-r1 xdg
+
+DESCRIPTION="Cross-platform web browser using QtWebEngine"
+HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="dbus kde python +X"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test" # bug 653046
+
+COMMON_DEPEND="
+	dev-libs/openssl:0=
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,network,sql,sqlite,ssl,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtwebchannel-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6=[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	virtual/libintl
+	kde? (
+		>=kde-frameworks/kcoreaddons-${KFMIN}:6
+		>=kde-frameworks/kcrash-${KFMIN}:6
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=kde-frameworks/kjobwidgets-${KFMIN}:6
+		>=kde-frameworks/kwallet-${KFMIN}:6
+		>=kde-frameworks/purpose-${KFMIN}:6
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "
+			>=dev-python/pyside-${QTMIN}:6[gui,positioning,uitools(-),webengine,widgets,\${PYTHON_USEDEP}]
+		")
+	)
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:6"
+fi
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KEYRING=OFF
+		-DDISABLE_DBUS=$(usex !dbus)
+		$(cmake_use_find_package kde KF6Wallet)
+		$(cmake_use_find_package kde KF6KIO)
+		-DBUILD_PYTHON_SUPPORT=$(usex python)
+		-DNO_X11=$(usex !X)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # shiboken_helpers.cmake quirk
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	ecm_src_configure
+}
diff --git a/www-client/falkon/files/falkon-24.08.3-fix-printing.patch b/www-client/falkon/files/falkon-24.08.3-fix-printing.patch
deleted file mode 100644
index 8e5aecd366d8..000000000000
--- a/www-client/falkon/files/falkon-24.08.3-fix-printing.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From cbf47b0625c9b67b3608e24600273693bd59462a Mon Sep 17 00:00:00 2001
-From: Juraj Oravec <jurajoravec@mailo.com>
-Date: Wed, 4 Dec 2024 21:34:31 +0100
-Subject: [PATCH] Fix printing to printer other than PDF printer
-
-BUG: 497051
-FIXED-IN: 24.12
-
-Chery picked from: eaa807023517e1d62dae41f9b1cdd93806d77d64
-
-Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
----
- src/lib/webengine/webview.cpp | 22 ++++++++++++++--------
- src/lib/webengine/webview.h   |  4 ++++
- 2 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp
-index d2b5d7ee0..4871e8b3f 100644
---- a/src/lib/webengine/webview.cpp
-+++ b/src/lib/webengine/webview.cpp
-@@ -67,6 +67,7 @@ WebView::WebView(QWidget* parent)
-     connect(this, &QWebEngineView::iconChanged, this, &WebView::slotIconChanged);
-     connect(this, &QWebEngineView::urlChanged, this, &WebView::slotUrlChanged);
-     connect(this, &QWebEngineView::titleChanged, this, &WebView::slotTitleChanged);
-+    connect(this, &QWebEngineView::printFinished, this, &WebView::slotPrintFinished);
- 
-     m_currentZoomLevel = zoomLevels().indexOf(100);
- 
-@@ -386,11 +387,11 @@ void WebView::printPage()
- {
-     Q_ASSERT(m_page);
- 
--    auto *printer = new QPrinter();
--    printer->setCreator(tr("Falkon %1 (%2)").arg(QString::fromLatin1(Qz::VERSION), QString::fromLatin1(Qz::WWWADDRESS)));
--    printer->setDocName(QzTools::filterCharsFromFilename(title()));
-+    m_printer = new QPrinter();
-+    m_printer->setCreator(tr("Falkon %1 (%2)").arg(QString::fromLatin1(Qz::VERSION), QString::fromLatin1(Qz::WWWADDRESS)));
-+    m_printer->setDocName(QzTools::filterCharsFromFilename(title()));
- 
--    auto *dialog = new QPrintDialog(printer, this);
-+    auto *dialog = new QPrintDialog(m_printer, this);
-     dialog->setOptions(QAbstractPrintDialog::PrintToFile | QAbstractPrintDialog::PrintShowPageSize);
- #ifndef Q_OS_WIN
-     dialog->setOption(QAbstractPrintDialog::PrintPageRange);
-@@ -402,14 +403,19 @@ void WebView::printPage()
-             m_page->printToPdf(dialog->printer()->outputFileName(), dialog->printer()->pageLayout());
-             delete dialog;
-         } else {
--            connect(this, &QWebEngineView::printFinished, this, [&dialog](bool success) {
--                Q_UNUSED(success);
--                delete dialog;
--            });
-+            print(m_printer);
-+            delete dialog;
-         }
-     }
- }
- 
-+void WebView::slotPrintFinished(bool success)
-+{
-+    Q_UNUSED(success);
-+    delete m_printer;
-+    m_printer = nullptr;
-+}
-+
- void WebView::slotLoadStarted()
- {
-     m_progress = 0;
-diff --git a/src/lib/webengine/webview.h b/src/lib/webengine/webview.h
-index 37138cd6d..61e7281f8 100644
---- a/src/lib/webengine/webview.h
-+++ b/src/lib/webengine/webview.h
-@@ -25,6 +25,7 @@
- #include "loadrequest.h"
- #include "wheelhelper.h"
- 
-+class QPrinter;
- class WebPage;
- class LoadRequest;
- class WebHitTestResult;
-@@ -118,6 +119,7 @@ protected Q_SLOTS:
-     void slotIconChanged();
-     void slotUrlChanged(const QUrl &url);
-     void slotTitleChanged(const QString &title);
-+    void slotPrintFinished(bool success);
- 
-     // Context menu slots
-     void openUrlInNewWindow();
-@@ -193,6 +195,8 @@ private:
-     WheelHelper m_wheelHelper;
- 
-     static bool s_forceContextMenuOnMouseRelease;
-+
-+    QPrinter* m_printer;
- };
- 
- #endif // WEBVIEW_H
--- 
-GitLab
-