| 1 |
commit: 302c4780e18256bf4a5e33f58665a7d6081f940a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 6 22:40:48 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 6 22:41:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302c4780 |
| 7 |
|
| 8 |
media-libs/gexiv2: Fix build w/ >=media-gfx/exiv2-0.26 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/636700 |
| 11 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 12 |
|
| 13 |
.../gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch | 53 ++++++++++++++++++++++ |
| 14 |
media-libs/gexiv2/gexiv2-0.10.3.ebuild | 1 + |
| 15 |
media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild | 1 + |
| 16 |
3 files changed, 55 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..c3fd932e2a2 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch |
| 23 |
@@ -0,0 +1,53 @@ |
| 24 |
+From f295c5ce9d0a87ee0c2cc793ca191369e05b7cf1 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Jens Georg <mail@××××××.org> |
| 26 |
+Date: Fri, 12 May 2017 19:50:58 +0200 |
| 27 |
+Subject: iostream: Adapt to new Exiv2 API in 0.26 |
| 28 |
+ |
| 29 |
+https://bugzilla.gnome.org/show_bug.cgi?id=782449 |
| 30 |
+--- |
| 31 |
+ gexiv2/gexiv2-stream-io.cpp | 4 ++-- |
| 32 |
+ gexiv2/gexiv2-stream-io.h | 8 +++++++- |
| 33 |
+ 2 files changed, 9 insertions(+), 3 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp |
| 36 |
+index 0ae3324..abfb843 100644 |
| 37 |
+--- a/gexiv2/gexiv2-stream-io.cpp |
| 38 |
++++ b/gexiv2/gexiv2-stream-io.cpp |
| 39 |
+@@ -142,7 +142,7 @@ long StreamIo::tell () const { |
| 40 |
+ return cb->Position (cb->handle); |
| 41 |
+ } |
| 42 |
+ |
| 43 |
+-long StreamIo::size () const { |
| 44 |
++StreamIo::size_type StreamIo::size () const { |
| 45 |
+ return cb->Length (cb->handle); |
| 46 |
+ } |
| 47 |
+ |
| 48 |
+diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h |
| 49 |
+index 76621a9..a26f4e6 100644 |
| 50 |
+--- a/gexiv2/gexiv2-stream-io.h |
| 51 |
++++ b/gexiv2/gexiv2-stream-io.h |
| 52 |
+@@ -25,6 +25,12 @@ public: |
| 53 |
+ |
| 54 |
+ StreamIo (ManagedStreamCallbacks* cb); |
| 55 |
+ |
| 56 |
++#if EXIV2_TEST_VERSION(0,26,0) |
| 57 |
++ typedef size_t size_type; |
| 58 |
++#else |
| 59 |
++ typedef long size_type; |
| 60 |
++#endif |
| 61 |
++ |
| 62 |
+ virtual ~StreamIo (); |
| 63 |
+ virtual int open (); |
| 64 |
+ virtual int close (); |
| 65 |
+@@ -39,7 +45,7 @@ public: |
| 66 |
+ virtual Exiv2::byte* mmap (bool isWriteable = false); |
| 67 |
+ virtual int munmap (); |
| 68 |
+ virtual long tell () const; |
| 69 |
+- virtual long size () const; |
| 70 |
++ virtual size_type size () const; |
| 71 |
+ virtual bool isopen () const; |
| 72 |
+ virtual int error () const; |
| 73 |
+ virtual bool eof () const; |
| 74 |
+-- |
| 75 |
+cgit v0.12 |
| 76 |
+ |
| 77 |
|
| 78 |
diff --git a/media-libs/gexiv2/gexiv2-0.10.3.ebuild b/media-libs/gexiv2/gexiv2-0.10.3.ebuild |
| 79 |
index 6941e825179..4efc11740ce 100644 |
| 80 |
--- a/media-libs/gexiv2/gexiv2-0.10.3.ebuild |
| 81 |
+++ b/media-libs/gexiv2/gexiv2-0.10.3.ebuild |
| 82 |
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND} |
| 83 |
src_prepare() { |
| 84 |
xdg_environment_reset |
| 85 |
tc-export CXX |
| 86 |
+ epatch "${FILESDIR}/${P}-exiv-0.26.patch" |
| 87 |
} |
| 88 |
|
| 89 |
src_configure() { |
| 90 |
|
| 91 |
diff --git a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild |
| 92 |
index 8ba9a36dfba..888a67d1ee9 100644 |
| 93 |
--- a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild |
| 94 |
+++ b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild |
| 95 |
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND} |
| 96 |
|
| 97 |
PATCHES=( |
| 98 |
"${FILESDIR}"/${PN}-0.10.5-stdexcept.patch |
| 99 |
+ "${FILESDIR}"/${PN}-0.10.3-exiv-0.26.patch |
| 100 |
) |
| 101 |
|
| 102 |
src_prepare() { |
Archives