Attachment #148209 for bug #194310




# $FreeBSD$

PORTNAME=	qupzilla
PORTVERSION=	1.8.2
CATEGORIES=	www
MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
DISTNAME=	QupZilla-${PORTVERSION}

USE_LDCONFIG=	yes
INSTALLS_ICONS=	yes

OPTIONS_DEFINE=	DBUS DEBUG GNOMEKEYRING KWALLET
OPTIONS_DEFAULT=DBUS
OPTIONS_SUB=	yes

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDEBUG}
QMAKE_ARGS+=	CONFIG+=debug
.endif

.if ${PORT_OPTIONS:MGNOMEKEYRING}
LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
QMAKE_ENV+=	GNOME_INTEGRATION="true"

Lines 1-2 Link Here

(-)www/qupzilla/distinfo (-2 / +2 lines)
1	SHA256 (QupZilla-1.8.0.tar.xz) = c4089d14254e87b58a5f2bfb0e393cd6bae0b2bd508da19a92c12989b7e90908	1	SHA256 (QupZilla-1.8.2.tar.xz) = 0b9ddad792725162b32deb78af206268fd64c01ff64a81f31dde3cc39806ed23
2	SIZE (QupZilla-1.8.0.tar.xz) = 3092300	2	SIZE (QupZilla-1.8.2.tar.xz) = 3092572




--- src/lib/3rdparty/processinfo.h.orig	2014-09-26 12:35:35.000000000 +0400
+++ src/lib/3rdparty/processinfo.h	2014-09-26 23:04:10.000000000 +0400
@@ -18,16 +18,12 @@
 #ifndef PROCESSINFO_H
 #define PROCESSINFO_H
 
-#include <QtGlobal>
+#include "qzcommon.h"

 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
 #include <sys/types.h>
 #endif
 
-#include <QString>
-
-#include "qzcommon.h"
-
 /*
  * Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5
  * written by user WitchCraft 

Lines 2-8 Link Here

(-)www/qupzilla/pkg-plist (-1 / +2 lines)
2	lib/libQupZilla.so	2	lib/libQupZilla.so
3	lib/libQupZilla.so.1	3	lib/libQupZilla.so.1
4	lib/libQupZilla.so.1.8	4	lib/libQupZilla.so.1.8
5	lib/libQupZilla.so.1.8.0	5	lib/libQupZilla.so.1.8.2
6	lib/qupzilla/libAccessKeysNavigation.so	6	lib/qupzilla/libAccessKeysNavigation.so
7	lib/qupzilla/libAutoScroll.so	7	lib/qupzilla/libAutoScroll.so
8	%%GNOMEKEYRING%%lib/qupzilla/libGnomeKeyringPasswords.so	8	%%GNOMEKEYRING%%lib/qupzilla/libGnomeKeyringPasswords.so
Lines 11-16 Link Here
11	lib/qupzilla/libMouseGestures.so	11	lib/qupzilla/libMouseGestures.so
12	lib/qupzilla/libPIM.so	12	lib/qupzilla/libPIM.so
13	lib/qupzilla/libStatusBarIcons.so	13	lib/qupzilla/libStatusBarIcons.so
		14	%%DEBUG%%lib/qupzilla/libTestPlugin.so
14	share/appdata/qupzilla.appdata.xml	15	share/appdata/qupzilla.appdata.xml
15	share/applications/qupzilla.desktop	16	share/applications/qupzilla.desktop
16	share/bash-completion/completions/qupzilla	17	share/bash-completion/completions/qupzilla

Return to bug 194310

Lines 1-7 Link Here

(-)www/qupzilla/Makefile (-2 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= qupzilla	3	PORTNAME= qupzilla
4	PORTVERSION= 1.8.0	4	PORTVERSION= 1.8.2
5	CATEGORIES= www	5	CATEGORIES= www
6	MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/	6	MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
7	DISTNAME= QupZilla-${PORTVERSION}	7	DISTNAME= QupZilla-${PORTVERSION}
Lines 21-32 Link Here
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22	INSTALLS_ICONS= yes	22	INSTALLS_ICONS= yes
23		23
24	OPTIONS_DEFINE= DBUS GNOMEKEYRING KWALLET	24	OPTIONS_DEFINE= DBUS DEBUG GNOMEKEYRING KWALLET
25	OPTIONS_DEFAULT=DBUS	25	OPTIONS_DEFAULT=DBUS
26	OPTIONS_SUB= yes	26	OPTIONS_SUB= yes
27		27
28	.include <bsd.port.options.mk>	28	.include <bsd.port.options.mk>
29		29
		30	.if ${PORT_OPTIONS:MDEBUG}
		31	QMAKE_ARGS+= CONFIG+=debug
		32	.endif
		33
30	.if ${PORT_OPTIONS:MGNOMEKEYRING}	34	.if ${PORT_OPTIONS:MGNOMEKEYRING}
31	LIB_DEPENDS+= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring	35	LIB_DEPENDS+= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
32	QMAKE_ENV+= GNOME_INTEGRATION="true"	36	QMAKE_ENV+= GNOME_INTEGRATION="true"

Lines 1-11 Link Here

(-)www/qupzilla/files/patch-src__lib__3rdparty__processinfo.h (-3 / +12 lines)
1	--- src/lib/3rdparty/processinfo.h.orig 2014-09-26 12:35:35.000000000 +0400	1	--- src/lib/3rdparty/processinfo.h.orig 2014-09-26 12:35:35.000000000 +0400
2	+++ src/lib/3rdparty/processinfo.h 2014-09-26 23:04:10.000000000 +0400	2	+++ src/lib/3rdparty/processinfo.h 2014-09-26 23:04:10.000000000 +0400
3	@@ -18,6 +18,8 @@	3	@@ -18,16 +18,12 @@
4	#ifndef PROCESSINFO_H	4	#ifndef PROCESSINFO_H
5	#define PROCESSINFO_H	5	#define PROCESSINFO_H
6		6
7	+#include <QtGlobal>	7	-#include <QtGlobal>
8	+	8	+#include "qzcommon.h"
		9
9	#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)	10	#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
10	#include <sys/types.h>	11	#include <sys/types.h>
11	#endif	12	#endif
		13
		14	-#include <QString>
		15	-
		16	-#include "qzcommon.h"
		17	-
		18	/*
		19	* Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5
		20	* written by user WitchCraft