ufraw fails on recent head because of incorrect namespacing, upsetting clang-3.4 Fix: -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.--THt3woW4xpokk4oP4QV1YdNAJeuMNe4xcGzRJVWvlJMYKiKr Content-Type: text/plain; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" Index: files/patch-cplusplus =================================================================== --- files/patch-cplusplus (revision 0) +++ files/patch-cplusplus (working copy) @@ -0,0 +1,32 @@ +Obtained from MacPorts + +https://trac.macports.org/changeset/115801 + +Submitted upstream by Jeremy Huddleston Sequoia + +http://sourceforge.net/p/ufraw/bugs/365/ + +--- ufraw.h.orig 2014-01-11 11:04:08.000000000 -0800 ++++ ufraw.h 2014-01-11 11:04:54.000000000 -0800 +@@ -41,6 +41,10 @@ + /* An impossible value for conf float values */ + #define NULLF -10000.0 + ++#ifdef __cplusplus ++extern "C" { ++#endif // __cplusplus ++ + /* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled + * are obvious. Apply means that the option was selected and some function + * has to act accourdingly, before changing to one of the first two states */ +@@ -78,10 +82,6 @@ extern UFName ufRawImage; + extern UFName ufRawResources; + extern UFName ufCommandLine; + +-#ifdef __cplusplus +-extern "C" { +-#endif // __cplusplus +- + UFObject *ufraw_image_new(); + #ifdef HAVE_LENSFUN + UFObject *ufraw_lensfun_new(); Property changes on: files/patch-cplusplus ___________________________________________________________________ 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 How-To-Repeat: Try to build ufraw on head with clang-3.4
Responsible Changed From-To: freebsd-ports-bugs->rodrigo Over to maintainer (via the GNATS Auto Assign Tool)
Author: rodrigo Date: Tue Apr 22 13:41:53 2014 New Revision: 351834 URL: http://svnweb.freebsd.org/changeset/ports/351834 QAT: https://qat.redports.org/buildarchive/r351834/ Log: - fix clang issue caused by incorrect namespacing - add dependency - bump portrevision PR: ports/188044 Submitted by: Chris Rees <crees@FreeBSD.org> Approved by: bapt (mentor) Obtained from: Macports MFH: 2014Q2 Added: head/graphics/ufraw/files/patch-ufraw.h (contents, props changed) Modified: head/graphics/ufraw/Makefile Modified: head/graphics/ufraw/Makefile ============================================================================== --- head/graphics/ufraw/Makefile Tue Apr 22 13:24:48 2014 (r351833) +++ head/graphics/ufraw/Makefile Tue Apr 22 13:41:53 2014 (r351834) @@ -3,7 +3,7 @@ PORTNAME= ufraw PORTVERSION= 0.19.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -19,7 +19,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules --enable-extras -USES= gettext pkgconfig gmake +USES= gettext pkgconfig gmake desktop-file-utils CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} Added: head/graphics/ufraw/files/patch-ufraw.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ufraw/files/patch-ufraw.h Tue Apr 22 13:41:53 2014 (r351834) @@ -0,0 +1,24 @@ +--- ufraw.h.orig 2014-01-11 11:04:08.000000000 -0800 ++++ ufraw.h 2014-01-11 11:04:54.000000000 -0800 +@@ -41,6 +41,10 @@ + /* An impossible value for conf float values */ + #define NULLF -10000.0 + ++#ifdef __cplusplus ++extern "C" { ++#endif // __cplusplus ++ + /* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled + * are obvious. Apply means that the option was selected and some function + * has to act accourdingly, before changing to one of the first two states */ +@@ -78,10 +82,6 @@ extern UFName ufRawImage; + extern UFName ufRawResources; + extern UFName ufCommandLine; + +-#ifdef __cplusplus +-extern "C" { +-#endif // __cplusplus +- + UFObject *ufraw_image_new(); + #ifdef HAVE_LENSFUN + UFObject *ufraw_lensfun_new(); _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Author: rodrigo Date: Tue Apr 29 20:57:46 2014 New Revision: 352642 URL: http://svnweb.freebsd.org/changeset/ports/352642 QAT: https://qat.redports.org/buildarchive/r352642/ Log: - fix clang issue caused by incorrect namespacing - add dependency - bump portrevision PR: ports/188044 Submitted by: Chris Rees <crees@FreeBSD.org> Approved by: bapt (mentor) Approved by: portmgr (bapt) Obtained from: Macports Added: branches/2014Q2/graphics/ufraw/files/patch-ufraw.h - copied unchanged from r351834, head/graphics/ufraw/files/patch-ufraw.h Modified: branches/2014Q2/graphics/ufraw/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/ufraw/Makefile ============================================================================== --- branches/2014Q2/graphics/ufraw/Makefile Tue Apr 29 20:53:20 2014 (r352641) +++ branches/2014Q2/graphics/ufraw/Makefile Tue Apr 29 20:57:46 2014 (r352642) @@ -3,7 +3,7 @@ PORTNAME= ufraw PORTVERSION= 0.19.2 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -19,7 +19,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules --enable-extras -USES= gettext pkgconfig gmake +USES= gettext pkgconfig gmake desktop-file-utils CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} Copied: branches/2014Q2/graphics/ufraw/files/patch-ufraw.h (from r351834, head/graphics/ufraw/files/patch-ufraw.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/ufraw/files/patch-ufraw.h Tue Apr 29 20:57:46 2014 (r352642, copy of r351834, head/graphics/ufraw/files/patch-ufraw.h) @@ -0,0 +1,24 @@ +--- ufraw.h.orig 2014-01-11 11:04:08.000000000 -0800 ++++ ufraw.h 2014-01-11 11:04:54.000000000 -0800 +@@ -41,6 +41,10 @@ + /* An impossible value for conf float values */ + #define NULLF -10000.0 + ++#ifdef __cplusplus ++extern "C" { ++#endif // __cplusplus ++ + /* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled + * are obvious. Apply means that the option was selected and some function + * has to act accourdingly, before changing to one of the first two states */ +@@ -78,10 +82,6 @@ extern UFName ufRawImage; + extern UFName ufRawResources; + extern UFName ufCommandLine; + +-#ifdef __cplusplus +-extern "C" { +-#endif // __cplusplus +- + UFObject *ufraw_image_new(); + #ifdef HAVE_LENSFUN + UFObject *ufraw_lensfun_new(); _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"