From nobody@FreeBSD.org  Sun Apr 13 23:40:42 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id A9624D51
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 13 Apr 2014 23:40:42 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id 8924A13C2
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 13 Apr 2014 23:40:42 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s3DNefXl013283
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 13 Apr 2014 23:40:41 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s3DNefZX013278;
	Sun, 13 Apr 2014 23:40:41 GMT
	(envelope-from nobody)
Message-Id: <201404132340.s3DNefZX013278@cgiserv.freebsd.org>
Date: Sun, 13 Apr 2014 23:40:41 GMT
From: Matthew Rezny <matthew@reztek.cz>
To: freebsd-gnats-submit@FreeBSD.org
Subject: QupZilla port lacks options for DE integration
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: javad.kouhi@gmail.com

>Number:         188579
>Category:       ports
>Synopsis:       www/qupzilla lacks options for DE integration
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 13 23:50:00 UTC 2014
>Closed-Date:    Sat Apr 19 12:50:47 UTC 2014
>Last-Modified:  Sat Apr 19 12:50:47 UTC 2014
>Originator:     Matthew Rezny
>Release:        10-STABLE
>Organization:
RezTek, s.r.o.
>Environment:
FreeBSD desktop.reztek 10.0-STABLE FreeBSD 10.0-STABLE #0 r264285: Thu Apr 10 01:49:39 CEST 2014     root@desktop.reztek:/usr/obj/usr/src/sys/DESKTOP  amd64

>Description:
QupZilla has build options for integration with KDE and Gnome desktop environments. The integration allows utilization of the native password storage mechanism of these DEs (KWallet in the case of KDE, Gnome Keyring in the case of Gnome) for storing of login credentials for websites as an alternative to storing those credentials in a database specifc to QupZilla. Use of the DE's password storage potentially allows the credentials to be shared across multiple browsers. This integration is provided through native browser plugins that can be compiled with the browser. Since these plugins require libraries provided by these DEs, they should be selectively enabled via port options.

>How-To-Repeat:
Desire to save your passwords in one central location rather than separately in each browser.
>Fix:
Add port options for the DE integration plugins. I have prepared a patch to do so. I havfe tested the KWALLET option. I have not tested the GNOMEKEYRING option since I am not a Gnome user.

This patch also includes plist corrections for recently added translations which I had neglected to include in my patch in ports/186810 in my haste to update and un-BROKEN this port.


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 348839)
+++ Makefile	(working copy)
@@ -21,6 +21,21 @@
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
+OPTIONS_DEFINE=	GNOMEKEYRING KWALLET
+OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGNOMEKEYRING}
+LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+QMAKE_ENV+=	GNOME_INTEGRATION="true"
+.endif
+
+.if ${PORT_OPTIONS:MKWALLET}
+LIB_DEPENDS+=	libkdeui.so:${PORTSDIR}/x11/kdelibs4
+QMAKE_ENV+=	KDE_INTEGRATION="true"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/tests/autotests/qztoolstest.cpp \
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 348839)
+++ pkg-plist	(working copy)
@@ -4,7 +4,9 @@
 lib/libQupZilla.so.1.6
 lib/libQupZilla.so.1.6.3
 lib/qupzilla/libAccessKeysNavigation.so
+%%GNOMEKEYRING%%lib/qupzilla/libGnomeKeyringPasswords.so
 lib/qupzilla/libGreaseMonkey.so
+%%KWALLET%%lib/qupzilla/libKWalletPasswords.so
 lib/qupzilla/libMouseGestures.so
 lib/qupzilla/libPIM.so
 lib/qupzilla/libStatusBarIcons.so
@@ -24,7 +26,9 @@
 %%DATADIR%%/locale/de_DE.qm
 %%DATADIR%%/locale/el_GR.qm
 %%DATADIR%%/locale/es_ES.qm
+%%DATADIR%%/locale/es_MX.qm
 %%DATADIR%%/locale/es_VE.qm
+%%DATADIR%%/locale/eu_ES.qm
 %%DATADIR%%/locale/fa_IR.qm
 %%DATADIR%%/locale/fr_FR.qm
 %%DATADIR%%/locale/gl_ES.qm
@@ -77,6 +81,7 @@
 %%DATADIR%%/locale/sr_RS@latin.qm
 %%DATADIR%%/locale/sv_SE.qm
 %%DATADIR%%/locale/uk_UA.qm
