CVS commit: pkgsrc/devel/at-spi2-core

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Sun Sep 28 15:55:44 UTC 2025

Modified Files:
        pkgsrc/devel/at-spi2-core: Makefile distinfo
Added Files:
        pkgsrc/devel/at-spi2-core/patches: patch-atk-adaptor_event.c
            patch-atspi_atspi-event-listener.c patch-atspi_atspi-misc.c
            patch-meson.build patch-registryd_registry.c

Log Message:
Build fix for at-spi2-core

Avoid error: implicit declaration of function 'putenv'; by removing
POSIX/XOPEN visibility restrictions.

Also tidy array subscript has type 'char'


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/at-spi2-core/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/at-spi2-core/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/at-spi2-core/patches/patch-atk-adaptor_event.c \
    pkgsrc/devel/at-spi2-core/patches/patch-atspi_atspi-event-listener.c \
    pkgsrc/devel/at-spi2-core/patches/patch-atspi_atspi-misc.c \
    pkgsrc/devel/at-spi2-core/patches/patch-meson.build \
    pkgsrc/devel/at-spi2-core/patches/patch-registryd_registry.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/at-spi2-core/Makefile
diff -u pkgsrc/devel/at-spi2-core/Makefile:1.58 pkgsrc/devel/at-spi2-core/Makefile:1.59
--- pkgsrc/devel/at-spi2-core/Makefile:1.58     Sat Jul 19 05:37:33 2025
+++ pkgsrc/devel/at-spi2-core/Makefile  Sun Sep 28 15:55:43 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2025/07/19 05:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2025/09/28 15:55:43 prlw1 Exp $
 
 DISTNAME=      at-spi2-core-2.54.0
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/at-spi2-core/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/at-spi2-core/distinfo
diff -u pkgsrc/devel/at-spi2-core/distinfo:1.33 pkgsrc/devel/at-spi2-core/distinfo:1.34
--- pkgsrc/devel/at-spi2-core/distinfo:1.33     Sun Oct 20 14:02:23 2024
+++ pkgsrc/devel/at-spi2-core/distinfo  Sun Sep 28 15:55:43 2025
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.33 2024/10/20 14:02:23 wiz Exp $
+$NetBSD: distinfo,v 1.34 2025/09/28 15:55:43 prlw1 Exp $
 
 BLAKE2s (at-spi2-core-2.54.0.tar.xz) = 8a925502b14e14f5d0265a6e9acc50f208849cb880042d06f3e82385b8a9a6ff
 SHA512 (at-spi2-core-2.54.0.tar.xz) = ac697055f9e31b264da55dc1b7c92c85905bc6c32dcd6ac7a699f9cc0dec933f7bb1323098e7c2f6bdce91bc7195bd8b4625e39216d9671c85df25a0071f0a3e
 Size (at-spi2-core-2.54.0.tar.xz) = 575368 bytes
+SHA1 (patch-atk-adaptor_event.c) = 6d4c5f1669a40644a0787e6a88065959ec42a8f9
+SHA1 (patch-atspi_atspi-event-listener.c) = 7e980ab7ebb86592ff9a743b3f2f1ecc66c75bfd
+SHA1 (patch-atspi_atspi-misc.c) = ec309d8e6dfbdc4822ffc0c1b9a442c6f2fba0a8
+SHA1 (patch-meson.build) = 196bdda7a11480f33f6e9a3b438f821765a36de6
+SHA1 (patch-registryd_registry.c) = 69d8be4a54af1f3749d38ad4f1d6ad33296765fe

Added files:

