Attachment 151782 Details for Bug 196302 – improved patch

[patch] improved patch

www_qupzilla.patch (text/plain), 5.82 KB, created by Matthew Rezny on 2015-01-18 01:55:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2015-01-18 01:55:02 UTC

Size: 5.82 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 377222)
>+++ MOVED	(working copy)
>@@ -7403,3 +7403,4 @@
> x11/rxvt-devel||2015-01-17|Has expired: No longer developed nor maintained and deprecated by x11/xvt and x11/rxvt-unicode
> comms/spandsp-devel|comms/spandsp|2015-01-17|Has expired: Use newer comms/spandsp
> multimedia/universal-media-server||2015-01-17|Has expired: RC script broken, especially prestart target
>+www/qupzilla|www/qupzilla-qt4|2015-01-18|Renamed to differentiate from www/qupzilla-qt5 
>Index: www/Makefile
>===================================================================
>--- www/Makefile	(revision 377147)
>+++ www/Makefile	(working copy)
>@@ -1723,7 +1723,8 @@
>     SUBDIR += qdecoder
>     SUBDIR += qooxdoo
>     SUBDIR += quickie
>-    SUBDIR += qupzilla
>+    SUBDIR += qupzilla-qt4
>+    SUBDIR += qupzilla-qt5
>     SUBDIR += radicale
>     SUBDIR += red5
>     SUBDIR += redaxo
>Index: www/qupzilla-qt4/Makefile
>===================================================================
>--- www/qupzilla-qt4/Makefile	(revision 377147)
>+++ www/qupzilla-qt4/Makefile	(working copy)
>@@ -1,9 +1,10 @@
> # $FreeBSD$
> 
> PORTNAME=	qupzilla
>-PORTVERSION=	1.8.3
>+PORTVERSION=	1.8.5
> CATEGORIES=	www
> MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
>+PKGNAMESUFFIX=	-qt4
> DISTNAME=	QupZilla-${PORTVERSION}
> 
> MAINTAINER=	matthew@reztek.cz
>@@ -13,9 +14,12 @@
> 
> LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
> 
>+CONFLICTS=	${PORTNAME}-qt5*
>+
> USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
>-USE_QT4=	corelib gui moc_build rcc_build uic_build webkit \
>-		xml script sql network imageformats_run linguist_build
>+USE_QT4=	corelib gui network script sql webkit xml \
>+		linguist_build moc_build rcc_build uic_build \
>+		imageformats_run sql-sqlite3_run
> CONFIGURE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
> USE_LDCONFIG=	yes
> INSTALLS_ICONS=	yes
>Index: www/qupzilla-qt4/distinfo
>===================================================================
>--- www/qupzilla-qt4/distinfo	(revision 377147)
>+++ www/qupzilla-qt4/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (QupZilla-1.8.3.tar.xz) = d3551288b27af952bb6d9d0c8f3bf8d3e849722b23da0193433b1d0bb88469be
>-SIZE (QupZilla-1.8.3.tar.xz) = 3093840
>+SHA256 (QupZilla-1.8.5.tar.xz) = 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c
>+SIZE (QupZilla-1.8.5.tar.xz) = 3096640
>Index: www/qupzilla-qt4/pkg-plist
>===================================================================
>--- www/qupzilla-qt4/pkg-plist	(revision 377147)
>+++ www/qupzilla-qt4/pkg-plist	(working copy)
>@@ -188,6 +188,7 @@
> %%DATADIR%%/themes/default/windows.css
> %%DATADIR%%/themes/linux/images/flash.png
> %%DATADIR%%/themes/linux/images/flashstart.png
>+%%DATADIR%%/themes/linux/images/goto.png
> %%DATADIR%%/themes/linux/images/key.png
> %%DATADIR%%/themes/linux/images/library-bg-left.png
> %%DATADIR%%/themes/linux/images/library-bg-top-right.png
>Index: www/qupzilla-qt5/Makefile
>===================================================================
>--- www/qupzilla-qt5/Makefile	(revision 375498)
>+++ www/qupzilla-qt5/Makefile	(working copy)
>@@ -1,9 +1,10 @@
> # $FreeBSD$
> 
> PORTNAME=	qupzilla
>-PORTVERSION=	1.8.3
>+PORTVERSION=	1.8.5
> CATEGORIES=	www
> MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
>+PKGNAMESUFFIX=	-qt5
> DISTNAME=	QupZilla-${PORTVERSION}
> 
> MAINTAINER=	matthew@reztek.cz
>@@ -13,27 +14,39 @@
> 
> LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
> 
>+CONFLICTS=	${PORTNAME}-qt4*
>+
> USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
>-USE_QT4=	corelib gui moc_build rcc_build uic_build webkit \
>-		xml script sql network imageformats_run linguist_build
>+USE_QT5=	core concurrent gui network script sql webkit xml \
>+		buildtools_build linguisttools_build \
>+		imageformats_run sql-sqlite3_run
> CONFIGURE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
> USE_LDCONFIG=	yes
> INSTALLS_ICONS=	yes
> PLIST_SUB=	VERSION=${PORTVERSION}
> 
>-OPTIONS_DEFINE=	DBUS DEBUG GNOMEKEYRING KWALLET
>+OPTIONS_DEFINE=	DBUS DEBUG GNOMEKEYRING # KWALLET
> OPTIONS_DEFAULT=DBUS
> OPTIONS_SUB=	yes
> 
>-DBUS_USE=		QT4=dbus
>+DBUS_USE=		QT5=dbus
> DBUS_CONFIGURE_ENV_OFF=	DISABLE_DBUS="true"
> 
> GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
> GNOMEKEYRING_CONFIGURE_ENV=	GNOME_INTEGRATION="true"
> 
>-KWALLET_USE=		KDE4=kdelibs
>-KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
>+# KWallet integration requires KF5 which is not yet available through ports
>+#KWALLET_USE=		KDE5=kdelibs
>+#KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
>+PLIST_SUB+=	KWALLET="@comment "
> 
>+.include <bsd.port.options.mk>
>+
>+# work around for build failure in test plugin (single source file target)
>+.if ${PORT_OPTIONS:MDEBUG}
>+MAKE_JOBS_UNSAFE=yes
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
> 		${WRKSRC}/tests/autotests/qztoolstest.cpp \
>Index: www/qupzilla-qt5/distinfo
>===================================================================
>--- www/qupzilla-qt5/distinfo	(revision 375498)
>+++ www/qupzilla-qt5/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (QupZilla-1.8.3.tar.xz) = d3551288b27af952bb6d9d0c8f3bf8d3e849722b23da0193433b1d0bb88469be
>-SIZE (QupZilla-1.8.3.tar.xz) = 3093840
>+SHA256 (QupZilla-1.8.5.tar.xz) = 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c
>+SIZE (QupZilla-1.8.5.tar.xz) = 3096640
>Index: www/qupzilla-qt5/pkg-plist
>===================================================================
>--- www/qupzilla-qt5/pkg-plist	(revision 375498)
>+++ www/qupzilla-qt5/pkg-plist	(working copy)
>@@ -188,6 +188,7 @@
> %%DATADIR%%/themes/default/windows.css
> %%DATADIR%%/themes/linux/images/flash.png
> %%DATADIR%%/themes/linux/images/flashstart.png
>+%%DATADIR%%/themes/linux/images/goto.png
> %%DATADIR%%/themes/linux/images/key.png
> %%DATADIR%%/themes/linux/images/library-bg-left.png
> %%DATADIR%%/themes/linux/images/library-bg-top-right.png

Actions: View | Diff

Attachments on bug 196302: 150994 | 151547 | 151765 | 151782