From owner-svn-ports-all@freebsd.org Sat May 19 12:10:33 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5AC1EABEF4; Sat, 19 May 2018 12:10:33 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 63C9E6D45F; Sat, 19 May 2018 12:10:33 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 444B426CC6; Sat, 19 May 2018 12:10:33 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4JCAXR8069917; Sat, 19 May 2018 12:10:33 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4JCAWVC069915; Sat, 19 May 2018 12:10:32 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201805191210.w4JCAWVC069915@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 19 May 2018 12:10:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470404 - in head/www/falkon: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/www/falkon: . files X-SVN-Commit-Revision: 470404 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 12:10:34 -0000 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 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 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" +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