CVS commit: pkgsrc/devel/libextractor

["ng0" <ng0%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ng0
Date:           Fri Aug 23 11:02:30 UTC 2019

Modified Files:
        pkgsrc/devel/libextractor: Makefile distinfo
Added Files:
        pkgsrc/devel/libextractor/patches: patch-exiv2-fix

Log Message:
devel/libextractor: Add patch to fix build with exiv2, revbump


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/devel/libextractor/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/libextractor/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libextractor/patches/patch-exiv2-fix

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libextractor/Makefile
diff -u pkgsrc/devel/libextractor/Makefile:1.80 pkgsrc/devel/libextractor/Makefile:1.81
--- pkgsrc/devel/libextractor/Makefile:1.80     Sun Jul 21 22:24:00 2019
+++ pkgsrc/devel/libextractor/Makefile  Fri Aug 23 11:02:30 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2019/07/21 22:24:00 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2019/08/23 11:02:30 ng0 Exp $
 
 DISTNAME=      libextractor-1.9
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=libextractor/}
 

Index: pkgsrc/devel/libextractor/distinfo
diff -u pkgsrc/devel/libextractor/distinfo:1.26 pkgsrc/devel/libextractor/distinfo:1.27
--- pkgsrc/devel/libextractor/distinfo:1.26     Tue Feb 19 00:09:21 2019
+++ pkgsrc/devel/libextractor/distinfo  Fri Aug 23 11:02:30 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.26 2019/02/19 00:09:21 gdt Exp $
+$NetBSD: distinfo,v 1.27 2019/08/23 11:02:30 ng0 Exp $
 
 SHA1 (libextractor-1.9.tar.gz) = d66e54e51cd97814d55f07825ea1bfdf93d67fea
 RMD160 (libextractor-1.9.tar.gz) = 629ae88a017db0b3ab7f645742ba98c2ea05d9e4
 SHA512 (libextractor-1.9.tar.gz) = c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149
 Size (libextractor-1.9.tar.gz) = 8323852 bytes
+SHA1 (patch-exiv2-fix) = 135294d0cf51070a37bc9fdffc2181b9dd20907f

Added files:

Index: pkgsrc/devel/libextractor/patches/patch-exiv2-fix
diff -u /dev/null pkgsrc/devel/libextractor/patches/patch-exiv2-fix:1.1
--- /dev/null   Fri Aug 23 11:02:30 2019
+++ pkgsrc/devel/libextractor/patches/patch-exiv2-fix   Fri Aug 23 11:02:30 2019
@@ -0,0 +1,127 @@
+Partial pick from upstream commit 1ecee9a47717e36cb8a3925d011d1a6de11d631c:
+importing patch from Gentoo/AS to address exiv2 build issue (#5820)
+
+--- AUTHORS~
++++ AUTHORS
+@@ -4,6 +4,7 @@ LRN <lrn1986%gmail.com@localhost>
+ 
+ Developers:
+ Andreas Huggel <ahuggel%gmx.net@localhost>
++Andreas Strumlechner <andreas.sturmlechner%gmail.com@localhost>
+ Blake Matheny <bmatheny%mobocracy.net@localhost>
+ Bruno Cabral <bcabral%uw.edu@localhost>
+ Bruno Haible <bruno%clisp.org@localhost>
+
+--- src/plugins/exiv2_extractor.cc~
++++ 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));