From crees@bayofrum.net  Sat Mar 29 10:30:26 2014
Return-Path: <crees@bayofrum.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 33035E36
	for <freebsd-gnats-submit@freebsd.org>; Sat, 29 Mar 2014 10:30:26 +0000 (UTC)
Received: from mk-outboundfilter-2.mail.uk.tiscali.com (mk-outboundfilter-2.mail.uk.tiscali.com [212.74.114.38])
	by mx1.freebsd.org (Postfix) with ESMTP id BEDBDFB3
	for <freebsd-gnats-submit@freebsd.org>; Sat, 29 Mar 2014 10:30:25 +0000 (UTC)
Received: from 81-170-77-156.dynamic.dsl.as9105.com (HELO pegasus.bayofrum.net) ([81.170.77.156])
  by smtp.pipex.tiscali.co.uk with ESMTP; 29 Mar 2014 10:30:18 +0000
Received: by pegasus.bayofrum.net (Postfix, from userid 1001)
	id A650D5A024; Sat, 29 Mar 2014 10:30:12 +0000 (GMT)
Message-Id: <20140329103012.A650D5A024@pegasus.bayofrum.net>
Date: Sat, 29 Mar 2014 10:30:12 +0000 (GMT)
From: Chris Rees <crees@FreeBSD.org>
Reply-To: Chris Rees <crees@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Fix graphics/ufraw with clang-4.4
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         188044
>Category:       ports
>Synopsis:       [PATCH] Fix graphics/ufraw with clang-4.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rodrigo
>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:  Tue Apr 29 21:00:01 UTC 2014
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->rodrigo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Mar 29 10:40:04 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=188044 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/188044: commit references a PR
Date: Tue, 22 Apr 2014 13:41:57 +0000 (UTC)

 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/188044: commit references a PR
Date: Tue, 29 Apr 2014 20:57:50 +0000 (UTC)

 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"
 
>Unformatted:
