CVS commit: pkgsrc/devel/eina

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 14 13:03:53 UTC 2026

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

Log Message:
eina: Fix build with GCC 15. Don't use alignof as variable name.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/eina/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/eina/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/eina/patches/patch-src_modules_mp_chained__pool_eina__chained__mempool.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/Makefile
diff -u pkgsrc/devel/eina/Makefile:1.13 pkgsrc/devel/eina/Makefile:1.14
--- pkgsrc/devel/eina/Makefile:1.13     Wed Nov  9 13:14:08 2022
+++ pkgsrc/devel/eina/Makefile  Sun Jun 14 13:03:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/11/09 13:14:08 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2026/06/14 13:03:52 nia Exp $
 #
 
 DISTNAME=      eina-1.7.10
@@ -13,6 +13,7 @@ LICENSE=      gnu-lgpl-v2.1
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
+FORCE_C_STD=   gnu89
 
 PKGCONFIG_OVERRIDE=    eina.pc.in
 

Index: pkgsrc/devel/eina/distinfo
diff -u pkgsrc/devel/eina/distinfo:1.16 pkgsrc/devel/eina/distinfo:1.17
--- pkgsrc/devel/eina/distinfo:1.16     Sat Dec 20 12:17:12 2025
+++ pkgsrc/devel/eina/distinfo  Sun Jun 14 13:03:52 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.16 2025/12/20 12:17:12 nia Exp $
+$NetBSD: distinfo,v 1.17 2026/06/14 13:03:52 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
+SHA1 (patch-src_modules_mp_chained__pool_eina__chained__mempool.c) = 07bd79e6bd1b3c75e9815b16a41ac9195c455c34

Added files:

Index: pkgsrc/devel/eina/patches/patch-src_modules_mp_chained__pool_eina__chained__mempool.c
diff -u /dev/null pkgsrc/devel/eina/patches/patch-src_modules_mp_chained__pool_eina__chained__mempool.c:1.1
--- /dev/null   Sun Jun 14 13:03:53 2026
+++ pkgsrc/devel/eina/patches/patch-src_modules_mp_chained__pool_eina__chained__mempool.c       Sun Jun 14 13:03:52 2026
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_modules_mp_chained__pool_eina__chained__mempool.c,v 1.1 2026/06/14 13:03:52 nia Exp $
+
+Rename "alignof" variable so it doesn't conflict with a gcc builtin.
+
+--- src/modules/mp/chained_pool/eina_chained_mempool.c.orig    2026-06-14 13:00:40.383117004 +0000
++++ src/modules/mp/chained_pool/eina_chained_mempool.c
+@@ -122,7 +122,7 @@ _eina_chained_mp_pool_new(Chained_Mempool *pool)
+ {
+    Chained_Pool *p;
+    unsigned char *ptr;
+-   unsigned int alignof;
++   unsigned int my_alignof;
+ 
+    eina_error_set(0);
+    p = malloc(pool->alloc_size);
+@@ -146,8 +146,8 @@ _eina_chained_mp_pool_new(Chained_Mempool *pool)
+    }
+ #endif
+ 
+-   alignof = eina_mempool_alignof(sizeof(Chained_Pool));
+-   ptr = (unsigned char *)p + alignof;
++   my_alignof = eina_mempool_alignof(sizeof(Chained_Pool));
++   ptr = (unsigned char *)p + my_alignof;
+    p->usage = 0;
+    p->base = NULL;
+ 
+@@ -155,7 +155,7 @@ _eina_chained_mp_pool_new(Chained_Mempool *pool)
+    p->limit = ptr + pool->item_alloc * pool->pool_size;
+ 
+ #ifndef NVALGRIND
+-   VALGRIND_MAKE_MEM_NOACCESS(ptr, pool->alloc_size - alignof);
++   VALGRIND_MAKE_MEM_NOACCESS(ptr, pool->alloc_size - my_alignof);
+ #endif
+ 
+    return p;