Date: Sat, 29 Mar 2014 10:30:12 +0000 (GMT) From: Chris Rees <crees@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/188044: [PATCH] Fix graphics/ufraw with clang-4.4 Message-ID: <20140329103012.A650D5A024@pegasus.bayofrum.net> Resent-Message-ID: <201403291040.s2TAe0s4099124@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188044 >Category: ports >Synopsis: [PATCH] Fix graphics/ufraw with clang-4.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Mar 29 10:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: FreeBSD 9.2-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD pegasus.bayofrum.net 9.2-RELEASE-p2 FreeBSD 9.2-RELEASE-p2 #0 r259640: Fri Dec 20 09:39:16 GMT 2013 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64 >Description: ufraw fails on recent head because of incorrect namespacing, upsetting clang-3.4 >How-To-Repeat: Try to build ufraw on head with clang-3.4 >Fix: --- patch.txt begins here --- 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 --- patch.txt ends here --- -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140329103012.A650D5A024>