summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-10-01 12:36:08 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-10-02 09:30:13 +0200
commit49df1ea52129baa604f0f349e1547a9991b46da3 (patch)
treee318d2d1eec3612450fc14efd8046471b03341d3
parent507adfe5d5148469b332eed2218823ed8a62d727 (diff)
downloadkde-49df1ea52129baa604f0f349e1547a9991b46da3.tar.gz
kde-49df1ea52129baa604f0f349e1547a9991b46da3.tar.xz
falkon: Adjust to upstream changes
-rw-r--r--packages/net-www/falkon/falkon-scm.exheres-02
-rw-r--r--packages/net-www/falkon/falkon.exlib9
-rw-r--r--packages/net-www/falkon/files/0001-falkon-add-option-to-deactivate-gnome-keyring.patch28
3 files changed, 4 insertions, 35 deletions
diff --git a/packages/net-www/falkon/falkon-scm.exheres-0 b/packages/net-www/falkon/falkon-scm.exheres-0
index 659fdcd..96bf784 100644
--- a/packages/net-www/falkon/falkon-scm.exheres-0
+++ b/packages/net-www/falkon/falkon-scm.exheres-0
@@ -1,6 +1,8 @@
# Copyright 2012 Bernd Steinhauser <berniyh@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
+# last checked commit: 75bd63ff2d565a6678473fc8547881d20038f3c8
+
require falkon
PLATFORMS="~amd64"
diff --git a/packages/net-www/falkon/falkon.exlib b/packages/net-www/falkon/falkon.exlib
index 6ab7bb9..4562031 100644
--- a/packages/net-www/falkon/falkon.exlib
+++ b/packages/net-www/falkon/falkon.exlib
@@ -1,7 +1,7 @@
# Copyright 2012-2014 Bernd Steinhauser <berniyh@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require kde.org kde
+require kde.org kde [ cmake_minimum_version=3.1 ]
require freedesktop-desktop gtk-icon-cache
export_exlib_phases src_install pkg_postinst pkg_postrm
@@ -34,12 +34,11 @@ DEPENDENCIES="
x11-libs/libxcb
x11-libs/qtbase:5[>=${QT_MIN_VER}][sql]
x11-libs/qtdeclarative:5[>=${QT_MIN_VER}] [[ note = [ quickwidgets ] ]]
- x11-libs/qtscript:5[>=${QT_MIN_VER}] [[ note = [ script ] ]]
x11-libs/qtwebchannel:5[>=${QT_MIN_VER}]
x11-libs/qtwebengine:5[>=${QT_MIN_VER}] [[ note = [ webenginewidgets ] ]]
x11-libs/qtx11extras:5[>=${QT_MIN_VER}]
gnome? ( gnome-desktop/gnome-keyring )
- kde? ( kde-frameworks/kwallet:5 )
+ kde? ( kde-frameworks/kwallet:5[>=5.27.0] )
providers:libressl? ( dev-libs/libressl:= )
providers:openssl? ( dev-libs/openssl )
!net-www/qupzilla [[
@@ -50,10 +49,6 @@ DEPENDENCIES="
kde-frameworks/breeze-icons:5 [[ note = [ Used in preferences ] ]]
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/0001-falkon-add-option-to-deactivate-gnome-keyring.patch
-)
-
CMAKE_SRC_CONFIGURE_OPTION_DISABLE_FINDS+=(
'kde KF5Wallet'
)
diff --git a/packages/net-www/falkon/files/0001-falkon-add-option-to-deactivate-gnome-keyring.patch b/packages/net-www/falkon/files/0001-falkon-add-option-to-deactivate-gnome-keyring.patch
deleted file mode 100644
index 69ef4c0..0000000
--- a/packages/net-www/falkon/files/0001-falkon-add-option-to-deactivate-gnome-keyring.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d473e2082887b894dfcb3ba74d20cb49fa7dcb8c Mon Sep 17 00:00:00 2001
-From: Bernd Steinhauser <berniyh@exherbo.org>
-Date: Thu, 28 Sep 2017 19:20:19 +0200
-Subject: [PATCH] falkon: add option to deactivate gnome-keyring.
-
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2dedb992..e7b56e10 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,7 +87,10 @@ endif()
- # Optional: GnomeKeyring
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
-- pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
-+ option(BUILD_KEYRING "Gnome keyring password plugin" ON)
-+ if (BUILD_KEYRING)
-+ pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
-+ endif()
- endif()
-
- # Optional: KWallet
---
-2.14.2
-