+%%DATADIR%%/locale/uz@Latn.qm
 %%DATADIR%%/locale/zh_CN.qm
 %%DATADIR%%/locale/zh_TW.qm
 %%DATADIR%%/themes/chrome/images/blankbutton-a.png


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Apr 14 00:49:21 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=188579 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: javad.kouhi@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/188579: www/qupzilla lacks options for DE integration
Date: Mon, 14 Apr 2014 00:49:20 UT

 Maintainer of www/qupzilla,
 
 Please note that PR ports/188579 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/188579
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Matthew Rezny <matthew@reztek.cz>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/188579: www/qupzilla lacks options for DE integration
Date: Tue, 15 Apr 2014 21:06:32 +0200

 This is a multi-part message in MIME format.
 
 --nextPart1617642.X1sdd9ONAI
 Content-Transfer-Encoding: 7Bit
 Content-Type: text/plain; charset="us-ascii"
 
 QupZilla 1.6.4 was released the day after I filed this PR. Accordingly, I've 
 updated my patch to take the new version into account in order to ease 
 application. One new translation was added in 1.6.4 and is included in the 
 plist modifications.
 
 --nextPart1617642.X1sdd9ONAI
 Content-Disposition: attachment; filename="www_qupzilla_patch.txt"
 Content-Transfer-Encoding: 7Bit
 Content-Type: text/plain; charset="UTF-8"; name="www_qupzilla_patch.txt"
 
 Index: www/qupzilla/Makefile
 ===================================================================
 --- www/qupzilla/Makefile	(revision 350650)
 +++ www/qupzilla/Makefile	(working copy)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	qupzilla
 -PORTVERSION=	1.6.3
 +PORTVERSION=	1.6.4
  CATEGORIES=	www
  MASTER_SITES=	http://www.qupzilla.com/uploads/
  DISTNAME=	QupZilla-${PORTVERSION}
 @@ -21,6 +21,21 @@
  USE_LDCONFIG=	yes
  INSTALLS_ICONS=	yes
  
 +OPTIONS_DEFINE=	GNOMEKEYRING KWALLET
 +OPTIONS_SUB=	yes
 +
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MGNOMEKEYRING}
 +LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 +QMAKE_ENV+=	GNOME_INTEGRATION="true"
 +.endif
 +
 +.if ${PORT_OPTIONS:MKWALLET}
 +LIB_DEPENDS+=	libkdeui.so:${PORTSDIR}/x11/kdelibs4
 +QMAKE_ENV+=	KDE_INTEGRATION="true"
 +.endif
 +
  post-patch:
  	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
  		${WRKSRC}/tests/autotests/qztoolstest.cpp \
 Index: www/qupzilla/distinfo
 ===================================================================
 --- www/qupzilla/distinfo	(revision 350650)
 +++ www/qupzilla/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (QupZilla-1.6.3.tar.gz) = ba69b4bb9f9644fcff5945a0b692e6db877e57c2b9d948a7f57ecfcd4a86f7a0
 -SIZE (QupZilla-1.6.3.tar.gz) = 5087827
 +SHA256 (QupZilla-1.6.4.tar.gz) = e99c10460ab7f067eb24542dfba4451b391ff9261f69b163bcc7333ee5d54316
 +SIZE (QupZilla-1.6.4.tar.gz) = 5003805
 Index: www/qupzilla/pkg-plist
 ===================================================================
 --- www/qupzilla/pkg-plist	(revision 350650)
 +++ www/qupzilla/pkg-plist	(working copy)
 @@ -2,9 +2,11 @@
  lib/libQupZilla.so
  lib/libQupZilla.so.1
  lib/libQupZilla.so.1.6
 -lib/libQupZilla.so.1.6.3
 +lib/libQupZilla.so.1.6.4
  lib/qupzilla/libAccessKeysNavigation.so
 +%%GNOMEKEYRING%%lib/qupzilla/libGnomeKeyringPasswords.so
  lib/qupzilla/libGreaseMonkey.so
 +%%KWALLET%%lib/qupzilla/libKWalletPasswords.so
  lib/qupzilla/libMouseGestures.so
  lib/qupzilla/libPIM.so
  lib/qupzilla/libStatusBarIcons.so
 @@ -24,7 +26,9 @@
  %%DATADIR%%/locale/de_DE.qm
  %%DATADIR%%/locale/el_GR.qm
  %%DATADIR%%/locale/es_ES.qm
 +%%DATADIR%%/locale/es_MX.qm
  %%DATADIR%%/locale/es_VE.qm
 +%%DATADIR%%/locale/eu_ES.qm
  %%DATADIR%%/locale/fa_IR.qm
  %%DATADIR%%/locale/fr_FR.qm
  %%DATADIR%%/locale/gl_ES.qm
 @@ -35,6 +39,7 @@
  %%DATADIR%%/locale/ja_JP.qm
  %%DATADIR%%/locale/ka_GE.qm
  %%DATADIR%%/locale/lg.qm
 +%%DATADIR%%/locale/lv_LV.qm
  %%DATADIR%%/locale/nl_NL.qm
  %%DATADIR%%/locale/nqo.qm
  %%DATADIR%%/locale/pl_PL.qm
 @@ -77,6 +82,7 @@
  %%DATADIR%%/locale/sr_RS@latin.qm
  %%DATADIR%%/locale/sv_SE.qm
  %%DATADIR%%/locale/uk_UA.qm
 +%%DATADIR%%/locale/uz@Latn.qm
  %%DATADIR%%/locale/zh_CN.qm
  %%DATADIR%%/locale/zh_TW.qm
  %%DATADIR%%/themes/chrome/images/blankbutton-a.png
 
 --nextPart1617642.X1sdd9ONAI--
 

