diff options
| author | kamil <kamil@pkgsrc.org> | 2019-10-25 09:44:26 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2019-10-25 09:44:26 +0000 |
| commit | eea8d4e2053202530534e644107e21539be57a38 (patch) | |
| tree | 4116fdba73f78c9a0c0441c35d8c20926e69588f /graphics/exiv2 | |
| parent | 3c4a487452d89e6c35efd26bd39013ac27805261 (diff) | |
| download | pkgsrc-eea8d4e2053202530534e644107e21539be57a38.tar.gz | |
exiv2: Fix build on NetBSD 9.99.17
Adapt the local patch for the POSIX iconv(3) API change in new NetBSD.
Diffstat (limited to 'graphics/exiv2')
| -rw-r--r-- | graphics/exiv2/distinfo | 5 | ||||
| -rw-r--r-- | graphics/exiv2/patches/patch-cmake_config.h.cmake | 23 | ||||
| -rw-r--r-- | graphics/exiv2/patches/patch-src_convert.cpp | 6 |
3 files changed, 29 insertions, 5 deletions
diff --git a/graphics/exiv2/distinfo b/graphics/exiv2/distinfo index bdfb6380f21..dc4b70518a8 100644 --- a/graphics/exiv2/distinfo +++ b/graphics/exiv2/distinfo @@ -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 diff --git a/graphics/exiv2/patches/patch-cmake_config.h.cmake b/graphics/exiv2/patches/patch-cmake_config.h.cmake new file mode 100644 index 00000000000..97f1199b261 --- /dev/null +++ b/graphics/exiv2/patches/patch-cmake_config.h.cmake @@ -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 diff --git a/graphics/exiv2/patches/patch-src_convert.cpp b/graphics/exiv2/patches/patch-src_convert.cpp index 433c4093c5c..811ad6ecd17 100644 --- a/graphics/exiv2/patches/patch-src_convert.cpp +++ b/graphics/exiv2/patches/patch-src_convert.cpp @@ -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, |