Index: pkgsrc/devel/at-spi2-core/patches/patch-atk-adaptor_event.c
diff -u /dev/null pkgsrc/devel/at-spi2-core/patches/patch-atk-adaptor_event.c:1.1
--- /dev/null   Sun Sep 28 15:55:44 2025
+++ pkgsrc/devel/at-spi2-core/patches/patch-atk-adaptor_event.c Sun Sep 28 15:55:43 2025
@@ -0,0 +1,29 @@
+$NetBSD: patch-atk-adaptor_event.c,v 1.1 2025/09/28 15:55:43 prlw1 Exp $
+
+warning: array subscript has type 'char'
+
+--- atk-adaptor/event.c.orig   2025-09-13 14:41:15.000000000 +0000
++++ atk-adaptor/event.c
+@@ -356,11 +356,11 @@ signal_name_to_dbus (const gchar *s)
+ 
+   if (!ret)
+     return NULL;
+-  ret[0] = toupper (ret[0]);
++  ret[0] = toupper ((unsigned char)ret[0]);
+   while ((t = strchr (ret, '-')) != NULL)
+     {
+       memmove (t, t + 1, strlen (t));
+-      *t = toupper (*t);
++      *t = toupper ((unsigned char)*t);
+     }
+   return ret;
+ }
+@@ -382,7 +382,7 @@ ensure_proper_format (const char *name)
+     {
+       if (need_upper)
+         {
+-          *p++ = toupper (*name);
++          *p++ = toupper ((unsigned char)*name);
+           need_upper = FALSE;
+         }
+       else if (*name == '-')
Index: pkgsrc/devel/at-spi2-core/patches/patch-atspi_atspi-event-listener.c
diff -u /dev/null pkgsrc/devel/at-spi2-core/patches/patch-atspi_atspi-event-listener.c:1.1
--- /dev/null   Sun Sep 28 15:55:44 2025
+++ pkgsrc/devel/at-spi2-core/patches/patch-atspi_atspi-event-listener.c        Sun Sep 28 15:55:43 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-atspi_atspi-event-listener.c,v 1.1 2025/09/28 15:55:43 prlw1 Exp $
+
+warning: array subscript has type 'char'
+
+--- atspi/atspi-event-listener.c.orig  2025-09-13 14:41:15.000000000 +0000
++++ atspi/atspi-event-listener.c
+@@ -200,11 +200,11 @@ convert_name_from_dbus (const char *name
+ 
+   while (*p)
+     {
+-      if (isupper (*p))
++      if (isupper ((unsigned char)*p))
+         {
+           if (q > ret)
+             *q++ = '-';
+-          *q++ = tolower (*p++);
++          *q++ = tolower ((unsigned char)(*p++));
+         }
+       else if (path_hack && *p == '/')
+         {
Index: pkgsrc/devel/at-spi2-core/patches/patch-atspi_atspi-misc.c
diff -u /dev/null pkgsrc/devel/at-spi2-core/patches/patch-atspi_atspi-misc.c:1.1
--- /dev/null   Sun Sep 28 15:55:44 2025
+++ pkgsrc/devel/at-spi2-core/patches/patch-atspi_atspi-misc.c  Sun Sep 28 15:55:43 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-atspi_atspi-misc.c,v 1.1 2025/09/28 15:55:43 prlw1 Exp $
+
+warning: array subscript has type 'char'
+
+--- atspi/atspi-misc.c.orig    2025-09-13 14:41:15.000000000 +0000
++++ atspi/atspi-misc.c
+@@ -2189,18 +2189,18 @@ _atspi_strdup_and_adjust_for_dbus (const
+       if (*p == '-')
+         {
+           memmove (p, p + 1, g_utf8_strlen (p, -1));
+-          *p = toupper (*p);
++          *p = toupper ((unsigned char)*p);
+         }
+       else if (*p == ':')
+         {
+           parts++;
+           if (parts == 2)
+             break;
+-          p[1] = toupper (p[1]);
++          p[1] = toupper ((unsigned char)p[1]);
+         }
+     }
+ 
+-  d[0] = toupper (d[0]);
++  d[0] = toupper ((unsigned char)d[0]);
+   return d;
+ }
+ 
Index: pkgsrc/devel/at-spi2-core/patches/patch-meson.build
diff -u /dev/null pkgsrc/devel/at-spi2-core/patches/patch-meson.build:1.1
--- /dev/null   Sun Sep 28 15:55:44 2025
+++ pkgsrc/devel/at-spi2-core/patches/patch-meson.build Sun Sep 28 15:55:43 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-meson.build,v 1.1 2025/09/28 15:55:43 prlw1 Exp $
+
+tests/at-spi2-atk/atk_test_util.c calls putenv() which isn't part of
+POSIX_C_SOURCE. Later versions of at-spi2-core try _XOPEN_SOURCE and
+do find putenv(), but fail on other functions such as timersub().
+Bail and remove the artificial restrictions.
+
+https://mail-index.netbsd.org/pkgsrc-users/2025/09/24/msg042013.html
+
+--- meson.build.orig   2024-09-14 18:26:17.000000000 +0000
++++ meson.build
+@@ -8,7 +8,7 @@ project('at-spi2-core', 'c',
+         ],
+         meson_version: '>= 0.63.0')
+ 
+-add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE' ], language: 'c')
++add_project_arguments(language: 'c')
+ 
+ fs = import('fs')
+ 
Index: pkgsrc/devel/at-spi2-core/patches/patch-registryd_registry.c
diff -u /dev/null pkgsrc/devel/at-spi2-core/patches/patch-registryd_registry.c:1.1
--- /dev/null   Sun Sep 28 15:55:44 2025
+++ pkgsrc/devel/at-spi2-core/patches/patch-registryd_registry.c        Sun Sep 28 15:55:43 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-registryd_registry.c,v 1.1 2025/09/28 15:55:43 prlw1 Exp $
+
+warning: array subscript has type 'char'
+
+--- registryd/registry.c.orig  2025-09-13 14:41:15.000000000 +0000
++++ registryd/registry.c
+@@ -362,7 +362,7 @@ ensure_proper_format (const char *name)
+     {
+       if (need_upper)
+         {
+-          *p++ = toupper (*name);
++          *p++ = toupper ((unsigned char)*name);
+           need_upper = FALSE;
+         }
+       else if (*name == '-')