CVS commit: pkgsrc/graphics/exiv2

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Oct 25 09:44:26 UTC 2019

Modified Files:
        pkgsrc/graphics/exiv2: distinfo
        pkgsrc/graphics/exiv2/patches: patch-src_convert.cpp
Added Files:
        pkgsrc/graphics/exiv2/patches: patch-cmake_config.h.cmake

Log Message:
exiv2: Fix build on NetBSD 9.99.17

Adapt the local patch for the POSIX iconv(3) API change in new NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/exiv2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp

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

Modified files:

Index: pkgsrc/graphics/exiv2/distinfo
diff -u pkgsrc/graphics/exiv2/distinfo:1.31 pkgsrc/graphics/exiv2/distinfo:1.32
--- pkgsrc/graphics/exiv2/distinfo:1.31 Wed Jul 31 09:16:26 2019
+++ pkgsrc/graphics/exiv2/distinfo      Fri Oct 25 09:44:26 2019
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.31 2019/07/31 09:16:26 nia Exp $
+$NetBSD: distinfo,v 1.32 2019/10/25 09:44:26 kamil Exp $
 
 SHA1 (exiv2-0.27.2-Source.tar.gz) = 1a72065c95e721b1c21df4f2ee64d8338c6acf94
 RMD160 (exiv2-0.27.2-Source.tar.gz) = d19c3f29fc5e9637339a9f39c1a4539fc85b1d36
 SHA512 (exiv2-0.27.2-Source.tar.gz) = 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
 Size (exiv2-0.27.2-Source.tar.gz) = 27591236 bytes
+SHA1 (patch-cmake_config.h.cmake) = b7e0336e5ca55a9df08958a05d8ac2a2c800e836
 SHA1 (patch-contrib_organize_Makefile) = 27348fdb0f80092b6e16f27e3ac1dca988eefe70
 SHA1 (patch-contrib_organize_helpers.cpp) = ec003c826d463b3e7e571ab4c41baffaca1240e9
 SHA1 (patch-include_exiv2_types.hpp) = 829e101c1c5f06de0a497b8c6a052b0a4e667d25
-SHA1 (patch-src_convert.cpp) = f97eb7ae6c6a23a38451618e484287f899058c86
+SHA1 (patch-src_convert.cpp) = b600c1f6f6bf3ac6323ef51203603b248f9c0432

Index: pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp
diff -u pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp:1.1 pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp:1.2
--- pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp:1.1     Mon Jul 15 22:07:08 2019
+++ pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp Fri Oct 25 09:44:26 2019
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_convert.cpp,v 1.1 2019/07/15 22:07:08 nia Exp $
+$NetBSD: patch-src_convert.cpp,v 1.2 2019/10/25 09:44:26 kamil Exp $
 
 Support NetBSD and SunOS iconv being special.
 
---- src/convert.cpp.orig       2019-04-26 09:31:16.000000000 +0000
+--- src/convert.cpp.orig       2019-07-29 06:33:07.000000000 +0000
 +++ src/convert.cpp
 @@ -1545,11 +1545,19 @@ namespace {
              char outbuf[256];
              char* outptr = outbuf;
              size_t outbytesleft = sizeof(outbuf);
-+#if defined(__NetBSD__) || defined(__sun)
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
 +            size_t rc = iconv(cd,
 +                              const_cast<const char **>(&inptr),
 +                              &inbytesleft,

Added files:

Index: pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake
diff -u /dev/null pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.1
--- /dev/null   Fri Oct 25 09:44:26 2019
+++ pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake    Fri Oct 25 09:44:26 2019
@@ -0,0 +1,23 @@
+$NetBSD: patch-cmake_config.h.cmake,v 1.1 2019/10/25 09:44:26 kamil Exp $
+
+--- cmake/config.h.cmake.orig  2019-07-29 06:33:06.000000000 +0000
++++ cmake/config.h.cmake
+@@ -35,7 +35,17 @@
+ 
+ /* Define to `const' or to empty, depending on the second argument of `iconv'. */
+ #cmakedefine ICONV_ACCEPTS_CONST_INPUT
+-#if defined(ICONV_ACCEPTS_CONST_INPUT) || defined(__NetBSD__)
++
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#else
++#define NETBSD_POSIX_ICONV 0
++#endif
++#endif
++
++#if defined(ICONV_ACCEPTS_CONST_INPUT) || (defined(__NetBSD__) && !NETBSD_POSIX_ICONV)
+ #define EXV_ICONV_CONST const
+ #else
+ #define EXV_ICONV_CONST