1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

www/falkon: Fix build when gnome-keyring is installed, and allow to disable it.

Reported by:	Andrew Johnson <daeron@optushome.com.au>
This commit is contained in:
Tobias C. Berner 2018-05-19 12:10:32 +00:00
parent 63c847aa8b
commit 2fbb35a8df
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=470404
3 changed files with 48 additions and 0 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= falkon
DISTVERSION= 3.0.0
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= KDE/stable/falkon/${DISTVERSION:R}/src/
@ -20,4 +21,11 @@ USE_XORG= xcb
USE_LDCONFIG= yes
OPTIONS_DEFINE= GNOMEKEYRING
OPTIONS_SUB= YES
GNOMEKEYRING_CMAKE_BOOL= BUILD_KEYRING
GNOMEKEYRING_USE= GNOME=glib20
GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring
.include <bsd.port.mk>

View File

@ -0,0 +1,39 @@
From 5371d289f89c306a237c13300bd1af5fb2fb7365 Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Sat, 19 May 2018 13:59:24 +0200
Subject: [PATCH] Use IMPORTED_TARGET for GnomeKeyring.
Otherwise we would need to append also GNOME_KEYRING_LIBRARY_DIRS to
link_directories.
---
CMakeLists.txt | 2 +-
src/plugins/GnomeKeyringPasswords/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git CMakeLists.txt CMakeLists.txt
index ca7c9b0e..cb35545d 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -98,7 +98,7 @@ find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
option(BUILD_KEYRING "Gnome keyring password plugin" ON)
if (BUILD_KEYRING)
- pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
+ pkg_check_modules(GNOME_KEYRING IMPORTED_TARGET gnome-keyring-1 )
endif()
endif()
diff --git src/plugins/GnomeKeyringPasswords/CMakeLists.txt src/plugins/GnomeKeyringPasswords/CMakeLists.txt
index 6dd837c2..bc27ee23 100644
--- src/plugins/GnomeKeyringPasswords/CMakeLists.txt
+++ src/plugins/GnomeKeyringPasswords/CMakeLists.txt
@@ -14,5 +14,5 @@ qt5_add_resources(RSCS ${GnomeKeyringPasswords_RSCS})
add_library(GnomeKeyringPasswords MODULE ${GnomeKeyringPasswords_SRCS} ${RSCS})
install(TARGETS GnomeKeyringPasswords DESTINATION ${FALKON_INSTALL_PLUGINDIR})
-target_link_libraries(GnomeKeyringPasswords ${GNOME_KEYRING_LIBRARIES} FalkonPrivate)
+target_link_libraries(GnomeKeyringPasswords PkgConfig::GNOME_KEYRING FalkonPrivate)
--
2.17.0

View File

@ -3,6 +3,7 @@ lib/libFalkonPrivate.so.3
lib/libFalkonPrivate.so.3.0.0
%%QT_PLUGINDIR%%/falkon/AutoScroll.so
%%QT_PLUGINDIR%%/falkon/FlashCookieManager.so
%%GNOMEKEYRING%%%%QT_PLUGINDIR%%/falkon/GnomeKeyringPasswords.so
%%QT_PLUGINDIR%%/falkon/GreaseMonkey.so
%%QT_PLUGINDIR%%/falkon/ImageFinder.so
%%QT_PLUGINDIR%%/falkon/KWalletPasswords.so