pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/time/wmzcalock Fix 64bit time_t issue. Fix inline usag...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/22cb18423937
branches:  trunk
changeset: 610632:22cb18423937
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Nov 01 19:28:26 2012 +0000

description:
Fix 64bit time_t issue. Fix inline usage. Bump revision.

diffstat:

 time/wmzcalock/Makefile                  |   3 ++-
 time/wmzcalock/distinfo                  |   4 ++--
 time/wmzcalock/patches/patch-wmzcalock.c |  30 +++++++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r eca9f911f95b -r 22cb18423937 time/wmzcalock/Makefile
--- a/time/wmzcalock/Makefile   Thu Nov 01 19:27:36 2012 +0000
+++ b/time/wmzcalock/Makefile   Thu Nov 01 19:28:26 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/11/01 19:28:26 joerg Exp $
 #
 
 DISTNAME=              wmzcalock-0.1
+PKGREVISION=           1
 CATEGORIES=            time x11
 MASTER_SITES=          http://zapatopi.net/zapatoware/
 
diff -r eca9f911f95b -r 22cb18423937 time/wmzcalock/distinfo
--- a/time/wmzcalock/distinfo   Thu Nov 01 19:27:36 2012 +0000
+++ b/time/wmzcalock/distinfo   Thu Nov 01 19:28:26 2012 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/01/16 14:36:56 sborrill Exp $
+$NetBSD: distinfo,v 1.2 2012/11/01 19:28:26 joerg Exp $
 
 SHA1 (wmzcalock-0.1.tgz) = e18a377464f688140c0388cf7dd29c96ecb27233
 RMD160 (wmzcalock-0.1.tgz) = 902383d9046fe38932ed0e700d678cd5e5e82ed2
 Size (wmzcalock-0.1.tgz) = 47451 bytes
-SHA1 (patch-wmzcalock.c) = 55b316964a342248cfa70cf680e61129892303f7
+SHA1 (patch-wmzcalock.c) = 9a2a3d97953f4870b83a7198f64a0aafcb97066a
diff -r eca9f911f95b -r 22cb18423937 time/wmzcalock/patches/patch-wmzcalock.c
--- a/time/wmzcalock/patches/patch-wmzcalock.c  Thu Nov 01 19:27:36 2012 +0000
+++ b/time/wmzcalock/patches/patch-wmzcalock.c  Thu Nov 01 19:28:26 2012 +0000
@@ -1,8 +1,28 @@
-$NetBSD: patch-wmzcalock.c,v 1.1.1.1 2010/01/16 14:36:56 sborrill Exp $
+$NetBSD: patch-wmzcalock.c,v 1.2 2012/11/01 19:28:26 joerg Exp $
 
---- wmzcalock.c.orig   2000-07-11 18:11:00.000000000 +0100
-+++ wmzcalock.c        2010-01-14 16:24:40.000000000 +0000
-@@ -645,7 +645,7 @@
+--- wmzcalock.c.orig   2000-07-11 17:11:00.000000000 +0000
++++ wmzcalock.c
+@@ -144,7 +144,7 @@ int use_font_wday = TRUE;
+ 
+ void clock_routine(int, char **);
+ void set_locale_vars(void);
+-inline void draw_display(void);
++void draw_display(void);
+ void set_time_strings (void);
+ void draw_string (char *, int, int, unsigned long, int, unsigned long);
+ void draw_binary_time (void);
+@@ -258,7 +258,9 @@ int main(int argc, char *argv[])
+               {
+                       i++; if (i == argc) usage (1);
+                       gmt = TRUE;
+-                      sscanf(argv[i],"%i",&tzoff);
++                      int off;
++                      sscanf(argv[i],"%i",&off);
++                      tzoff = off;
+               }
+ 
+               else if (!strcmp(argv[i],"-swatch") |
+@@ -645,7 +647,7 @@ void set_time_strings (void)
        {
                gettimeofday(&timeV, NULL);
                dday = ((float)hour/24)+((float)min/1440)+
@@ -11,7 +31,7 @@
        }
  
        switch (tmmode)
-@@ -803,7 +803,7 @@
+@@ -803,7 +805,7 @@ Pixmap colorized_pixmap_file(char *pixma
        {
                fprintf(stderr,
                        "Warning: Couldn't open file '%s', using font instead\n",pixmap_file);



Home | Main Index | Thread Index | Old Index