Attachment 243139 Details for Bug 272311 – graphics/gimp-lensfun-plugin: make compatible with exiv2 0.28

[patch] graphics/gimp-lensfun-plugin: make compatible with exiv2 0.28

0010-graphics-gimp-lensfun-plugin-make-compatible-with-ex.patch (text/plain), 3.02 KB, created by Matthias Andree on 2023-07-02 14:54:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2023-07-02 14:54:53 UTC

Size: 3.02 KB

patch

obsolete

>From cc2d103a3baf11eda286f1567937b25904b1907c Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Sun, 2 Jul 2023 14:49:16 +0200
>Subject: [PATCH 10/20] graphics/gimp-lensfun-plugin: make compatible with
> exiv2 0.28
>
>PR:		272311
>---
> graphics/gimp-lensfun-plugin/Makefile         | 17 +++++++++++++---
> .../files/patch-src_gimplensfun.cpp           | 20 +++++++++++++++++++
> 2 files changed, 34 insertions(+), 3 deletions(-)
> create mode 100644 graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp
>
>diff --git a/graphics/gimp-lensfun-plugin/Makefile b/graphics/gimp-lensfun-plugin/Makefile
>index b62db7ac5dcf..f49759bd0d6c 100644
>--- a/graphics/gimp-lensfun-plugin/Makefile
>+++ b/graphics/gimp-lensfun-plugin/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	lensfun
> DISTVERSION=	0.2.5-dev
>+PORTREVISION=	1
> CATEGORIES=	graphics
> PKGNAMEPREFIX=	gimp-
> PKGNAMESUFFIX=	-plugin
>@@ -14,15 +15,27 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 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 gmake pkgconfig
>+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
> 
>@@ -35,8 +48,6 @@ post-patch:
> 	@${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}
>diff --git a/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp b/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp
>new file mode 100644
>index 000000000000..a095cdab410b
>--- /dev/null
>+++ b/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp
>@@ -0,0 +1,20 @@
>+--- 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");
>+         }
>-- 
>2.41.0
>

Flags:

fluffy: maintainer-approval+

Actions: View | Diff

Attachments on bug 272311: 243098 | 243100 | 243103 | 243104 | 243106 | 243111 | 243124 | 243125 | 243135 | 243136 | 243137 | 243138 | 243139 | 243140 | 243141 | 243142 | 243143 | 243144 | 243145 | 243146 | 243147 | 243148 | 243154 | 243155 | 243156 | 243157 | 243158 | 243159 | 243160 | 243166 | 243167 | 243168 | 243169 | 243170 | 243171 | 243172 | 243175 | 243176