CVS commit: pkgsrc/time/emiclock

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct 10 17:21:09 UTC 2024

Modified Files:
        pkgsrc/time/emiclock: distinfo
        pkgsrc/time/emiclock/patches: patch-ag
Added Files:
        pkgsrc/time/emiclock/patches: patch-sys_SunOS_audio.c

Log Message:
emiclock: Remove harmful workarounds for ancient Solaris


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/time/emiclock/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/emiclock/patches/patch-ag
cvs rdiff -u -r0 -r1.1 pkgsrc/time/emiclock/patches/patch-sys_SunOS_audio.c

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

Modified files:

Index: pkgsrc/time/emiclock/distinfo
diff -u pkgsrc/time/emiclock/distinfo:1.13 pkgsrc/time/emiclock/distinfo:1.14
--- pkgsrc/time/emiclock/distinfo:1.13  Tue Oct 26 11:24:18 2021
+++ pkgsrc/time/emiclock/distinfo       Thu Oct 10 17:21:09 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 11:24:18 nia Exp $
+$NetBSD: distinfo,v 1.14 2024/10/10 17:21:09 nia Exp $
 
 BLAKE2s (emiclock-2.0.2.tar.gz) = 119a5489a2d697c576ccd364247783acfd5d0a6f417375ff5f4a6af825ca2400
 SHA512 (emiclock-2.0.2.tar.gz) = 5276ec3e7a2333417c362c6779d38da5b6e76427085d41608f10bcc6b78910949427dd292c283e8d31d96eaba12cbb97de98774bd9976f83c55fea5f80ee8e69
@@ -9,5 +9,6 @@ SHA1 (patch-ac) = 4b020ac03c958d1ca44968
 SHA1 (patch-ad) = 3cde51980c8802a225a6a91291297176fc9dba69
 SHA1 (patch-ae) = ecbc4f169c0fd249ba1cc0c3031922c02f7a6bb2
 SHA1 (patch-af) = f5b6c40f42136ee8953bf259a78fa0d8be048503
-SHA1 (patch-ag) = 43c750de300cbda8cb89917894bbc73b18974c5d
+SHA1 (patch-ag) = c573c4b2a92ec3931c57d50ae3f6df121eab27ae
 SHA1 (patch-ah) = 227494794d7c28620d11800fa6087ab765dd5562
+SHA1 (patch-sys_SunOS_audio.c) = 41c83800218b5305aba7a1c57fd4fcf6ad8211d6

Index: pkgsrc/time/emiclock/patches/patch-ag
diff -u pkgsrc/time/emiclock/patches/patch-ag:1.1 pkgsrc/time/emiclock/patches/patch-ag:1.2
--- pkgsrc/time/emiclock/patches/patch-ag:1.1   Fri Jun  4 13:52:21 2010
+++ pkgsrc/time/emiclock/patches/patch-ag       Thu Oct 10 17:21:09 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2010/06/04 13:52:21 tsutsui Exp $
+$NetBSD: patch-ag,v 1.2 2024/10/10 17:21:09 nia Exp $
 
---- EmiClock.c 1999-09-27 01:18:18.000000000 +0900
+--- EmiClock.c.orig    1999-09-26 16:18:18.000000000 +0000
 +++ EmiClock.c
-@@ -509,7 +509,7 @@
+@@ -509,7 +509,7 @@ static void
  EmiClockRandomInit(w)
      EmiClockWidget    w;
  {
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.1 2010/06/04 13:52
      struct tm *tm;
  
      /* $B;~4V$r<h$j=P$9(B */
-@@ -567,7 +567,7 @@
+@@ -567,7 +567,7 @@ Realize(w, valueMask, attrs)
      XSetWindowAttributes      *attrs;
  {
      EmiClockWidget    cw = (EmiClockWidget)w;
@@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.1 2010/06/04 13:52
      struct tm         *tm;
  
      XtCreateWindow(w, (unsigned)InputOutput, (Visual *)CopyFromParent,
-@@ -951,7 +951,7 @@
+@@ -951,7 +951,7 @@ static void
  NewTime(w)
      EmiClockWidget    w;
  {
@@ -29,7 +29,19 @@ $NetBSD: patch-ag,v 1.1 2010/06/04 13:52
      struct tm *tm;
      int               year;
  
-@@ -1066,7 +1066,7 @@
+@@ -1033,11 +1033,7 @@ NewInterval(w)
+ 
+     /* $B%$%s%?!<%P%k$N@_Dj(B */
+ #ifdef        HAVE_GETTIMEOFDAY
+-#if !(defined(solaris) || (defined(__sony_news) && defined(SVR4)))
+     if (gettimeofday(&tp, &tzp) != 0) {
+-#else
+-    if (gettimeofday(&tp) != 0) {
+-#endif
+       FatalError("Can't gettimeofday.");
+     }
+ 
+@@ -1066,7 +1062,7 @@ NewInterval(w)
                                /* 1000 milliseconds == 1 second */
                        (XtTimerCallbackProc)NewTime, w);
      } else {
@@ -38,7 +50,7 @@ $NetBSD: patch-ag,v 1.1 2010/06/04 13:52
        struct tm       *tm;
  
        time(&now);
-@@ -1426,7 +1426,7 @@
+@@ -1426,7 +1422,7 @@ static void
  GenPixmapAndDraw(w)
      EmiClockWidget    w;
  {

Added files:

Index: pkgsrc/time/emiclock/patches/patch-sys_SunOS_audio.c
diff -u /dev/null pkgsrc/time/emiclock/patches/patch-sys_SunOS_audio.c:1.1
--- /dev/null   Thu Oct 10 17:21:09 2024
+++ pkgsrc/time/emiclock/patches/patch-sys_SunOS_audio.c        Thu Oct 10 17:21:09 2024
@@ -0,0 +1,32 @@
+$NetBSD: patch-sys_SunOS_audio.c,v 1.1 2024/10/10 17:21:09 nia Exp $
+
+Remove harmful workarounds for ancient Solaris.
+
+--- sys/SunOS/audio.c.orig     2024-10-10 17:17:57.716810224 +0000
++++ sys/SunOS/audio.c
+@@ -176,13 +176,8 @@ SoundCacheBuffer  *cacheBufferPtr;
+       SoundTimeBytes = (cacheBufferPtr->soundBParam.play.precision / 8) *
+                               cacheBufferPtr->soundBParam.play.channels *
+                               cacheBufferPtr->soundBParam.play.sample_rate;
+-#ifdef solaris
+-      sigset(SIGALRM, S_PlayInterval);
+-      gettimeofday(&SoundStart);
+-#else
+       signal(SIGALRM, S_PlayInterval);
+       gettimeofday(&SoundStart, NULL);
+-#endif
+       S_PlayInterval();
+       return SOUND_NO_ERROR;
+ }
+@@ -226,11 +221,7 @@ S_PlayInterval()
+                       SoundBufPtr += nbytes;
+                       timer = ((double)SoundPlayed / (double)SoundTimeBytes)
+                                                               * 1000000;
+-#ifdef solaris
+-                      gettimeofday(&now);
+-#else
+                       gettimeofday(&now, NULL);
+-#endif
+                       timer -= (now.tv_sec - SoundStart.tv_sec) * 1000000
+                                       + now.tv_usec - SoundStart.tv_usec;
+                       if (timer <= 0)