commit: eefb5b9bd1af103688a7dee4c0db9a7fcee35a3a Author: Uwe Scholz <uwescholz <AT> src <DOT> gnome <DOT> org> AuthorDate: Sun Jul 7 10:10:30 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 7 21:36:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eefb5b9b
gnome-extra/gnome-commander: patch for compiling with exiv2-0.27.1 Closes: https://bugs.gentoo.org/688452 Signed-off-by: Uwe Scholz <uwescholz <AT> src.gnome.org> Closes: https://github.com/gentoo/gentoo/pull/12400 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...mander-1.10.0-exiv2-0.27.1-missing-header.patch | 25 ++++++++++++++++++++++ .../gnome-commander/gnome-commander-1.10.0.ebuild | 3 +++ 2 files changed, 28 insertions(+) diff --git a/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch b/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch new file mode 100644 index 00000000000..01772528c4b --- /dev/null +++ b/gnome-extra/gnome-commander/files/gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch @@ -0,0 +1,25 @@ +From 1f98b4a87df3d68b8dd6a2eef24521db7a4d5c75 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <[email protected]> +Date: Wed, 15 May 2019 18:13:29 +0900 +Subject: [PATCH] Fix compilation error with exiv2 0.27.1 + +Due to the change in https://github.com/Exiv2/exiv2/commit/71498411c19e6b97a24245b5a1a22063c76a972a , +gnome-cmd-tags-exiv2.cc does not compile with exiv2 0.27.1 . + +This commit is to fix the error. +--- + src/tags/gnome-cmd-tags-exiv2.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tags/gnome-cmd-tags-exiv2.cc b/src/tags/gnome-cmd-tags-exiv2.cc +index 807e6f43..e4b269f3 100644 +--- a/src/tags/gnome-cmd-tags-exiv2.cc ++++ b/src/tags/gnome-cmd-tags-exiv2.cc +@@ -33,6 +33,7 @@ + #ifdef HAVE_EXIV2 + #include <exiv2/exif.hpp> + #include <exiv2/image.hpp> ++#include <exiv2/error.hpp> + #endif + + using namespace std; diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild index 87303c532e8..4845978b379 100644 --- a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild +++ b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild @@ -31,6 +31,9 @@ RDEPEND=" pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 ) " + +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1-missing-header.patch" ) + DEPEND=" ${RDEPEND} dev-util/gtk-doc-am
