CVS commit: pkgsrc/time/xclock

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun 30 09:49:22 UTC 2026

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

Log Message:
xclock: switch to updated upstream patch

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/time/xclock/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/time/xclock/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/time/xclock/patches/patch-Clock.c
cvs rdiff -u -r1.1 -r0 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.18 pkgsrc/time/xclock/Makefile:1.19
--- pkgsrc/time/xclock/Makefile:1.18    Mon Jun 29 07:27:32 2026
+++ pkgsrc/time/xclock/Makefile Tue Jun 30 09:49:22 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2026/06/29 07:27:32 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2026/06/30 09:49:22 wiz Exp $
 
 DISTNAME=      xclock-1.2.0
+PKGREVISION=   1
 CATEGORIES=    time x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/time/xclock/distinfo
diff -u pkgsrc/time/xclock/distinfo:1.12 pkgsrc/time/xclock/distinfo:1.13
--- pkgsrc/time/xclock/distinfo:1.12    Mon Jun 29 07:27:32 2026
+++ pkgsrc/time/xclock/distinfo Tue Jun 30 09:49:22 2026
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2026/06/29 07:27:32 wiz Exp $
+$NetBSD: distinfo,v 1.13 2026/06/30 09:49:22 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
+SHA1 (patch-Clock.c) = 3ad0a3f83d582900754ad3a351050de47f513c69

Index: pkgsrc/time/xclock/patches/patch-Clock.c
diff -u pkgsrc/time/xclock/patches/patch-Clock.c:1.4 pkgsrc/time/xclock/patches/patch-Clock.c:1.5
--- pkgsrc/time/xclock/patches/patch-Clock.c:1.4        Mon Jun 29 07:27:32 2026
+++ pkgsrc/time/xclock/patches/patch-Clock.c    Tue Jun 30 09:49:22 2026
@@ -1,33 +1,46 @@
-$NetBSD: patch-Clock.c,v 1.4 2026/06/29 07:27:32 wiz Exp $
+$NetBSD: patch-Clock.c,v 1.5 2026/06/30 09:49:22 wiz Exp $
 
-https://gitlab.freedesktop.org/xorg/app/xclock/-/merge_requests/27
+avoid uselocale()
+https://gitlab.freedesktop.org/xorg/app/xclock/-/merge_requests/29
 
 --- Clock.c.orig       2026-06-27 20:18:51.000000000 +0000
 +++ Clock.c
-@@ -607,7 +607,7 @@ XmuCvtStringToXftShape(Display * dpy,
-     XftShape shape;
+@@ -608,8 +608,14 @@ XmuCvtStringToXftShape(Display * dpy,
      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);
+ #ifndef NO_I18N
+-    locale_t c_loc = newlocale(LC_NUMERIC_MASK, "C", NULL);
+-    locale_t old_loc = uselocale(c_loc);
++    char saved_numeric[256] = "";
++    {
++        const char *cur_numeric = setlocale(LC_NUMERIC, NULL);
++        if (cur_numeric != NULL && strlen(cur_numeric) < sizeof(saved_numeric)) {
++            strcpy(saved_numeric, cur_numeric);
++            setlocale(LC_NUMERIC, "C");
++        }
++    }
  #endif
-@@ -622,7 +622,7 @@ XmuCvtStringToXftShape(Display * dpy,
-             XmuCvtStringToXftShape_Assert(count % 3 == 0,
+     double t1 = .01, t2 = 0, t3 = 0, t4 = 0, t5 = .01, t6 = 0;
+     const char* errmsg = NULL;
+@@ -623,8 +629,8 @@ XmuCvtStringToXftShape(Display * dpy,
                  "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);
+ #ifndef NO_I18N
+-            uselocale(old_loc);
+-            freelocale(c_loc);
++            if (saved_numeric[0])
++                setlocale(LC_NUMERIC, saved_numeric);
  #endif
-@@ -708,7 +708,7 @@ XmuCvtStringToXftShape(Display * dpy,
-                         "cvtStringToXftShape", "wrongParameters", "XtToolkitError",
+             donestr(XftShape, shape, XtRXftShape);
+         }
+@@ -709,8 +715,8 @@ XmuCvtStringToXftShape(Display * dpy,
                          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);
+ #ifndef NO_I18N
+-        uselocale(old_loc);
+-        freelocale(c_loc);
++        if (saved_numeric[0])
++            setlocale(LC_NUMERIC, saved_numeric);
  #endif
+         return False;
+     }