CVS commit: pkgsrc/devel/libmtp

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jun 20 00:33:12 UTC 2026

Modified Files:
        pkgsrc/devel/libmtp: distinfo
        pkgsrc/devel/libmtp/patches: patch-src_unicode.c

Log Message:
libmtp: Handle the case where the iconv(3) is overridden by GNU libiconv.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/libmtp/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libmtp/patches/patch-src_unicode.c

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

Modified files:

Index: pkgsrc/devel/libmtp/distinfo
diff -u pkgsrc/devel/libmtp/distinfo:1.21 pkgsrc/devel/libmtp/distinfo:1.22
--- pkgsrc/devel/libmtp/distinfo:1.21   Tue May 19 13:32:22 2026
+++ pkgsrc/devel/libmtp/distinfo        Sat Jun 20 00:33:12 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2026/05/19 13:32:22 adam Exp $
+$NetBSD: distinfo,v 1.22 2026/06/20 00:33:12 nia Exp $
 
 BLAKE2s (libmtp-1.1.23.tar.gz) = 7784cb3d111d1076a3c8dbe64b8d1bd1667611bfd177c872c97289e595df0912
 SHA512 (libmtp-1.1.23.tar.gz) = 2411513f1b7f81d4418eb1455213d7e198bc7d36bfadc22d2c380c51ca1924fffe21b08b6522266586ec76cbfc760427ed5d1c31064a59f6906d6638f198d1af
@@ -8,5 +8,5 @@ SHA1 (patch-hotplug.sh.in) = 72216bb36bd
 SHA1 (patch-m4_byteorder.m4) = e6c1170d9099f13c637b3a73d67618d318c7a73d
 SHA1 (patch-src_libusb1-glue.c) = 2c83f2436a7cbc27c8b03f8d22db9bb446f55446
 SHA1 (patch-src_ptp-pack.c) = 7657d7f5b707c644bb5599f31c0d2c395d43d893
-SHA1 (patch-src_unicode.c) = c38b2070e39e6df088c7e9ec7c3a723e0fcc87ed
+SHA1 (patch-src_unicode.c) = 5b130ea8aaa67d7e57af3b3a61ea23ee948881d6
 SHA1 (patch-src_util.c) = f7be6760014323dc2b159e1e44f94e40d96f26d0

Index: pkgsrc/devel/libmtp/patches/patch-src_unicode.c
diff -u pkgsrc/devel/libmtp/patches/patch-src_unicode.c:1.1 pkgsrc/devel/libmtp/patches/patch-src_unicode.c:1.2
--- pkgsrc/devel/libmtp/patches/patch-src_unicode.c:1.1 Fri Dec 19 11:00:46 2025
+++ pkgsrc/devel/libmtp/patches/patch-src_unicode.c     Sat Jun 20 00:33:12 2026
@@ -1,10 +1,11 @@
-$NetBSD: patch-src_unicode.c,v 1.1 2025/12/19 11:00:46 nia Exp $
+$NetBSD: patch-src_unicode.c,v 1.2 2026/06/20 00:33:12 nia Exp $
 
 Support non-POSIX iconv in SunOS and old NetBSD.
+Make sure that GNU libiconv isn't being used.
 
---- src/unicode.c.orig 2025-12-19 10:50:53.932872746 +0000
+--- src/unicode.c.orig 2022-11-15 09:28:49.000000000 +0000
 +++ src/unicode.c
-@@ -41,6 +41,15 @@
+@@ -41,6 +41,13 @@
  #include "util.h"
  #include "ptp.h"
  
@@ -12,15 +13,13 @@ Support non-POSIX iconv in SunOS and old
 +#include <sys/param.h>
 +#if __NetBSD_Prereq__(9,99,17)
 +#define NETBSD_POSIX_ICONV 1
-+#else
-+#define NETBSD_POSIX_ICONV 0
 +#endif
 +#endif
 +
  /**
   * The size of the buffer (in characters) used for creating string copies.
   */
-@@ -81,7 +90,11 @@ char *utf16_to_utf8(LIBMTP_mtpdevice_t *device, const 
+@@ -81,7 +88,11 @@ char *utf16_to_utf8(LIBMTP_mtpdevice_t *device, const 
    loclstr[0]='\0';
    #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)
    PTPParams *params = (PTPParams *) device->params;
@@ -32,11 +31,11 @@ Support non-POSIX iconv in SunOS and old
    char *locp = loclstr;
    size_t nconv;
    size_t convlen = (ucs2_strlen(unicstr)+1) * sizeof(uint16_t); // UCS-2 is 16 bit wide, include terminator
-@@ -120,7 +133,11 @@ uint16_t *utf8_to_utf16(LIBMTP_mtpdevice_t *device, co
+@@ -120,7 +131,11 @@ uint16_t *utf8_to_utf16(LIBMTP_mtpdevice_t *device, co
  
    #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)
    PTPParams *params = (PTPParams *) device->params;
-+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++#if (defined(__NetBSD__) || defined(__sun)) && !defined(NETBSD_POSIX_ICONV) && !defined(_LIBICONV_VERSION)
 +  const char *stringp = (const char *) localstr;
 +#else
    char *stringp = (char *) localstr; // cast away "const"