CVS commit: pkgsrc/devel/eina

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Dec 20 12:17:12 UTC 2025

Modified Files:
        pkgsrc/devel/eina: distinfo
Added Files:
        pkgsrc/devel/eina/patches: patch-src_lib_eina__str.c

Log Message:
eina: Fix iconv usage.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/eina/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/eina/patches/patch-src_lib_eina__str.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/eina/distinfo
diff -u pkgsrc/devel/eina/distinfo:1.15 pkgsrc/devel/eina/distinfo:1.16
--- pkgsrc/devel/eina/distinfo:1.15     Fri Dec 19 10:27:02 2025
+++ pkgsrc/devel/eina/distinfo  Sat Dec 20 12:17:12 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2025/12/19 10:27:02 nia Exp $
+$NetBSD: distinfo,v 1.16 2025/12/20 12:17:12 nia Exp $
 
 BLAKE2s (eina-1.7.10.tar.bz2) = 6cf2e8409df2238b5ae2ef917909766d99a21558a79a3f63813e41205212f110
 SHA512 (eina-1.7.10.tar.bz2) = c1195ec9f2cd79777912ba3c8b6e69a206d035c9a7f2c38762c18e3c86ec43d52f020e4dd8d0ea0c9b580aff9707cede909412260ac6d23796ddbd78eb8e280e
 Size (eina-1.7.10.tar.bz2) = 9703289 bytes
 SHA1 (patch-src_lib_eina__inarray.c) = 50ed04a751689cdcaff28fdaed9177708759f529
+SHA1 (patch-src_lib_eina__str.c) = 1c350117eb953a10d7663154b9b03a84e3f9de04

Added files:

Index: pkgsrc/devel/eina/patches/patch-src_lib_eina__str.c
diff -u /dev/null pkgsrc/devel/eina/patches/patch-src_lib_eina__str.c:1.1
--- /dev/null   Sat Dec 20 12:17:12 2025
+++ pkgsrc/devel/eina/patches/patch-src_lib_eina__str.c Sat Dec 20 12:17:12 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_lib_eina__str.c,v 1.1 2025/12/20 12:17:12 nia Exp $
+
+Fix build on systems with recent gcc versions and non-posix iconv.
+
+--- src/lib/eina_str.c.orig    2025-12-20 11:54:21.107595074 +0000
++++ src/lib/eina_str.c
+@@ -31,6 +31,14 @@
+ #ifdef HAVE_ICONV
+ # include <errno.h>
+ # include <iconv.h>
++#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 /* __NetBSD_Prereq__ */
++#endif /* __NetBSD__ */
+ #endif
+ 
+ #include "eina_private.h"
+@@ -479,7 +487,11 @@ eina_str_convert(const char *enc_from, const char *enc
+         size_t count;
+ 
+         tob = outb;
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++        count = iconv(ic, (const char **)&inp, &inb, &outp, &outb);
++#else
+         count = iconv(ic, &inp, &inb, &outp, &outb);
++#endif
+         outlen += tob - outb;
+         if (count == (size_t)(-1))
+           {