Attachment 151941 Details for Bug 196958 – patch

[patch] patch

worker-3.6.0.patch (text/plain), 3.78 KB, created by mp39590 on 2015-01-21 02:53:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mp39590

Created: 2015-01-21 02:53:45 UTC

Size: 3.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 377521)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	worker
>-PORTVERSION=	3.5.2
>+PORTVERSION=	3.6.0
> CATEGORIES=	x11-fm
> MASTER_SITES=	http://www.boomerangsworld.de/cms/worker/downloads/
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>@@ -16,21 +16,25 @@
> 
> GNU_CONFIGURE=	yes
> USE_XORG=	x11
>-USE_GCC=	yes
> 
> USES=	shebangfix tar:bzip2
> SHEBANG_FILES=	${WRKSRC}/scripts/*.sh \
> 		${WRKSRC}/scripts/xeditor
> 
>-CFLAGS+=	${PTHREAD_CFLAGS}
>+OPTIONS_DEFINE=	XFT AVFS
> 
>-OPTIONS_DEFINE=	XFT
>-
>+AVFS_DESC=	Use AVFS library to access an archives
>+AVFS_LIB_DEPENDS=	libavfs.so:${PORTSDIR}/sysutils/avfs
> XFT_CONFIGURE_ENABLE=	xft
> XFT_USE=	XORG=xft
> 
>-pre-configure:
>-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
>-		${WRKSRC}/configure
>+.include <bsd.port.pre.mk>
> 
>-.include <bsd.port.mk>
>+.if ${OSVERSION} < 1000024
>+USE_GCC=	4.6+
>+.else
>+CONFIGURE_ARGS+=	--disable-cxx-check
>+CXXFLAGS+=	-std=c++11
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 377521)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (worker-3.5.2.tar.bz2) = 9619edd29359d9e107aeb666208e379852cd462857fcfbf6f4507a8923226af6
>-SIZE (worker-3.5.2.tar.bz2) = 1488217
>+SHA256 (worker-3.6.0.tar.bz2) = 3b8f5451523fe73cd81317689ee61e3f8ed43a8f2087c945970cfb369110f735
>+SIZE (worker-3.6.0.tar.bz2) = 1495468
>Index: files/patch-src__dmcacheentrynwc.hh
>===================================================================
>--- files/patch-src__dmcacheentrynwc.hh	(revision 0)
>+++ files/patch-src__dmcacheentrynwc.hh	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/dmcacheentrynwc.hh.orig	2015-01-08 18:44:53.000000000 +0300
>++++ src/dmcacheentrynwc.hh	2015-01-20 14:58:29.000000000 +0300
>+@@ -25,6 +25,7 @@
>+ #include "wdefines.h"
>+ #include "nwc_dir.hh"
>+ #include <aguix/refcount.hh>
>++#include <functional>
>+ 
>+ class DirBookmarksSettings;
>+ class DirFilterSettings;
>
>Property changes on: files/patch-src__dmcacheentrynwc.hh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src__pathjumpui.hh
>===================================================================
>--- files/patch-src__pathjumpui.hh	(revision 0)
>+++ files/patch-src__pathjumpui.hh	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/pathjumpui.hh.orig	2015-01-08 18:44:53.000000000 +0300
>++++ src/pathjumpui.hh	2015-01-20 00:01:56.000000000 +0300
>+@@ -101,7 +101,7 @@
>+                                                     m_always_ignore( false )
>+         {}
>+ 
>+-        bool operator<( const pathjump_entry &rhs )
>++        bool operator<( const pathjump_entry &rhs ) const
>+         {
>+             if ( m_blockcount < rhs.m_blockcount ) return true;
>+             else if ( m_blockcount == rhs.m_blockcount ) {
>
>Property changes on: files/patch-src__pathjumpui.hh
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 377521)
>+++ pkg-plist	(working copy)
>@@ -96,3 +96,5 @@
> %%DATADIR%%/config-updates/update-3.3.3.conf
> %%DATADIR%%/config-updates/update-3.4.0-utf8.conf
> %%DATADIR%%/config-updates/update-3.4.0.conf
>+%%DATADIR%%/config-updates/update-3.6.0-utf8.conf
>+%%DATADIR%%/config-updates/update-3.6.0.conf

Actions: View | Diff

Attachments on bug 196958: 151941 | 151942