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 6F8C91396D9 for ; Mon, 6 Nov 2017 22:41:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4A31E0C9A; Mon, 6 Nov 2017 22:41:36 +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 71064E0C9A for ; Mon, 6 Nov 2017 22:41:36 +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 ACF1834170C for ; Mon, 6 Nov 2017 22:41:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F5449764 for ; Mon, 6 Nov 2017 22:41: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: <1510008074.302c4780e18256bf4a5e33f58665a7d6081f940a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch media-libs/gexiv2/gexiv2-0.10.3.ebuild media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild X-VCS-Directories: media-libs/gexiv2/files/ media-libs/gexiv2/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 302c4780e18256bf4a5e33f58665a7d6081f940a X-VCS-Branch: master Date: Mon, 6 Nov 2017 22:41: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-Archives-Salt: 6ce9a8f4-5190-46ce-9407-71b524f7957a X-Archives-Hash: bc946cab925247ec24801c04306f9253 commit: 302c4780e18256bf4a5e33f58665a7d6081f940a Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 6 22:40:48 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 6 22:41:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302c4780 media-libs/gexiv2: Fix build w/ >=media-gfx/exiv2-0.26 Closes: https://bugs.gentoo.org/636700 Package-Manager: Portage-2.3.13, Repoman-2.3.4 .../gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch | 53 ++++++++++++++++++++++ media-libs/gexiv2/gexiv2-0.10.3.ebuild | 1 + media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild | 1 + 3 files changed, 55 insertions(+) diff --git a/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch b/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch new file mode 100644 index 00000000000..c3fd932e2a2 --- /dev/null +++ b/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch @@ -0,0 +1,53 @@ +From f295c5ce9d0a87ee0c2cc793ca191369e05b7cf1 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Fri, 12 May 2017 19:50:58 +0200 +Subject: iostream: Adapt to new Exiv2 API in 0.26 + +https://bugzilla.gnome.org/show_bug.cgi?id=782449 +--- + gexiv2/gexiv2-stream-io.cpp | 4 ++-- + gexiv2/gexiv2-stream-io.h | 8 +++++++- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp +index 0ae3324..abfb843 100644 +--- a/gexiv2/gexiv2-stream-io.cpp ++++ b/gexiv2/gexiv2-stream-io.cpp +@@ -142,7 +142,7 @@ long StreamIo::tell () const { + return cb->Position (cb->handle); + } + +-long StreamIo::size () const { ++StreamIo::size_type StreamIo::size () const { + return cb->Length (cb->handle); + } + +diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h +index 76621a9..a26f4e6 100644 +--- a/gexiv2/gexiv2-stream-io.h ++++ b/gexiv2/gexiv2-stream-io.h +@@ -25,6 +25,12 @@ public: + + StreamIo (ManagedStreamCallbacks* cb); + ++#if EXIV2_TEST_VERSION(0,26,0) ++ typedef size_t size_type; ++#else ++ typedef long size_type; ++#endif ++ + virtual ~StreamIo (); + virtual int open (); + virtual int close (); +@@ -39,7 +45,7 @@ public: + virtual Exiv2::byte* mmap (bool isWriteable = false); + virtual int munmap (); + virtual long tell () const; +- virtual long size () const; ++ virtual size_type size () const; + virtual bool isopen () const; + virtual int error () const; + virtual bool eof () const; +-- +cgit v0.12 + diff --git a/media-libs/gexiv2/gexiv2-0.10.3.ebuild b/media-libs/gexiv2/gexiv2-0.10.3.ebuild index 6941e825179..4efc11740ce 100644 --- a/media-libs/gexiv2/gexiv2-0.10.3.ebuild +++ b/media-libs/gexiv2/gexiv2-0.10.3.ebuild @@ -30,6 +30,7 @@ DEPEND="${RDEPEND} src_prepare() { xdg_environment_reset tc-export CXX + epatch "${FILESDIR}/${P}-exiv-0.26.patch" } src_configure() { diff --git a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild index 8ba9a36dfba..888a67d1ee9 100644 --- a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild +++ b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild @@ -32,6 +32,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-0.10.5-stdexcept.patch + "${FILESDIR}"/${PN}-0.10.3-exiv-0.26.patch ) src_prepare() {