Attachment #243139 for bug #272311

View | Details | Raw Unified | Return to bug 272311 | Differences between

and this patch




PORTNAME=	lensfun
DISTVERSION=	0.2.5-dev
PORTREVISION=	1
CATEGORIES=	graphics
PKGNAMEPREFIX=	gimp-
PKGNAMESUFFIX=	-plugin

BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/exiv2.pc:graphics/exiv2 \
		${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app \
		${LOCALBASE}/libdata/pkgconfig/lensfun.pc:graphics/lensfun

LIB_DEPENDS+=	libatk-1.0.so:accessibility/at-spi2-core \
		libbabl-0.1.so:x11/babl \
		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libgegl-0.4.so:graphics/gegl \
		libgegl-npd-0.4.so:graphics/gegl \
		libharfbuzz.so:print/harfbuzz \
		libjson-glib-1.0.so:devel/json-glib

RUN_DEPENDS:=	${BUILD_DEPENDS}

USES=		compiler:c++11-lang gettext-runtime gmake gnome pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	seebk
GH_PROJECT=	GIMP-Lensfun
GH_TAGNAME=	c5eaf97

USE_GNOME+=	cairo gdkpixbuf2 glib20 gtk20 pango

PLUGIN_DIR?=	libexec/gimp/2.2/plug-ins
PLUGINS=	gimp-lensfun


	@${REINPLACE_CMD} \
		-e 's|gimptool-2.0|${LOCALBASE}/bin/gimptool-2.0|' \
		${WRKSRC}/Makefile
# CCI support has been removed from recent versions of lensfun
	@${REINPLACE_CMD} -e '/CCI/d' ${WRKSRC}/src/gimplensfun.cpp

do-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}




--- src/gimplensfun.cpp.orig	2023-07-02 12:36:07 UTC
+++ src/gimplensfun.cpp
@@ -1034,7 +1034,7 @@ static void process_image (GimpDrawable *drawable) {
 //
 static int read_opts_from_exif(const char *filename) {
 
-    Exiv2::Image::AutoPtr Exiv2image;
+    Exiv2::Image::UniquePtr Exiv2image;
     Exiv2::ExifData exifData;
 
     const lfCamera  **cameras    = 0;
@@ -1062,7 +1062,7 @@ static int read_opts_from_exif(const char *filename) {
             return -1;
         }
     }
-    catch (Exiv2::AnyError& e) {
+    catch (Exiv2::Error& e) {
         if (DEBUG) {
             g_print ("exception on reading data. \n");
         }

Return to bug 272311

Lines 1-5 Link Here

(-)b/graphics/gimp-lensfun-plugin/Makefile (-3 / +14 lines)
1	PORTNAME= lensfun	1	PORTNAME= lensfun
2	DISTVERSION= 0.2.5-dev	2	DISTVERSION= 0.2.5-dev
		3	PORTREVISION= 1
3	CATEGORIES= graphics	4	CATEGORIES= graphics
4	PKGNAMEPREFIX= gimp-	5	PKGNAMEPREFIX= gimp-
5	PKGNAMESUFFIX= -plugin	6	PKGNAMESUFFIX= -plugin
Lines 14-28 LICENSE_FILE= ${WRKSRC}/LICENSE.txt Link Here
14	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/exiv2.pc:graphics/exiv2 \	15	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/exiv2.pc:graphics/exiv2 \
15	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app \	16	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app \
16	${LOCALBASE}/libdata/pkgconfig/lensfun.pc:graphics/lensfun	17	${LOCALBASE}/libdata/pkgconfig/lensfun.pc:graphics/lensfun
		18
		19	LIB_DEPENDS+= libatk-1.0.so:accessibility/at-spi2-core \
		20	libbabl-0.1.so:x11/babl \
		21	libfontconfig.so:x11-fonts/fontconfig \
		22	libfreetype.so:print/freetype2 \
		23	libgegl-0.4.so:graphics/gegl \
		24	libgegl-npd-0.4.so:graphics/gegl \
		25	libharfbuzz.so:print/harfbuzz \
		26	libjson-glib-1.0.so:devel/json-glib
		27
17	RUN_DEPENDS:= ${BUILD_DEPENDS}	28	RUN_DEPENDS:= ${BUILD_DEPENDS}
18		29
19	USES= compiler:c++11-lang gmake pkgconfig	30	USES= compiler:c++11-lang gettext-runtime gmake gnome pkgconfig
20		31
21	USE_GITHUB= yes	32	USE_GITHUB= yes
22	GH_ACCOUNT= seebk	33	GH_ACCOUNT= seebk
23	GH_PROJECT= GIMP-Lensfun	34	GH_PROJECT= GIMP-Lensfun
24	GH_TAGNAME= c5eaf97	35	GH_TAGNAME= c5eaf97
25		36
		37	USE_GNOME+= cairo gdkpixbuf2 glib20 gtk20 pango
		38
26	PLUGIN_DIR?= libexec/gimp/2.2/plug-ins	39	PLUGIN_DIR?= libexec/gimp/2.2/plug-ins
27	PLUGINS= gimp-lensfun	40	PLUGINS= gimp-lensfun
28		41
Lines 35-42 post-patch: Link Here
35	@${REINPLACE_CMD} \	48	@${REINPLACE_CMD} \
36	-e 's\|gimptool-2.0\|${LOCALBASE}/bin/gimptool-2.0\|' \	49	-e 's\|gimptool-2.0\|${LOCALBASE}/bin/gimptool-2.0\|' \
37	${WRKSRC}/Makefile	50	${WRKSRC}/Makefile
38	# CCI support has been removed from recent versions of lensfun
39	@${REINPLACE_CMD} -e '/CCI/d' ${WRKSRC}/src/gimplensfun.cpp
40		51
41	do-install:	52	do-install:
42	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}	53	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}

Added Link Here

(-)b/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp (-1 / +20 lines)
0	-	1	--- src/gimplensfun.cpp.orig 2023-07-02 12:36:07 UTC
		2	+++ src/gimplensfun.cpp
		3	@@ -1034,7 +1034,7 @@ static void process_image (GimpDrawable *drawable) {
		4	//
		5	static int read_opts_from_exif(const char *filename) {
		6
		7	- Exiv2::Image::AutoPtr Exiv2image;
		8	+ Exiv2::Image::UniquePtr Exiv2image;
		9	Exiv2::ExifData exifData;
		10
		11	const lfCamera **cameras = 0;
		12	@@ -1062,7 +1062,7 @@ static int read_opts_from_exif(const char *filename) {
		13	return -1;
		14	}
		15	}
		16	- catch (Exiv2::AnyError& e) {
		17	+ catch (Exiv2::Error& e) {
		18	if (DEBUG) {
		19	g_print ("exception on reading data. \n");
		20	}