From: Matthew Rezny <matthew@reztek.cz>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/188579: www/qupzilla lacks options for DE integration
Date: Wed, 16 Apr 2014 04:33:14 +0200

 This is a multi-part message in MIME format.
 
 --nextPart6941279.JpmPV7oCQE
 Content-Transfer-Encoding: 7Bit
 Content-Type: text/plain; charset="us-ascii"
 
 Upstream managed to break the KWallet Passwords plugin in the 1.6.4 release. 
 Seems silly now to have one PR wherein the version bump breaks the option that 
 was added. Fortunately, the fix is easy and we can apply it locally with the 
 addition of another patch file.
 
 --nextPart6941279.JpmPV7oCQE
 Content-Disposition: attachment; filename="patch-src__plugins__KWalletPasswords__kwalletplugin.cpp"
 Content-Transfer-Encoding: 7Bit
 Content-Type: text/x-c++src; charset="UTF-8"; name="patch-src__plugins__KWalletPasswords__kwalletplugin.cpp"
 
 --- src/plugins/KWalletPasswords/kwalletplugin.cpp.orig 2014-04-16 04:16:20.000000000 +0200
 +++ src/plugins/KWalletPasswords/kwalletplugin.cpp      2014-04-16 04:16:37.000000000 +0200
 @@ -59,7 +59,7 @@
  
  bool KWalletPlugin::testPlugin()
  {
 -    return (QupZilla::VERSION == QLatin1String("1.6.3"));
 +    return (QupZilla::VERSION == QLatin1String("1.6.4"));
  }
  
  QTranslator* KWalletPlugin::getTranslator(const QString &locale)
 
 --nextPart6941279.JpmPV7oCQE--
 

From: Matthew Rezny <matthew@reztek.cz>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/188579: www/qupzilla lacks options for DE integration
Date: Wed, 16 Apr 2014 17:49:30 +0200

 This PR is getting messy so I think it best to just close it. Upstream has 
 advised that there will be a 1.6.5 release soon to address the plugin version 
 issue. When 1.6.5 is ready, I will make a separate PR for the update to 1.6.5, 
 including the new translations in the plist, and the DE integration options as 
 just an extra in that update. Better not to have a (very short lived) local 
 patch for the plugin version error, and a fresh PR ensures no confusion over 
 that detail.
 

From: Javad Kouhi <javad.kouhi@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/188579: www/qupzilla lacks options for DE integration
Date: Wed, 16 Apr 2014 22:39:19 +0000

 I approve the patch, thank you so much, and sorry for this long delay,
 too busy with life.
 
 On Mon, 14 Apr 2014 00:49:20 UT, Edwin Groothuis <edwin@freebsd.org> wrote:
 > Maintainer of www/qupzilla,
 >
 > Please note that PR ports/188579 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/188579
 >
 > --
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 >
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Thu Apr 17 01:23:29 UTC 2014 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=188579 

From: Matthew Rezny <matthew@reztek.cz>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/188579: www/qupzilla lacks options for DE integration
Date: Sat, 19 Apr 2014 06:30:38 +0200

 ports/188784 supersedes this PR with a single patch updated for v1.6.5.
 
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Sat Apr 19 12:50:24 UTC 2014 
State-Changed-Why:  
Superseded by ports/188784. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=188579 
>Unformatted:
