CVS commit: pkgsrc/graphics/exiv2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jul  7 10:33:26 UTC 2023

Modified Files:
        pkgsrc/graphics/exiv2: Makefile distinfo
        pkgsrc/graphics/exiv2/patches: patch-src_futils.cpp

Log Message:
exiv2: SunOS build fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/graphics/exiv2/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/exiv2/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/exiv2/patches/patch-src_futils.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/Makefile
diff -u pkgsrc/graphics/exiv2/Makefile:1.56 pkgsrc/graphics/exiv2/Makefile:1.57
--- pkgsrc/graphics/exiv2/Makefile:1.56 Thu Jul  6 10:34:50 2023
+++ pkgsrc/graphics/exiv2/Makefile      Fri Jul  7 10:33:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2023/07/06 10:34:50 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2023/07/07 10:33:26 jperkin Exp $
 
 DISTNAME=      exiv2-0.28.0-Source
 PKGNAME=       ${DISTNAME:S/-Source//}
@@ -15,8 +15,7 @@ CHECK_PORTABILITY_SKIP+=      contrib/coverit
 
 USE_TOOLS+=    msgfmt
 USE_LANGUAGES= c c++
-# std::filesystem
-GCC_REQD+=     8
+GCC_REQD+=     3.3
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -30,7 +29,7 @@ CMAKE_ARGS+=  -DIntl_INCLUDE_DIR=${BUILDL
 LDFLAGS.Linux+=        -ldl
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
-CXXFLAGS.SunOS+=       -fPIC
+CXXFLAGS.SunOS+=       -fPIC -DICONV_ACCEPTS_CONST_INPUT
 
 PKGCONFIG_OVERRIDE=    cmake/exiv2.pc.in
 

Index: pkgsrc/graphics/exiv2/distinfo
diff -u pkgsrc/graphics/exiv2/distinfo:1.45 pkgsrc/graphics/exiv2/distinfo:1.46
--- pkgsrc/graphics/exiv2/distinfo:1.45 Sat Jul  1 22:13:14 2023
+++ pkgsrc/graphics/exiv2/distinfo      Fri Jul  7 10:33:26 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2023/07/01 22:13:14 wiz Exp $
+$NetBSD: distinfo,v 1.46 2023/07/07 10:33:26 jperkin Exp $
 
 BLAKE2s (exiv2-0.28.0-Source.tar.gz) = dcb2df9e21ec4a140e6fe44025279d906f4248490671fbadaed6a0aaf94cb4ac
 SHA512 (exiv2-0.28.0-Source.tar.gz) = 5c523ee8c2156417df978048e8e5c5009f77b05eb546ca7063c00dd4f468aa89b1aa60fe4411a638bcf75adc72042bb2ecb3c023b5367f6b756f486c00776dfb
 Size (exiv2-0.28.0-Source.tar.gz) = 44893310 bytes
 SHA1 (patch-cmake_compilerFlags.cmake) = 9f56d637e5dc99d7377a8d57ca9be9aab5833a76
 SHA1 (patch-cmake_config.h.cmake) = 5e8b863c505b32619efc71de6b6086fedfe75ba6
-SHA1 (patch-src_futils.cpp) = 2c11b118ecf4c588ebaaef91d490ed718238940c
+SHA1 (patch-src_futils.cpp) = 35065fe2802416d4d0ece79e5366649a3a256190

Index: pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp
diff -u pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp:1.4 pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp:1.5
--- pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp:1.4      Sat Jul  1 22:13:15 2023
+++ pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp  Fri Jul  7 10:33:26 2023
@@ -1,11 +1,21 @@
-$NetBSD: patch-src_futils.cpp,v 1.4 2023/07/01 22:13:15 wiz Exp $
+$NetBSD: patch-src_futils.cpp,v 1.5 2023/07/07 10:33:26 jperkin Exp $
 
 Fix build on NetBSD.
 https://github.com/Exiv2/exiv2/pull/2625
 
+Include image_int.hpp for Internal::stringFormat().
+
 --- src/futils.cpp.orig        2023-05-08 16:01:13.000000000 +0000
 +++ src/futils.cpp
-@@ -360,7 +360,7 @@ std::string getProcessPath() {
+@@ -6,6 +6,7 @@
+ #include "config.h"
+ #include "enforce.hpp"
+ #include "error.hpp"
++#include "image_int.hpp"
+ #include "utils.hpp"
+ 
+ // + standard includes
+@@ -360,7 +361,7 @@ std::string getProcessPath() {
      TCHAR pathbuf[MAX_PATH];
      GetModuleFileName(nullptr, pathbuf, MAX_PATH);
      auto path = fs::path(pathbuf);