FreeBSD Bugzilla – Attachment 243158 Details for
Bug 272311
graphics/exiv2: upgrade to v0.28
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
graphics/viewnior: make compatible with exiv2 0.28
0005-graphics-viewnior-make-compatible-with-exiv2-0.28.patch (text/plain), 2.95 KB, created by
Matthias Andree
on 2023-07-02 22:17:14 UTC
(
hide
)
Description:
graphics/viewnior: make compatible with exiv2 0.28
Filename:
MIME Type:
Creator:
Matthias Andree
Created:
2023-07-02 22:17:14 UTC
Size:
2.95 KB
patch
obsolete
>From c57678a7f03d423244e2e7d699cda5afd3e241f0 Mon Sep 17 00:00:00 2001 >From: Matthias Andree <mandree@FreeBSD.org> >Date: Mon, 3 Jul 2023 00:01:06 +0200 >Subject: [PATCH 5/7] graphics/viewnior: make compatible with exiv2 0.28 > >PR: 272311 >--- > graphics/viewnior/Makefile | 2 +- > .../viewnior/files/patch-src_uni-exiv2.cpp | 63 +++++++++++++++++++ > 2 files changed, 64 insertions(+), 1 deletion(-) > create mode 100644 graphics/viewnior/files/patch-src_uni-exiv2.cpp > >diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile >index 0f9f8be8716d..b83909ce7860 100644 >--- a/graphics/viewnior/Makefile >+++ b/graphics/viewnior/Makefile >@@ -1,7 +1,7 @@ > PORTNAME= viewnior > DISTVERSIONPREFIX= ${PORTNAME}- > DISTVERSION= 1.8 >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= graphics > > MAINTAINER= eduardo@FreeBSD.org >diff --git a/graphics/viewnior/files/patch-src_uni-exiv2.cpp b/graphics/viewnior/files/patch-src_uni-exiv2.cpp >new file mode 100644 >index 000000000000..47456b5f246b >--- /dev/null >+++ b/graphics/viewnior/files/patch-src_uni-exiv2.cpp >@@ -0,0 +1,63 @@ >+--- src/uni-exiv2.cpp.orig 2021-11-21 14:49:46 UTC >++++ src/uni-exiv2.cpp >+@@ -27,7 +27,7 @@ >+ >+ #define ARRAY_SIZE(array) (sizeof array/sizeof(array[0])) >+ >+-static Exiv2::Image::AutoPtr cached_image; >++static Exiv2::Image::UniquePtr cached_image; >+ >+ extern "C" >+ void >+@@ -35,7 +35,7 @@ uni_read_exiv2_map(const char *uri, void (*callback)(c >+ { >+ Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute); >+ try { >+- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri); >++ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(uri) }; >+ if ( image.get() == 0 ) { >+ return; >+ } >+@@ -80,7 +80,7 @@ uni_read_exiv2_map(const char *uri, void (*callback)(c >+ } >+ } >+ } >+- } catch (Exiv2::AnyError& e) { >++ } catch (Exiv2::Error& e) { >+ std::cerr << "Exiv2: '" << e << "'\n"; >+ } >+ } >+@@ -97,13 +97,13 @@ uni_read_exiv2_to_cache(const char *uri) >+ } >+ >+ try { >+- cached_image = Exiv2::ImageFactory::open(uri); >++ cached_image = std::move(Exiv2::ImageFactory::open(uri)); >+ if ( cached_image.get() == 0 ) { >+ return 1; >+ } >+ >+ cached_image->readMetadata(); >+- } catch (Exiv2::AnyError& e) { >++ } catch (Exiv2::Error& e) { >+ std::cerr << "Exiv2: '" << e << "'\n"; >+ } >+ >+@@ -121,7 +121,7 @@ uni_write_exiv2_from_cache(const char *uri) >+ } >+ >+ try { >+- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri); >++ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(uri) }; >+ if ( image.get() == 0 ) { >+ return 2; >+ } >+@@ -133,7 +133,7 @@ uni_write_exiv2_from_cache(const char *uri) >+ cached_image.reset(NULL); >+ >+ return 0; >+- } catch (Exiv2::AnyError& e) { >++ } catch (Exiv2::Error& e) { >+ std::cerr << "Exiv2: '" << e << "'\n"; >+ } >+ >-- >2.41.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
eduardo
:
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