Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 07 Jan 2019 16:20:21 +0000
From:      bugzilla-noreply@freebsd.org
To:        ports-bugs@FreeBSD.org
Subject:   [Bug 234692] www/falkon: Make KDE5 integration optional
Message-ID:  <bug-234692-7788@https.bugs.freebsd.org/bugzilla/>

next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D234692

            Bug ID: 234692
           Summary: www/falkon: Make KDE5 integration optional
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: Individual Port(s)
          Assignee: kde@FreeBSD.org
          Reporter: ken@ixsystems.com
             Flags: maintainer-feedback?(kde@FreeBSD.org)
          Assignee: kde@FreeBSD.org

Created attachment 200868
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D200868&action=
=3Dedit
Patch file for www/falkon Makefile

Patches attached to move the KWALLET integration to an optional alongside t=
he
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 =3D ecm_build (enhanced cmake modules - required for build)
* USE_QT +=3D linguist_build (Qt linguist support - required for generating
translation files)
* USE_KDE +=3D 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+=3D 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=3D      falkon
 DISTVERSION=3D   3.0.0
-PORTREVISION=3D  4
+PORTREVISION=3D  5
 CATEGORIES=3D    www
 MASTER_SITES=3D  KDE/stable/falkon/${DISTVERSION:R}/src/

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

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

 USE_LDCONFIG=3D  yes

-OPTIONS_DEFINE=3D        GNOMEKEYRING
+OPTIONS_DEFINE=3D        GNOMEKEYRING KWALLET
 OPTIONS_SUB=3D   YES
+
+KWALLET_USE=3D   KDE+=3Dwallet

 GNOMEKEYRING_CMAKE_BOOL=3D       BUILD_KEYRING
 GNOMEKEYRING_USE=3D              GNOME=3Dglib20
```

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
```

--=20
You are receiving this mail because:
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-234692-7788>