diff options
| -rw-r--r-- | www/falkon/Makefile | 8 | ||||
| -rw-r--r-- | www/falkon/files/patch-git_5371d28 | 39 | ||||
| -rw-r--r-- | www/falkon/pkg-plist | 1 |
3 files changed, 48 insertions, 0 deletions
diff --git a/www/falkon/Makefile b/www/falkon/Makefile index 7f474c5422fb..8ce3ccc1be28 100644 --- a/www/falkon/Makefile +++ b/www/falkon/Makefile @@ -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> diff --git a/www/falkon/files/patch-git_5371d28 b/www/falkon/files/patch-git_5371d28 new file mode 100644 index 000000000000..331bbb02bc0c --- /dev/null +++ b/www/falkon/files/patch-git_5371d28 @@ -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 + diff --git a/www/falkon/pkg-plist b/www/falkon/pkg-plist index bf5f618c50cf..a5229dda4511 100644 --- a/www/falkon/pkg-plist +++ b/www/falkon/pkg-plist @@ -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 |