- fix building with exiv2 0.26

- rel 11

diff --git a/exiv2-types.patch b/exiv2-types.patch
new file mode 100644 (file)
index 0000000..788a0aa
--- /dev/null
+++ b/exiv2-types.patch
@@ -0,0 +1,20 @@
+--- libextractor-1.3/src/plugins/exiv2_extractor.cc.orig       2013-06-25 13:02:05.000000000 +0200
++++ libextractor-1.3/src/plugins/exiv2_extractor.cc    2017-10-01 16:48:54.189104795 +0200
+@@ -180,7 +180,7 @@
+    *
+    * @return -1 on error
+    */
+-  virtual long int size (void) const;
++  virtual size_t size (void) const;
+ 
+   /**
+    * Check if file is open.
+@@ -445,7 +445,7 @@
+  *
+  * @return -1 on error
+  */
+-long int 
++size_t
+ ExtractorIO::size (void) const
+ {
+   return (long) ec->get_size (ec->cls);

diff --git a/libextractor.spec b/libextractor.spec
index f7d3bcc8f52139d78e6c0ab2507fc6b797110e98..b0ef748f12ad1a2005769966cd04e7da70877bb2 100644 (file)
--- 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.3
-Release:       10
+Release:       11
 License:       GPL v3+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@ Patch1:               %{name}-rpm5.patch
 Patch2:                %{name}-pl.po-update.patch
 Patch3:                %{name}-giflib.patch
 Patch4:                ffmpeg3.patch
+Patch5:                exiv2-types.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.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__rm} po/stamp-po
 %{__sed} -i -e 's,tidy/\(tidy\|buffio\)\.h,\1.h,' configure.ac src/plugins/html_extractor.c