Attachment 144466 Details for Bug 191667 – QupZilla 1.6.6 update

[patch] QupZilla 1.6.6 update

www_qupzilla.patch (text/plain), 4.93 KB, created by Matthew Rezny on 2014-07-06 17:28:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2014-07-06 17:28:18 UTC

Size: 4.93 KB

patch

obsolete

>Index: www/qupzilla/Makefile
>===================================================================
>--- www/qupzilla/Makefile	(revision 360798)
>+++ www/qupzilla/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	qupzilla
>-PORTVERSION=	1.6.5
>+PORTVERSION=	1.6.6
> CATEGORIES=	www
> MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
> DISTNAME=	QupZilla-${PORTVERSION}
>@@ -15,17 +15,39 @@
> 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
> 
> USES=		desktop-file-utils pkgconfig qmake tar:xz
>-USE_QT4=	gui moc_build rcc_build uic_build webkit \
>-		dbus xml script sql network imageformats_run linguist_build
> QMAKE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
> USE_LDCONFIG=	yes
> INSTALLS_ICONS=	yes
> 
>-OPTIONS_DEFINE=	GNOMEKEYRING KWALLET
>+OPTIONS_DEFINE=	DEBUG GNOMEKEYRING KWALLET WEBGL
>+OPTIONS_SINGLE=	QT
>+OPTIONS_SINGLE_QT= QT4 QT5
>+OPTIONS_DEFAULT=QT4
> OPTIONS_SUB=	yes
>+WEBGL_DESC=	Enable WebGL support (only enabled with QT5's QtWebKit)
> 
> .include <bsd.port.options.mk>
> 
>+.if ${PORT_OPTIONS:MDEBUG}
>+QMAKE_ARGS+=	CONFIG+=debug
>+.endif
>+
>+.if ${PORT_OPTIONS:MQT4}
>+USE_QT4=        gui moc_build rcc_build uic_build webkit \
>+		dbus xml script sql network imageformats_run linguist_build
>+.endif
>+
>+.if ${PORT_OPTIONS:MQT5}
>+USE_QT5=	gui buildtools_build webkit \
>+		dbus xml script sql network imageformats_run linguist_build
>+.if ${PORT_OPTIONS:MDEBUG}
>+MAKE_JOBS_UNSAFE=1      # qmake5 gets too parallel, dies in example plugin
>+.endif
>+.if ${PORT_OPTIONS:MKWALLET}
>+BROKEN=         KDE Wallet integration will require KF5 to build with QT5
>+.endif
>+.endif
>+
> .if ${PORT_OPTIONS:MGNOMEKEYRING}
> LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
> QMAKE_ENV+=	GNOME_INTEGRATION="true"
>@@ -36,6 +58,10 @@
> QMAKE_ENV+=	KDE_INTEGRATION="true"
> .endif
> 
>+.if ${PORT_OPTIONS:MWEBGL}
>+QMAKE_ENV+=	USE_WEBGL="true"
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
> 		${WRKSRC}/tests/autotests/qztoolstest.cpp \
>Index: www/qupzilla/distinfo
>===================================================================
>--- www/qupzilla/distinfo	(revision 360798)
>+++ www/qupzilla/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (QupZilla-1.6.5.tar.xz) = 4ba1a2ab7fcb2c2b3230d202b78ae8ee6d6ec917bb2284c57c4dde54ca951715
>-SIZE (QupZilla-1.6.5.tar.xz) = 3153012
>+SHA256 (QupZilla-1.6.6.tar.xz) = 82597a18fff789ddb92bdf21fb46a1f85c0003813f89c7462269c6aa11ef0fc9
>+SIZE (QupZilla-1.6.6.tar.xz) = 3162916
>Index: www/qupzilla/files/patch-src__lib__3rdparty__processinfo.h
>===================================================================
>--- www/qupzilla/files/patch-src__lib__3rdparty__processinfo.h	(revision 360798)
>+++ www/qupzilla/files/patch-src__lib__3rdparty__processinfo.h	(working copy)
>@@ -1,11 +1,19 @@
> --- ./src/lib/3rdparty/processinfo.h.orig	2014-01-26 19:04:16.000000000 +0330
> +++ ./src/lib/3rdparty/processinfo.h	2014-01-26 19:04:33.000000000 +0330
>-@@ -18,6 +18,8 @@
>+@@ -18,14 +18,14 @@
>  #ifndef PROCESSINFO_H
>  #define PROCESSINFO_H
>  
>-+#include <unistd.h>
>++#include "qz_namespace.h"
> +
>+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
>+ #include <sys/types.h>
>+ #endif
>+ 
>  #include <QString>
>  
>- #include "qz_namespace.h"
>+-#include "qz_namespace.h"
>+-
>+ /*
>+  * Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5
>+  * written by user WitchCraft 
>Index: www/qupzilla/files/patch-src__main__main.pro
>===================================================================
>--- www/qupzilla/files/patch-src__main__main.pro	(revision 360798)
>+++ www/qupzilla/files/patch-src__main__main.pro	(working copy)
>@@ -1,11 +1,11 @@
> --- ./src/main/main.pro.orig	2014-01-26 16:37:39.000000000 +0330
> +++ ./src/main/main.pro	2014-01-26 16:38:07.000000000 +0330
>-@@ -10,7 +10,7 @@
>- TEMPLATE = app
>+@@ -35,4 +35,8 @@
>+ os2:RC_FILE = appicon_os2.rc
>+ win32:RC_FILE = appicon.rc
>  
>- !unix|mac: LIBS += -L../../bin -lQupZilla
>--!mac:unix: LIBS += ../../bin/libQupZilla.so
>-+!mac:unix: LIBS += ../../bin/libQupZilla.so -lexecinfo
>- 
>- include(../defines.pri)
>- include(../install.pri)
>++openbsd-*|freebsd-*|haiku-* {
>++       LIBS += -lexecinfo
>++}
>++
>+ unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN
>Index: www/qupzilla/pkg-plist
>===================================================================
>--- www/qupzilla/pkg-plist	(revision 360798)
>+++ www/qupzilla/pkg-plist	(working copy)
>@@ -2,8 +2,9 @@
> lib/libQupZilla.so
> lib/libQupZilla.so.1
> lib/libQupZilla.so.1.6
>-lib/libQupZilla.so.1.6.5
>+lib/libQupZilla.so.1.6.6
> lib/qupzilla/libAccessKeysNavigation.so
>+lib/qupzilla/libAutoScroll.so
> %%GNOMEKEYRING%%lib/qupzilla/libGnomeKeyringPasswords.so
> lib/qupzilla/libGreaseMonkey.so
> %%KWALLET%%lib/qupzilla/libKWalletPasswords.so
>@@ -10,6 +11,7 @@
> lib/qupzilla/libMouseGestures.so
> lib/qupzilla/libPIM.so
> lib/qupzilla/libStatusBarIcons.so
>+%%DEBUG%%lib/qupzilla/libTestPlugin.so
> share/applications/qupzilla.desktop
> share/bash-completion/completions/qupzilla
> share/icons/hicolor/128x128/apps/qupzilla.png

Actions: View | Diff

Attachments on bug 191667: 144466