CVS commit: pkgsrc/time/xclock

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun 29 07:27:32 UTC 2026

Modified Files:
        pkgsrc/time/xclock: Makefile distinfo
Added Files:
        pkgsrc/time/xclock/patches: patch-Clock.c patch-meson.build

Log Message:
xclock: use upstream fix for NetBSD build problem


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/time/xclock/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/time/xclock/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/time/xclock/patches/patch-Clock.c
cvs rdiff -u -r0 -r1.1 pkgsrc/time/xclock/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/time/xclock/Makefile
diff -u pkgsrc/time/xclock/Makefile:1.17 pkgsrc/time/xclock/Makefile:1.18
--- pkgsrc/time/xclock/Makefile:1.17    Sun Jun 28 17:46:07 2026
+++ pkgsrc/time/xclock/Makefile Mon Jun 29 07:27:32 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2026/06/28 17:46:07 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2026/06/29 07:27:32 wiz Exp $
 
 DISTNAME=      xclock-1.2.0
 CATEGORIES=    time x11
@@ -13,8 +13,6 @@ PREV_PKGPATH= x11/xclock
 
 USE_TOOLS+=    pkg-config
 
-CFLAGS+=       -DNO_I18N
-
 .include "../../devel/meson/build.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"

Index: pkgsrc/time/xclock/distinfo
diff -u pkgsrc/time/xclock/distinfo:1.11 pkgsrc/time/xclock/distinfo:1.12
--- pkgsrc/time/xclock/distinfo:1.11    Sun Jun 28 17:46:07 2026
+++ pkgsrc/time/xclock/distinfo Mon Jun 29 07:27:32 2026
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.11 2026/06/28 17:46:07 wiz Exp $
+$NetBSD: distinfo,v 1.12 2026/06/29 07:27:32 wiz Exp $
 
 BLAKE2s (xclock-1.2.0.tar.xz) = cf90e7c198a852fcec29abd376ad33bc377a210bbda7ffc042958af5fe7ae355
 SHA512 (xclock-1.2.0.tar.xz) = acfe4000fc84f511145404ef1f98058d0cdd1d2238942a7a4beaf4781238c2085364e78449418fa46e7957700befeb720efa6f49382e1f8a5759829456d391c2
 Size (xclock-1.2.0.tar.xz) = 177848 bytes
+SHA1 (patch-Clock.c) = cfb8174739a69041821a37fd526ebab83cc1f144
+SHA1 (patch-meson.build) = b9e470e34f3c3ca94acbfae7a7dac5c0105e89a9

Added files:

Index: pkgsrc/time/xclock/patches/patch-Clock.c
diff -u /dev/null pkgsrc/time/xclock/patches/patch-Clock.c:1.4
--- /dev/null   Mon Jun 29 07:27:32 2026
+++ pkgsrc/time/xclock/patches/patch-Clock.c    Mon Jun 29 07:27:32 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-Clock.c,v 1.4 2026/06/29 07:27:32 wiz Exp $
+
+https://gitlab.freedesktop.org/xorg/app/xclock/-/merge_requests/27
+
+--- Clock.c.orig       2026-06-27 20:18:51.000000000 +0000
++++ Clock.c
+@@ -607,7 +607,7 @@ XmuCvtStringToXftShape(Display * dpy,
+     XftShape shape;
+     int points_allocated = 0;
+     int count = 0;
+-#ifndef NO_I18N
++#if !defined(NO_I18N) && defined(HAVE_USELOCALE)
+     locale_t c_loc = newlocale(LC_NUMERIC_MASK, "C", NULL);
+     locale_t old_loc = uselocale(c_loc);
+ #endif
+@@ -622,7 +622,7 @@ XmuCvtStringToXftShape(Display * dpy,
+             XmuCvtStringToXftShape_Assert(count % 3 == 0,
+                 "Number of points must be divisible by three");
+             shape.npoints = count;
+-#ifndef NO_I18N
++#if !defined(NO_I18N) && defined(HAVE_USELOCALE)
+             uselocale(old_loc);
+             freelocale(c_loc);
+ #endif
+@@ -708,7 +708,7 @@ XmuCvtStringToXftShape(Display * dpy,
+                         "cvtStringToXftShape", "wrongParameters", "XtToolkitError",
+                         msgout, (String *) NULL, (Cardinal *) 0);
+         if (shape.points) free(shape.points);
+-#ifndef NO_I18N
++#if !defined(NO_I18N) && defined(HAVE_USELOCALE)
+         uselocale(old_loc);
+         freelocale(c_loc);
+ #endif

Index: pkgsrc/time/xclock/patches/patch-meson.build
diff -u /dev/null pkgsrc/time/xclock/patches/patch-meson.build:1.1
--- /dev/null   Mon Jun 29 07:27:32 2026
+++ pkgsrc/time/xclock/patches/patch-meson.build        Mon Jun 29 07:27:32 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-meson.build,v 1.1 2026/06/29 07:27:32 wiz Exp $
+
+https://gitlab.freedesktop.org/xorg/app/xclock/-/merge_requests/27
+
+--- meson.build.orig   2026-06-27 20:18:51.000000000 +0000
++++ meson.build
+@@ -47,6 +47,7 @@ conf.set('HAVE_NL_LANGINFO', cc.has_function('nl_langi
+ conf.set('HAVE_STRLCPY', cc.has_function('strlcpy') ? '1' : false)
+ conf.set('HAVE_GETPID', cc.has_function('getpid') ? '1' : false)
+ conf.set('HAVE_NL_LANGINFO', cc.has_function('nl_langinfo') ? '1' : false)
++conf.set('HAVE_USELOCALE', cc.has_function('uselocale') ? '1' : false)
+ 
+ # Replacement for AM_ICONV
+ dep_iconv = dependency('iconv', required: false)