From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E5A6138334 for ; Thu, 10 Jan 2019 21:54:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74DBAE097E; Thu, 10 Jan 2019 21:54:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2EEB7E097C for ; Thu, 10 Jan 2019 21:54:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98007335D0F for ; Thu, 10 Jan 2019 21:54:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98FF750E for ; Thu, 10 Jan 2019 21:54:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1547157249.b9c04877a81a1355e6ef3b75129374734f4ed842.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch media-gfx/geeqie/geeqie-1.4-r1.ebuild X-VCS-Directories: media-gfx/geeqie/ media-gfx/geeqie/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b9c04877a81a1355e6ef3b75129374734f4ed842 X-VCS-Branch: master Date: Thu, 10 Jan 2019 21:54:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f64d2b39-4deb-44b6-bc55-e7a5e24e1084 X-Archives-Hash: 1a5d0cefbf0840d0b96bdf21a4734527 commit: b9c04877a81a1355e6ef3b75129374734f4ed842 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 9 21:22:04 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 10 21:54:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c04877 media-gfx/geeqie: Fix build with exiv2-0.27 Patch is already upstream, see also: https://github.com/BestImageViewer/geeqie/issues/654 Closes: https://bugs.gentoo.org/674044 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch | 80 ++++++++++++++++++++++ media-gfx/geeqie/geeqie-1.4-r1.ebuild | 4 +- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch new file mode 100644 index 00000000000..b9a3bde0db2 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch @@ -0,0 +1,80 @@ +From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen +Date: Wed, 2 Jan 2019 01:04:45 +0100 +Subject: [PATCH] fix build against exiv2-0.27.x + +fixes #654 +--- + src/exiv2.cc | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/exiv2.cc b/src/exiv2.cc +index b3c80657..f40b725e 100644 +--- a/src/exiv2.cc ++++ b/src/exiv2.cc +@@ -22,17 +22,27 @@ + + #ifdef HAVE_EXIV2 + ++// Don't include the file directly ++// Early Exiv2 versions didn't have version.hpp and the macros. ++#include + #include + #include + #include + #include + + // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. ++#ifdef EXIV2_VERSION + #ifndef EXIV2_TEST_VERSION +-# define EXIV2_TEST_VERSION(major,minor,patch) \ ++#define EXIV2_TEST_VERSION(major,minor,patch) \ + ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) + #endif ++#else ++#define EXIV2_TEST_VERSION(major,minor,patch) (false) ++#endif + ++#if EXIV2_TEST_VERSION(0,27,0) ++#define HAVE_EXIV2_ERROR_CODE ++#endif + + #include + #include +@@ -40,6 +50,10 @@ + #include + #include + ++#if EXIV2_TEST_VERSION(0,27,0) ++#define EXV_PACKAGE "exiv2" ++#endif ++ + #if !EXIV2_TEST_VERSION(0,17,90) + #include + #include +@@ -374,7 +388,11 @@ + #endif + Exiv2::Image *image = imageData_->image(); + +- if (!image) Exiv2::Error(21); ++#ifdef HAVE_EXIV2_ERROR_CODE ++ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); ++#else ++ if (!image) throw Exiv2::Error(21); ++#endif + image->setExifData(exifData_); + image->setIptcData(iptcData_); + #if EXIV2_TEST_VERSION(0,16,0) +@@ -394,8 +412,12 @@ + sidecar->setXmpData(xmpData_); + sidecar->writeMetadata(); + #else ++#ifdef HAVE_EXIV2_ERROR_CODE ++ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp"); ++#else + throw Exiv2::Error(3, "xmp"); + #endif ++#endif + } + } + diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild index 3080dded12b..a503145669b 100644 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,6 +35,8 @@ DEPEND="${RDEPEND} REQUIRED_USE="gpu-accel? ( gtk3 ) map? ( gpu-accel )" +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674044 + src_prepare() { default