From 51705fa041e00146b4149e757115dbd20f3a161a Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 4 Oct 2015 19:45:46 +0200 Subject: [PATCH] media-gfx/exiv2: Fix header if USE=-png Fixed upstream in >=0.26 See also: http://dev.exiv2.org/issues/1103 Gentoo bug 1: https://bugs.gentoo.org/show_bug.cgi?id=552046 Gentoo bug 2: https://bugs.gentoo.org/show_bug.cgi?id=535836 Package-Manager: portage-2.2.20.1 --- ...exiv2-0.25.ebuild => exiv2-0.25-r1.ebuild} | 1 + .../files/exiv2-0.25-fix-without-zlib.patch | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) rename media-gfx/exiv2/{exiv2-0.25.ebuild => exiv2-0.25-r1.ebuild} (98%) create mode 100644 media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch diff --git a/media-gfx/exiv2/exiv2-0.25.ebuild b/media-gfx/exiv2/exiv2-0.25-r1.ebuild similarity index 98% rename from media-gfx/exiv2/exiv2-0.25.ebuild rename to media-gfx/exiv2/exiv2-0.25-r1.ebuild index 252166be13e5..bc2577b81ba2 100644 --- a/media-gfx/exiv2/exiv2-0.25.ebuild +++ b/media-gfx/exiv2/exiv2-0.25-r1.ebuild @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.25-fix-docs.patch" "${FILESDIR}/${PN}-0.25-fix-install-dirs.patch" "${FILESDIR}/${PN}-0.25-tools-optional.patch" + "${FILESDIR}/${PN}-0.25-fix-without-zlib.patch" ) pkg_setup() { diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch new file mode 100644 index 000000000000..c6d435d68bb8 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch @@ -0,0 +1,22 @@ +Fix exiv2.hpp if built with PNG support disabled (--without-zlib) + +Fixed upstream in >=0.26 + +See also: http://dev.exiv2.org/issues/1103 +Gentoo bug 1: https://bugs.gentoo.org/show_bug.cgi?id=552046 +Gentoo bug 2: https://bugs.gentoo.org/show_bug.cgi?id=535836 + +Index: exiv2.hpp +=================================================================== +--- a/include/exiv2/exiv2.hpp (revision 3887) ++++ b/include/exiv2/exiv2.hpp (revision 3888) +@@ -52,7 +52,9 @@ + #include "mrwimage.hpp" + #include "orfimage.hpp" + #include "pgfimage.hpp" ++#ifdef EXV_HAVE_LIBZ + #include "pngimage.hpp" ++#endif + #include "preview.hpp" + #include "properties.hpp" + #include "psdimage.hpp" -- 2.26.2