svn commit: r470404 - in head/www/falkon: . files

[Tobias C. Berner]

Author: tcberner
Date: Sat May 19 12:10:32 2018
New Revision: 470404
URL: https://svnweb.freebsd.org/changeset/ports/470404

Log:
  www/falkon: Fix build when gnome-keyring is installed, and allow to disable it.
  
  Reported by:	Andrew Johnson <daeron at optushome.com.au>

Added:
  head/www/falkon/files/
  head/www/falkon/files/patch-git_5371d28   (contents, props changed)
Modified:
  head/www/falkon/Makefile
  head/www/falkon/pkg-plist

Modified: head/www/falkon/Makefile
==============================================================================
--- head/www/falkon/Makefile	Sat May 19 11:44:00 2018	(r470403)
+++ head/www/falkon/Makefile	Sat May 19 12:10:32 2018	(r470404)
@@ -2,6 +2,7 @@
 
 PORTNAME=	falkon
 DISTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	KDE/stable/falkon/${DISTVERSION:R}/src/
 
@@ -19,5 +20,12 @@ USE_QT5=	core dbus gui location network printsupport q
 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>

Added: head/www/falkon/files/patch-git_5371d28
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/falkon/files/patch-git_5371d28	Sat May 19 12:10:32 2018	(r470404)
@@ -0,0 +1,39 @@
+From 5371d289f89c306a237c13300bd1af5fb2fb7365 Mon Sep 17 00:00:00 2001
+From: "Tobias C. Berner" <tcberner at 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
+

Modified: head/www/falkon/pkg-plist
==============================================================================
--- head/www/falkon/pkg-plist	Sat May 19 11:44:00 2018	(r470403)
+++ head/www/falkon/pkg-plist	Sat May 19 12:10:32 2018	(r470404)
@@ -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