[gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/
commit: 874f09f1a84b759a1914e3d44c29a20ffbcf00f2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 22 19:27:47 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 22 19:27:47 2022 +
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..
--- 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..
--- a/www-client/falkon/files/falkon-3.1.0-fix-warn-registering-schemes.patch
+++ /de
[gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/
commit: 88f036d302734f8ca783fa807788786ceba04240
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 18 19:09:21 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 18 19:32:47 2020 +
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 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 000..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
+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
+
[gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/
commit: f21805b9ae0d9020cf7d9f05177fba74f7fe2898
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 20 12:12:26 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 20 12:29:33 2019 +
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 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
013d29925f9a1c7e77d5f194eb4a1371dadda05de01a0c103902acfbb16941c6fa9c7256a98ef1965c62ccfcee8b44c48076cb00bd892378157502f73916
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 000..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 000..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
+Date: Wed, 20 Mar 2019 12:01:01 +0100
+Subject: NetworkManager: Fix QtWebEngine warning about registerin
[gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/
commit: 50c1efe4e4631026b9a04a726c36e10c7d99c729
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 9 20:29:31 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 9 20:32:47 2018 +
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 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 000..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 000..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
+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, QAc
