From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E963813888F for ; Sun, 4 Oct 2015 21:07:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7231321C00A; Sun, 4 Oct 2015 21:07:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0E80821C00A for ; Sun, 4 Oct 2015 21:07:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1472B340875 for ; Sun, 4 Oct 2015 21:07:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D543F54D for ; Sun, 4 Oct 2015 21:07:43 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1443992317.51705fa041e00146b4149e757115dbd20f3a161a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/exiv2/exiv2-0.25-r1.ebuild media-gfx/exiv2/exiv2-0.25.ebuild media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch X-VCS-Directories: media-gfx/exiv2/files/ media-gfx/exiv2/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 51705fa041e00146b4149e757115dbd20f3a161a X-VCS-Branch: master Date: Sun, 4 Oct 2015 21:07:43 +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-Archives-Salt: 930f648d-95e4-47dc-bbb6-f6a23e3d2f4d X-Archives-Hash: 5f2596c4a63febc53e57df40a5d31387 commit: 51705fa041e00146b4149e757115dbd20f3a161a Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Oct 4 17:45:46 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Oct 4 20:58:37 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51705fa0 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 + .../exiv2/files/exiv2-0.25-fix-without-zlib.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) 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 252166b..bc2577b 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 0000000..c6d435d --- /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"