Attachment 243156 Details for Bug 272311 – deskutils/pinot: make compatible with exiv2 0.28

[patch] deskutils/pinot: make compatible with exiv2 0.28

0003-deskutils-pinot-make-compatible-with-exiv2-0.28.patch (text/plain), 1.74 KB, created by Matthias Andree on 2023-07-02 22:14:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2023-07-02 22:14:59 UTC

Size: 1.74 KB

patch

obsolete

>From 26e9d3e25f12ae2f33c5da76746de3b20ec34979 Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Sun, 2 Jul 2023 23:47:18 +0200
>Subject: [PATCH 3/7] deskutils/pinot: make compatible with exiv2 0.28
>
>PR:		272311
>---
> deskutils/pinot/Makefile                      |  2 +-
> ...patch-Tokenize_filters_Exiv2ImageFilter.cc | 20 +++++++++++++++++++
> 2 files changed, 21 insertions(+), 1 deletion(-)
> create mode 100644 deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc
>
>diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
>index 43e07259ea10..1a67b04c177f 100644
>--- a/deskutils/pinot/Makefile
>+++ b/deskutils/pinot/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	pinot
> PORTVERSION=	1.21
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	deskutils
> 
> MAINTAINER=	thierry@FreeBSD.org
>diff --git a/deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc b/deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc
>new file mode 100644
>index 000000000000..6feb36bc6a12
>--- /dev/null
>+++ b/deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc
>@@ -0,0 +1,20 @@
>+--- Tokenize/filters/Exiv2ImageFilter.cc.orig	2022-02-22 20:31:11 UTC
>++++ Tokenize/filters/Exiv2ImageFilter.cc
>+@@ -236,7 +236,7 @@ bool Exiv2ImageFilter::next_document(void)
>+ 
>+ 	try
>+ 	{
>+-		Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(m_filePath);
>++		Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(m_filePath) };
>+ 		if (image.get() == NULL)
>+ 		{
>+ 			clog << m_filePath.c_str() << " is not an image" << endl;
>+@@ -388,7 +388,7 @@ bool Exiv2ImageFilter::next_document(void)
>+ 			}
>+ 		}
>+ 	}
>+-	catch (Exiv2::AnyError &e)
>++	catch (Exiv2::Error &e)
>+ 	{
>+ 		clog << "Caught exiv2 exception: " << e << endl;
>+ 		foundData = false;
>-- 
>2.41.0
>

Flags:

thierry: 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