Date: Tue, 12 Jan 2010 08:29:26 GMT From: Rob Farmer <rfarmer@predatorlabs.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/142739: [PATCH] x11-wm/libcompizconfig Patch not needed on recent current Message-ID: <201001120829.o0C8TQhA008002@www.freebsd.org> Resent-Message-ID: <201001120830.o0C8U17f084583@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142739 >Category: ports >Synopsis: [PATCH] x11-wm/libcompizconfig Patch not needed on recent current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jan 12 08:30:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Rob Farmer >Release: 9.0-CURRENT >Organization: >Environment: FreeBSD peridot.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r201657: Wed Jan 6 09:49:06 PST 2010 robert@peridot.predatorlabs.net:/usr/obj/usr/src/sys/PERIDOT i386 >Description: On recent current (OSVERSION >=900006) the patch for src/compiz.cpp is not necessary since scandir has been updated, so make it conditional. >How-To-Repeat: >Fix: attached Patch attached with submission follows: diff -ruN libcompizconfig.old/Makefile libcompizconfig/Makefile --- libcompizconfig.old/Makefile 2010-01-12 00:20:20.000000000 -0800 +++ libcompizconfig/Makefile 2010-01-12 00:22:34.000000000 -0800 @@ -26,6 +26,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 900006 +EXTRA_PATCHES=${PATCHDIR}/src-compiz.cpp +.endif + post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ ${WRKSRC}/src/main.c \ @@ -34,4 +40,4 @@ ${WRKSRC}/src/ini.c \ ${WRKSRC}/backend/ini.c -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN libcompizconfig.old/files/patch-src-compiz.cpp libcompizconfig/files/patch-src-compiz.cpp --- libcompizconfig.old/files/patch-src-compiz.cpp 2010-01-12 00:20:20.000000000 -0800 +++ libcompizconfig/files/patch-src-compiz.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,20 +0,0 @@ ---- src/compiz.cpp.orig 2009-03-04 21:22:22.000000000 -0600 -+++ src/compiz.cpp 2009-04-06 01:58:35.000000000 -0500 -@@ -957,7 +957,7 @@ - - - static int --pluginNameFilter (const struct dirent *name) -+pluginNameFilter (struct dirent *name) - { - int length = strlen (name->d_name); - -@@ -972,7 +972,7 @@ - } - - static int --pluginXMLFilter (const struct dirent *name) -+pluginXMLFilter (struct dirent *name) - { - int length = strlen (name->d_name); - diff -ruN libcompizconfig.old/files/src-compiz.cpp libcompizconfig/files/src-compiz.cpp --- libcompizconfig.old/files/src-compiz.cpp 1969-12-31 16:00:00.000000000 -0800 +++ libcompizconfig/files/src-compiz.cpp 2009-04-07 23:55:30.000000000 -0700 @@ -0,0 +1,20 @@ +--- src/compiz.cpp.orig 2009-03-04 21:22:22.000000000 -0600 ++++ src/compiz.cpp 2009-04-06 01:58:35.000000000 -0500 +@@ -957,7 +957,7 @@ + + + static int +-pluginNameFilter (const struct dirent *name) ++pluginNameFilter (struct dirent *name) + { + int length = strlen (name->d_name); + +@@ -972,7 +972,7 @@ + } + + static int +-pluginXMLFilter (const struct dirent *name) ++pluginXMLFilter (struct dirent *name) + { + int length = strlen (name->d_name); + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001120829.o0C8TQhA008002>