diff options
author | Jan Rękorajski | 2019-02-11 20:53:57 (GMT) |
---|---|---|
committer | Jan Rękorajski | 2019-02-11 20:53:57 (GMT) |
commit | ad7d970c9b2de6536bab288f80e0cf7e54240ff1 (patch) | |
tree | 5db705b9deeeb8eb78f2370e9726dcd08ce52558 | |
parent | 5ba3dc5f23637695399729029194f0118ca8f471 (diff) | |
download | libextractor-ad7d970c9b2de6536bab288f80e0cf7e54240ff1.zip libextractor-ad7d970c9b2de6536bab288f80e0cf7e54240ff1.tar.gz |
- fix building with exiv2 0.27auto/th/libextractor-1.8-2
- rel 2
-rw-r--r-- | exiv2-0.27.patch | 127 | ||||
-rw-r--r-- | libextractor.spec | 4 |
2 files changed, 130 insertions, 1 deletions
diff --git a/exiv2-0.27.patch b/exiv2-0.27.patch new file mode 100644 index 0000000..cfdb642 --- /dev/null +++ b/exiv2-0.27.patch @@ -0,0 +1,127 @@ +From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 30 Dec 2018 00:46:57 +0100 +Subject: [PATCH] Fix build with exiv2-0.27 + +--- + src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++------- + 1 file changed, 28 insertions(+), 7 deletions(-) + +diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc +index 8741d40..ef402a8 100644 +--- a/src/plugins/exiv2_extractor.cc ++++ b/src/plugins/exiv2_extractor.cc +@@ -27,10 +27,7 @@ + #include <cassert> + #include <cstring> + #include <math.h> +-#include <exiv2/exif.hpp> +-#include <exiv2/error.hpp> +-#include <exiv2/image.hpp> +-#include <exiv2/futils.hpp> ++#include <exiv2/exiv2.hpp> + + /** + * Enable debugging to get error messages. +@@ -180,7 +177,7 @@ public: + * + * @return -1 on error + */ +-#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) ++#if EXIV2_TEST_VERSION(0,26,0) + virtual size_t size (void) const; + #else + virtual long int size (void) const; +@@ -316,7 +313,11 @@ ExtractorIO::getb () + const unsigned char *r; + + if (1 != ec->read (ec->cls, &data, 1)) ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + r = (const unsigned char *) data; + return *r; + } +@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) + void + ExtractorIO::transfer (Exiv2::BasicIo& src) + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + + +@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, + Exiv2::byte * + ExtractorIO::mmap (bool isWritable) + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + + +@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const + * + * @return -1 on error + */ +-#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) ++#if EXIV2_TEST_VERSION(0,26,0) + size_t + #else + long int +@@ -504,7 +513,11 @@ ExtractorIO::eof () const + std::string + ExtractorIO::path () const + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + + +@@ -517,7 +530,11 @@ ExtractorIO::path () const + std::wstring + ExtractorIO::wpath () const + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + #endif + +@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr + ExtractorIO::temporary () const + { + fprintf (stderr, "throwing temporary error\n"); ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + + +@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec) + { + try + { +-#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION ++#if !EXIV2_TEST_VERSION(0,24,0) + Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); + #endif + std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec)); +-- +2.20.1 + diff --git a/libextractor.spec b/libextractor.spec index 2ba3dec..aadb0d0 100644 --- a/libextractor.spec +++ b/libextractor.spec @@ -10,7 +10,7 @@ Summary: Meta-data extraction library Summary(pl.UTF-8): Biblioteka do ekstrakcji metadanych Name: libextractor Version: 1.8 -Release: 1 +Release: 2 License: GPL v3+ Group: Libraries Source0: http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ Source0: http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz Patch0: %{name}-info.patch Patch1: %{name}-rpm5.patch Patch2: %{name}-pl.po-update.patch +Patch3: exiv2-0.27.patch URL: http://www.gnu.org/software/libextractor/ BuildRequires: autoconf >= 2.61 BuildRequires: automake >= 1:1.11 @@ -166,6 +167,7 @@ Statyczna wersja bibliotek libextractor. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %{__rm} po/stamp-po |