summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Bernd Steinhauser <berniyh@exherbo.org> 2017-09-28 17:27:31 +0200
committerAvatar Bernd Steinhauser <berniyh@exherbo.org> 2017-10-01 09:24:29 +0200
commit6c9664c14935f257e5a4c5058b792879851abc52 (patch)
treebd66eb61885c508fcc60f95ac0ec40a7c7287d0e
parent5380d5bd8ec950e443f3fa9a8600ad22b7a46134 (diff)
downloadkde-6c9664c14935f257e5a4c5058b792879851abc52.tar.gz
kde-6c9664c14935f257e5a4c5058b792879851abc52.tar.xz
falkon: moved to cmake.
-rw-r--r--packages/net-www/falkon/falkon.exlib24
-rw-r--r--packages/net-www/falkon/files/0001-falkon-add-option-to-deactivate-gnome-keyring.patch28
2 files changed, 41 insertions, 11 deletions
diff --git a/packages/net-www/falkon/falkon.exlib b/packages/net-www/falkon/falkon.exlib
index 1081e2a..6ab7bb9 100644
--- a/packages/net-www/falkon/falkon.exlib
+++ b/packages/net-www/falkon/falkon.exlib
@@ -1,10 +1,10 @@
# Copyright 2012-2014 Bernd Steinhauser <berniyh@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require kde.org qmake [ slot=5 ]
+require kde.org kde
require freedesktop-desktop gtk-icon-cache
-export_exlib_phases src_configure src_install pkg_postinst pkg_postrm
+export_exlib_phases src_install pkg_postinst pkg_postrm
SUMMARY="Cross-platfrom Qt Web Browser (previously known as QupZilla)"
HOMEPAGE="https://commits.kde.org/falkon"
@@ -26,8 +26,8 @@ QT_MIN_VER=5.8.0
# point in doing so.
DEPENDENCIES="
build:
- virtual/pkg-config
x11-libs/qttools:5[>=${QT_MIN_VER}] [[ note = [ lrelease ] ]]
+ gnome? ( virtual/pkg-config )
build+run:
app-spell/hunspell:=
x11-libs/libX11
@@ -50,15 +50,17 @@ DEPENDENCIES="
kde-frameworks/breeze-icons:5 [[ note = [ Used in preferences ] ]]
"
-falkon_src_configure() {
- option kde && edo export KDE_INTEGRATION="true" || edo export KDE_INTEGRATION="false"
- option gnome && edo export GNOME_INTEGRATION="true" || edo export GNOME_INTEGRATION="false"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/0001-falkon-add-option-to-deactivate-gnome-keyring.patch
+)
- edo export FALKON_PREFIX=/usr/$(exhost --target)
- edo export SHARE_FOLDER=/usr/share
+CMAKE_SRC_CONFIGURE_OPTION_DISABLE_FINDS+=(
+ 'kde KF5Wallet'
+)
- eqmake 5
-}
+CMAKE_SRC_CONFIGURE_OPTION_BUILDS+=(
+ 'gnome KEYRING'
+)
falkon_src_install() {
default
@@ -71,7 +73,7 @@ falkon_src_install() {
if option zsh-completion; then
dodir /usr/share/zsh/site-functions/
insinto /usr/share/zsh/site-functions/
- doins linux/completion/_falkon
+ doins "${CMAKE_SOURCE}"/linux/completion/_falkon
fi
}
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
new file mode 100644
index 0000000..69ef4c0
--- /dev/null
+++ b/packages/net-www/falkon/files/0001-falkon-add-option-to-deactivate-gnome-keyring.patch
@@ -0,0 +1,28 @@
+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
+