diff options
author | Pacho Ramos <pacho@gentoo.org> | 2018-06-26 20:57:32 +0200 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2018-06-26 21:04:15 +0200 |
commit | aa850d00e39b33eb6a46ef0ccc44a6ba5f0eebed (patch) | |
tree | 188828612ecd226fb02265718b5e3785ad5ca709 /media-libs/gexiv2/files | |
parent | media-libs/gexiv2: Support python3.6 (diff) | |
download | gentoo-aa850d00e39b33eb6a46ef0ccc44a6ba5f0eebed.tar.gz gentoo-aa850d00e39b33eb6a46ef0ccc44a6ba5f0eebed.tar.bz2 gentoo-aa850d00e39b33eb6a46ef0ccc44a6ba5f0eebed.zip |
media-libs/gexiv2: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'media-libs/gexiv2/files')
-rw-r--r-- | media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch | 53 | ||||
-rw-r--r-- | media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch | 11 |
2 files changed, 0 insertions, 64 deletions
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 deleted file mode 100644 index c3fd932e2a21..000000000000 --- a/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f295c5ce9d0a87ee0c2cc793ca191369e05b7cf1 Mon Sep 17 00:00:00 2001 -From: Jens Georg <mail@jensge.org> -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/files/gexiv2-0.10.5-stdexcept.patch b/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch deleted file mode 100644 index dc9c5825b90e..000000000000 --- a/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur gexiv2-0.10.5/gexiv2/gexiv2-metadata-gps.cpp gexiv2-0.10.5b/gexiv2/gexiv2-metadata-gps.cpp ---- gexiv2-0.10.5/gexiv2/gexiv2-metadata-gps.cpp 2017-03-19 18:00:55.000000000 +0100 -+++ gexiv2-0.10.5b/gexiv2/gexiv2-metadata-gps.cpp 2017-03-26 09:45:44.638692802 +0200 -@@ -12,6 +12,7 @@ - #include "gexiv2-metadata-private.h" - #include <string> - #include <cmath> -+#include <stdexcept> - #include <stdio.h> - #include <glib-object.h> - #include <exiv2/exif.hpp> |