CVS commit: pkgsrc/emulators/dosbox-x

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Mar 15 20:16:49 UTC 2022

Modified Files:
        pkgsrc/emulators/dosbox-x: distinfo
        pkgsrc/emulators/dosbox-x/patches: patch-include_iconvpp.hpp

Log Message:
dosbox-x: properly fix non-posix iconv case


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/emulators/dosbox-x/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/dosbox-x/patches/patch-include_iconvpp.hpp

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

Modified files:

Index: pkgsrc/emulators/dosbox-x/distinfo
diff -u pkgsrc/emulators/dosbox-x/distinfo:1.21 pkgsrc/emulators/dosbox-x/distinfo:1.22
--- pkgsrc/emulators/dosbox-x/distinfo:1.21     Mon Mar  7 16:37:51 2022
+++ pkgsrc/emulators/dosbox-x/distinfo  Tue Mar 15 20:16:48 2022
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.21 2022/03/07 16:37:51 nia Exp $
+$NetBSD: distinfo,v 1.22 2022/03/15 20:16:48 nia Exp $
 
 BLAKE2s (dosbox-x-0.83.23.tar.gz) = d6cff5e7e54f3f63757bf0f41f2aa6c635c5bc7c029ebb5b69a0d2c55afe2b8c
 SHA512 (dosbox-x-0.83.23.tar.gz) = 26ca2fd8753cee8c4c931c54b6a0d0af11144c6b770c16f2b482386b06529ce1567e74d355fb9163e9801e833b4546482469e67def80e1aa1b93652663f31fbe
 Size (dosbox-x-0.83.23.tar.gz) = 64494344 bytes
 SHA1 (patch-configure.ac) = 906aa99b5fce6224ef4c001d9bba1e4fc89a34f9
+SHA1 (patch-contrib_mappings_CP437.TXT) = 71f1284d3504f09480d475f4699f08d8f66ec626
+SHA1 (patch-contrib_mappings_CP950.TXT) = f945dd47577a6ae4bc68f5270d14b9501a588c1a
 SHA1 (patch-include_dosbox.h) = 6f7397b4a611511fc1782b1603c9f5cd51b74eb9
-SHA1 (patch-include_iconvpp.hpp) = 992f51ff790ff9ad8b89a4735f6e0a956675434d
+SHA1 (patch-include_iconvpp.hpp) = dcf1428d202ad0b71b898741908f00445b55fd54
 SHA1 (patch-src_dos_dos__programs.cpp) = 64444c54b319fbfc7de7219d88fa6add953a0fb0
 SHA1 (patch-src_libs_physfs_physfs__platform__unix.c) = 5cde2acf3691478f1d91945b3942c968af2eadc6

Index: pkgsrc/emulators/dosbox-x/patches/patch-include_iconvpp.hpp
diff -u pkgsrc/emulators/dosbox-x/patches/patch-include_iconvpp.hpp:1.1 pkgsrc/emulators/dosbox-x/patches/patch-include_iconvpp.hpp:1.2
--- pkgsrc/emulators/dosbox-x/patches/patch-include_iconvpp.hpp:1.1     Mon Mar  7 16:37:52 2022
+++ pkgsrc/emulators/dosbox-x/patches/patch-include_iconvpp.hpp Tue Mar 15 20:16:49 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-include_iconvpp.hpp,v 1.1 2022/03/07 16:37:52 nia Exp $
+$NetBSD: patch-include_iconvpp.hpp,v 1.2 2022/03/15 20:16:49 nia Exp $
 
 Support NetBSD 9.x and earlier.
 
---- include/iconvpp.hpp.orig   2022-03-07 16:24:10.486063951 +0000
+--- include/iconvpp.hpp.orig   2022-03-15 18:04:18.609036525 +0000
 +++ include/iconvpp.hpp
 @@ -31,6 +31,15 @@
  # define ICONV_BIG_ENDIAN BIG_ENDIAN
@@ -24,8 +24,8 @@ Support NetBSD 9.x and earlier.
              iconv(context,NULL,NULL,NULL,NULL);
  
              /* Ref: [http://man7.org/linux/man-pages/man3/iconv.3.html] */
-+#if defined(__sun) || (defined(__NetBSD__) && !defined(NETBSD_POSIX_ICONV))
-+            int ret = iconv(context,(&(pclass::src_ptr)),&src_left,(char**)(&(pclass::dst_ptr)),&dst_left);
++#if defined(__sun) || (defined(__NetBSD__) && !NETBSD_POSIX_ICONV)
++            int ret = iconv(context,(const char **)(&(pclass::src_ptr)),&src_left,(char**)(&(pclass::dst_ptr)),&dst_left);
 +#else
              int ret = iconv(context,(char**)(&(pclass::src_ptr)),&src_left,(char**)(&(pclass::dst_ptr)),&dst_left);
 +#endif