maintainer-feedback requested: [Bug 234692] www/falkon: Make KDE5 integration optional

bugzilla-noreply at freebsd.org bugzilla-noreply at freebsd.org
Mon Jan 7 16:20:21 GMT 2019


Bugzilla Automation <bugzilla at FreeBSD.org> has asked kde at FreeBSD.org for
maintainer-feedback:
Bug 234692: www/falkon: Make KDE5 integration optional
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234692



--- Description ---
Patches attached to move the KWALLET integration to an optional alongside the
current GNOME-Keyring integration option.
This also catches/fixes some unlisted build dependencies that the KWALLET
integration was silently pulling in.

Summary of Changes:
* USE_KDE = ecm_build (enhanced cmake modules - required for build)
* USE_QT += linguist_build (Qt linguist support - required for generating
translation files)
* USE_KDE += kwallet moves to new "KWALLET" option.

Notes:
This will change the default behavior to NOT building with KWALLET
integrations. If continuity is desired with the previous port version, then the
following line should also be added to the Makefile:

```
OPTIONS_DEFAULT+= KWALLET
```

Simple Text of patch files (in case attaching them does not work)
---------

patch-Makefile.txt
```
--- Makefile	2019-01-07 10:44:17.400370000 -0500
+++ Makefile.new	2019-01-07 10:50:40.739012000 -0500
@@ -2,7 +2,7 @@

 PORTNAME=	falkon
 DISTVERSION=	3.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	KDE/stable/falkon/${DISTVERSION:R}/src/

@@ -13,16 +13,18 @@
 LICENSE_FILE=	${WRKSRC}/COPYING

 USES=		cmake desktop-file-utils kde:5 qt:5 ssl tar:xz
-USE_KDE=	wallet
+USE_KDE=	ecm_build
 USE_QT=		core dbus declarative gui location network printsupport
\
		sql webchannel webengine widgets x11extras \
-		buildtools_build qmake_build
+		buildtools_build qmake_build linguist_build
 USE_XORG=	xcb

 USE_LDCONFIG=	yes

-OPTIONS_DEFINE=	GNOMEKEYRING
+OPTIONS_DEFINE=	GNOMEKEYRING KWALLET
 OPTIONS_SUB=	YES
+
+KWALLET_USE=	KDE+=wallet

 GNOMEKEYRING_CMAKE_BOOL=	BUILD_KEYRING
 GNOMEKEYRING_USE=		GNOME=glib20
```

patch-pkg-plist.txt
```
--- pkg-plist	2019-01-07 10:44:17.400923000 -0500
+++ pkg-plist.new	2019-01-07 10:52:08.714227000 -0500
@@ -6,7 +6,7 @@
 %%GNOMEKEYRING%%%%QT_PLUGINDIR%%/falkon/GnomeKeyringPasswords.so
 %%QT_PLUGINDIR%%/falkon/GreaseMonkey.so
 %%QT_PLUGINDIR%%/falkon/ImageFinder.so
-%%QT_PLUGINDIR%%/falkon/KWalletPasswords.so
+%%KWALLET%%%%QT_PLUGINDIR%%/falkon/KWalletPasswords.so
 %%QT_PLUGINDIR%%/falkon/MouseGestures.so
 %%QT_PLUGINDIR%%/falkon/PIM.so
 %%QT_PLUGINDIR%%/falkon/StatusBarIcons.so
```


More information about the kde-freebsd mailing list