diff options
| author | rodrigo <rodrigo@FreeBSD.org> | 2014-04-22 21:41:53 +0800 |
|---|---|---|
| committer | rodrigo <rodrigo@FreeBSD.org> | 2014-04-22 21:41:53 +0800 |
| commit | 2c710ce3efe1f60e5a50a171efd43141dcb684a7 (patch) | |
| tree | 72a14b82f799574d853f7fe5909d41874f2f391a /graphics/ufraw | |
| parent | 7ddb326ed4186c72001f4f55ebcea3be624a1bfa (diff) | |
| download | freebsd-ports-gnome-2c710ce3efe1f60e5a50a171efd43141dcb684a7.tar.gz freebsd-ports-gnome-2c710ce3efe1f60e5a50a171efd43141dcb684a7.tar.zst freebsd-ports-gnome-2c710ce3efe1f60e5a50a171efd43141dcb684a7.zip | |
- 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
Diffstat (limited to 'graphics/ufraw')
| -rw-r--r-- | graphics/ufraw/Makefile | 4 | ||||
| -rw-r--r-- | graphics/ufraw/files/patch-ufraw.h | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index b0d6a2acb1b7..c96addd6c4bf 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -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}/graphics/jpeg \ 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} diff --git a/graphics/ufraw/files/patch-ufraw.h b/graphics/ufraw/files/patch-ufraw.h new file mode 100644 index 000000000000..445d4180ffc4 --- /dev/null +++ b/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(); |