[gentoo-commits] proj/kde-sunset:master commit in: kde-apps/libkexiv2/files/, kde-apps/libkexiv2/

[Andreas Sturmlechner]

commit:     20ba04676102f3046057353632426af42da72536
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 16:23:49 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 16:44:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=20ba0467

kde-apps/libkexiv2: Add support for exiv-0.27

Thanks-to: Tommy Yu <y <AT> metatoaster.com>
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/libkexiv2/files/exiv-0.27.patch   | 21 +++++++++++++++++++++
 kde-apps/libkexiv2/libkexiv2-4.14.3.ebuild |  6 ++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/kde-apps/libkexiv2/files/exiv-0.27.patch b/kde-apps/libkexiv2/files/exiv-0.27.patch
new file mode 100644
index 00000000..b82370c8
--- /dev/null
+++ b/kde-apps/libkexiv2/files/exiv-0.27.patch
@@ -0,0 +1,21 @@
+--- libkexiv2/kexiv2_p.h.orig	2018-12-24 08:09:07.000000000 -0800
++++ libkexiv2/kexiv2_p.h	2018-12-24 08:10:00.000000000 -0800
+@@ -85,6 +85,7 @@
+ #include <exiv2/types.hpp>
+ #include <exiv2/exif.hpp>
+ #include <exiv2/xmpsidecar.hpp>
++#include <exiv2/version.hpp>
+ 
+ // Check if Exiv2 support XMP
+ 
+--- libkexiv2/kexiv2exif.cpp.orig	2014-10-06 23:07:22.000000000 -0700
++++ libkexiv2/kexiv2exif.cpp	2018-12-24 08:06:26.000000000 -0800
+@@ -986,7 +986,7 @@
+ 
+         if (pos == d->exifMetadata().end() || pos->count() != 1 || pos->toLong() != 0)
+         {
+-            throw Exiv2::Error(1, "Exif.Image.NewSubfileType missing or not set as main image");
++            throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");
+         }
+ 
+         // Remove sub-IFD tags

diff --git a/kde-apps/libkexiv2/libkexiv2-4.14.3.ebuild b/kde-apps/libkexiv2/libkexiv2-4.14.3.ebuild
index d24a6e11..950ce572 100644
--- a/kde-apps/libkexiv2/libkexiv2-4.14.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,9 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug +xmp"
 
 DEPEND="
-	>=media-gfx/exiv2-0.20:=[xmp=]
+	>=media-gfx/exiv2-0.27:=[xmp=]
 	virtual/jpeg:0
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/exiv-0.27.patch" )