[PATCH dockapps 1/8] wmCalClock: correct example on usage screen

7 views
Skip to first unread message

Jeremy Sowden

unread,
Jan 1, 2025, 8:52:41 AMJan 1
to Window Maker Dev
RGB hexadecimal values start with hashes, which might be interpreted by
Bourne-derived or POSIX-compliant shells as beginning comments, so quote
those arguments in the usage example.

Original patch by Gordon Fraser <gor...@debian.org>

Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
wmCalClock/Src/wmCalClock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmCalClock/Src/wmCalClock.c b/wmCalClock/Src/wmCalClock.c
index 89a2be0a688a..d86d8c9d9b58 100644
--- a/wmCalClock/Src/wmCalClock.c
+++ b/wmCalClock/Src/wmCalClock.c
@@ -890,7 +890,7 @@ void print_usage(){
printf("\t-l\t\tUse a low-color pixmap to conserve colors. On 8-bit displays the\n");
printf("\t \t\tlow color pixmap will always be used.\n");
printf("\t-h\t\tDisplay help screen.\n");
- printf("\nExample: wmCalClock -b 100 -tc #001100 -bc #7e9e69 \n\n");
+ printf("\nExample: wmCalClock -b 100 -tc '#001100' -bc '#7e9e69' \n\n");

}

--
2.45.2

Jeremy Sowden

unread,
Jan 1, 2025, 8:52:42 AMJan 1
to Window Maker Dev
This patch-set applies three old patches from the Debian package, updates the
maintainer details and build-system, updates the change-log, and bumps the
version to 1.26.

Jeremy Sowden (8):
wmCalClock: correct example on usage screen
wmCalClock: add `-g` switch to man-page
wmCalClock: show local time in 30-hour format
wmCalClock: fix typo in man-page
wmCalClock: update maintainer details to wmaker-dev
wmCalClock: convert build-system to autotools
wmCalClock: add a gitignore(5) file
wmCalClock: bump to 1.26

wmCalClock/.gitignore | 10 ++++++++
wmCalClock/BUGS | 2 +-
wmCalClock/CHANGES | 6 +++++
wmCalClock/HINTS | 5 ++--
wmCalClock/INSTALL | 28 ++++++++-------------
wmCalClock/Makefile.am | 3 +++
wmCalClock/README | 8 +++---
wmCalClock/Src/Makefile | 36 ---------------------------
wmCalClock/Src/Makefile.am | 18 ++++++++++++++
wmCalClock/Src/Makefile.sgi | 36 ---------------------------
wmCalClock/Src/Makefile.solaris | 36 ---------------------------
wmCalClock/Src/wmCalClock.1 | 12 +++++++--
wmCalClock/Src/wmCalClock.c | 44 ++++++++++++++++++++++++++++++---
wmCalClock/Src/xutils.c | 3 +++
wmCalClock/autogen | 6 +++++
wmCalClock/configure.ac | 21 ++++++++++++++++
16 files changed, 136 insertions(+), 138 deletions(-)
create mode 100644 wmCalClock/.gitignore
create mode 100644 wmCalClock/Makefile.am
delete mode 100644 wmCalClock/Src/Makefile
create mode 100644 wmCalClock/Src/Makefile.am
delete mode 100644 wmCalClock/Src/Makefile.sgi
delete mode 100644 wmCalClock/Src/Makefile.solaris
create mode 100755 wmCalClock/autogen
create mode 100644 wmCalClock/configure.ac

--
2.45.2

Jeremy Sowden

unread,
Jan 1, 2025, 8:52:42 AMJan 1
to Window Maker Dev
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
wmCalClock/BUGS | 2 +-
wmCalClock/README | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wmCalClock/BUGS b/wmCalClock/BUGS
index 32f5c37334d1..0c507bb077df 100644
--- a/wmCalClock/BUGS
+++ b/wmCalClock/BUGS
@@ -1 +1 @@
-Please send bug reports to mghen...@lanl.gov
+Please send bug reports to wmake...@googlegroups.com
diff --git a/wmCalClock/README b/wmCalClock/README
index 123ca618160b..10c8304b8ab1 100644
--- a/wmCalClock/README
+++ b/wmCalClock/README
@@ -1,7 +1,9 @@
-wmCalClock-1.24 release
+wmCalClock-1.25 release
-----------------------
-Author....: Michael G. Henderson <mghen...@lanl.gov>
+Currently maintained by the Window Maker Development Team
+<wmake...@googlegroups.com>.

+Original author: Michael G. Henderson <mghen...@lanl.gov>

Description
-----------
@@ -22,7 +24,7 @@ TODO Wish list.

Bugs
-----
-Send bug reports to mghen...@lanl.gov
+Send bug reports to wmake...@googlegroups.com


Copyright
--
2.45.2

Jeremy Sowden

unread,
Jan 1, 2025, 8:52:42 AMJan 1
to Window Maker Dev
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
wmCalClock/CHANGES | 6 ++++++
wmCalClock/HINTS | 2 +-
wmCalClock/README | 2 +-
wmCalClock/Src/wmCalClock.c | 8 +++++++-
wmCalClock/configure.ac | 2 +-
5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/wmCalClock/CHANGES b/wmCalClock/CHANGES
index 47731d7734af..0dead2f53209 100644
--- a/wmCalClock/CHANGES
+++ b/wmCalClock/CHANGES
@@ -2,6 +2,12 @@ wmCalClock changes.

Version Description
------------------------------------------------------------------------------------------------
+Version 1.26 - released 27th December, 2024
+ The addition of a 30-hour mode
+ Some bug-fixes
+ Update maintainer info to the Window Maker Development Team
+ Conversion of the build-system to autotools
+
Version 1.25 - released July 2, 1999.
Some optimization + ignores double click if no command set (patch from
Robert Horn).
diff --git a/wmCalClock/HINTS b/wmCalClock/HINTS
index 041144f5dd51..2aa98a44a1ad 100644
--- a/wmCalClock/HINTS
+++ b/wmCalClock/HINTS
@@ -4,7 +4,7 @@ Generic.
--------
% wmCalClock -h

-wmCalClock version: 1.24
+wmCalClock version: 1.26

usage: wmCalClock [-b <Volume>] [-tc <Color>] [-bc <Color>] [-e "Command"] [-S]
[-24] [-30] [-g] [-s] [-l <longitude>] [-l] [-h]
diff --git a/wmCalClock/README b/wmCalClock/README
index 10c8304b8ab1..1cb62411962f 100644
--- a/wmCalClock/README
+++ b/wmCalClock/README
@@ -1,4 +1,4 @@
-wmCalClock-1.25 release
+wmCalClock-1.26 release
-----------------------
Currently maintained by the Window Maker Development Team
<wmake...@googlegroups.com>.
diff --git a/wmCalClock/Src/wmCalClock.c b/wmCalClock/Src/wmCalClock.c
index dbe9467a2faf..4ba7780ed5bf 100644
--- a/wmCalClock/Src/wmCalClock.c
+++ b/wmCalClock/Src/wmCalClock.c
@@ -1,6 +1,6 @@
/*
*
- * wmCalClock-1.25 (C) 1998, 1999 Mike Henderson (mghen...@lanl.gov)
+ * wmCalClock (C) 1998, 1999 Mike Henderson (mghen...@lanl.gov)
*
* - Its a Calendar Clock....
*
@@ -25,6 +25,12 @@
*
* Changes:
*
+ * Version 1.26 - released 27th December, 2024
+ * The addition of a 30-hour mode
+ * Some bug-fixes
+ * Update maintainer info to the Window Maker Development Team
+ * Conversion of the build-system to autotools
+ *
* Version 1.25 - released July 2, 1999.
* Some optimization + ignores double click if no command set (patch from
* Robert Horn).
diff --git a/wmCalClock/configure.ac b/wmCalClock/configure.ac
index 1fd775c8d4b4..f30fe50f5eea 100644
--- a/wmCalClock/configure.ac
+++ b/wmCalClock/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wmCalClock], [1.25], [wmake...@googlegroups.com])
+AC_INIT([wmCalClock], [1.26], [wmake...@googlegroups.com])
AC_PREREQ([2.69])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.13 no-dist-gzip dist-xz foreign subdir-objects tar-pax -Wall])
--
2.45.2

Jeremy Sowden

unread,
Jan 1, 2025, 8:52:42 AMJan 1
to Window Maker Dev
Times between midnight and 6 AM are displayed as belonging to the previous day.

Original patch from Reid W. Barton.

Link: https://bugs.debian.org/292736
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
wmCalClock/HINTS | 3 ++-
wmCalClock/Src/wmCalClock.1 | 7 ++++++-
wmCalClock/Src/wmCalClock.c | 29 ++++++++++++++++++++++++++++-
3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/wmCalClock/HINTS b/wmCalClock/HINTS
index d3fb26500ec0..041144f5dd51 100644
--- a/wmCalClock/HINTS
+++ b/wmCalClock/HINTS
@@ -7,7 +7,7 @@ Generic.
wmCalClock version: 1.24

usage: wmCalClock [-b <Volume>] [-tc <Color>] [-bc <Color>] [-e "Command"] [-S]
-[-24] [-g] [-s] [-l <longitude>] [-l] [-h]
+[-24] [-30] [-g] [-s] [-l <longitude>] [-l] [-h]

-b <Volume> Beep on the hour. Volume is between -100 to 100.
-tekton Use the Tekton font for time field.
@@ -20,6 +20,7 @@ usage: wmCalClock [-b <Volume>] [-tc <Color>] [-bc <Color>] [-e "Command"] [-S]
-e "Command" Command to execute via double click of mouse button 1.
-S Do not show seconds.
-24 Show 24-hour time. Default is 12 hour AM/PM Time.
+ -30 Show 30-hour local time (hour ranges from 6 to 29).
-g Show Greenwich time.
-s Show Greenwich Mean Sidereal Time (GMST) in 24-hour format.
-L <Longitude> Show Local Sidereal Time (LST) in 24-hour format.
diff --git a/wmCalClock/Src/wmCalClock.1 b/wmCalClock/Src/wmCalClock.1
index 38cd1b58545f..768d2bc4f8ee 100644
--- a/wmCalClock/Src/wmCalClock.1
+++ b/wmCalClock/Src/wmCalClock.1
@@ -3,7 +3,7 @@
WMCALCLOCK \- Dockable Calendar Clock
.SH SYNOPSIS
.B wmCalClock
-[-h] [-display <Display>] [-b <Volume>] [-e <Command>] [-24] [-s] [-S] [-L <Longitude>] [-l] [-tc <color>] [-bc <color>] [-tekton] [-comicsans] [-arial] [-luggerbug] [-jazz]
+[-h] [-display <Display>] [-b <Volume>] [-e <Command>] [-24] [-30] [-s] [-S] [-L <Longitude>] [-l] [-tc <color>] [-bc <color>] [-tekton] [-comicsans] [-arial] [-luggerbug] [-jazz]
.SH DESCRIPTION
.PP
wmCalClock is a simple Calendar Clock with anti-aliased text and drop-shadows.
@@ -25,6 +25,11 @@ has white space in it).
.B \-24
Show time in 24-hour format instead of default 12-hour AM/PM format.
.TP
+.B \-30
+Show local time in 30-hour format. Times between midnight and 6 AM
+are displayed as belonging to the previous day, so the hour ranges
+from 6 to 29.
+.TP
.B \-g
Show Greenwich Mean Time (GMT).
.TP
diff --git a/wmCalClock/Src/wmCalClock.c b/wmCalClock/Src/wmCalClock.c
index d86d8c9d9b58..e5dc520c236c 100644
--- a/wmCalClock/Src/wmCalClock.c
+++ b/wmCalClock/Src/wmCalClock.c
@@ -259,6 +259,7 @@ int xdAMPM[2];
int yAMPM = 95;
int ydAMPM = 6;
int Show24HourTime = 0;
+int Show30HourTime = 0;
int ShowGreenwichTime = 0;
int ShowSiderealTime = 0;
double Longitude;
@@ -502,6 +503,26 @@ int main(int argc, char *argv[]) {
gmst = (gmst - (double)Mins)*60.0;
Secs = (int)gmst;

+ } else if (Show30HourTime){
+
+ CurrentLocalTime = time(CurrentTime);
+ Time = localtime(&CurrentLocalTime);
+
+ /* Careful. Need to handle daylight savings time changes correctly. */
+ if (Time->tm_hour < 6){
+ int old_hour = Time->tm_hour;
+ time_t new_time = CurrentLocalTime - 12 * 60 * 60;
+ Time = localtime(&new_time);
+ Time->tm_hour = old_hour + 24;
+ }
+
+ DayOfMonth = Time->tm_mday-1;
+ DayOfWeek = Time->tm_wday;
+ Month = Time->tm_mon;
+ Hours = Time->tm_hour;
+ Mins = Time->tm_min;
+ Secs = Time->tm_sec;
+
} else {

CurrentLocalTime = time(CurrentTime);
@@ -803,6 +824,11 @@ int i;

Show24HourTime = 1;

+ } else if (!strcmp(argv[i], "-30")){
+
+ Show24HourTime = 1; /* Don't display AM/PM */
+ Show30HourTime = 1;
+
} else if (!strcmp(argv[i], "-b")){

if ((i+1 >= argc)||(argv[i+1][0] == '-')) {
@@ -870,7 +896,7 @@ void print_usage(){

printf("\nwmCalClock version: %s\n", WMCALCLOCK_VERSION);
printf("\nusage: wmCalClock [-b <Volume>] [-tc <Color>] [-bc <Color>] [-e \"Command\"] [-S]\n");
- printf(" [-24] [-g] [-s] [-l <longitude>] [-l] [-jazz] [-tekton] [-luggerbug]\n");
+ printf(" [-24] [-30] [-g] [-s] [-l <longitude>] [-l] [-jazz] [-tekton] [-luggerbug]\n");
printf(" [-arial] [-comicsans] [-h]\n\n");
printf("\t-b <Volume>\tBeep on the hour. Volume is between -100 to 100.\n");
printf("\t-tekton\t\tUse the Tekton font for time field.\n");
@@ -883,6 +909,7 @@ void print_usage(){
printf("\t-e \"Command\"\tCommand to execute via double click of mouse button 1.\n");
printf("\t-S\t\tDo not show seconds.\n");
printf("\t-24\t\tShow 24-hour time. Default is 12 hour AM/PM Time.\n");
+ printf("\t-30\t\tShow 30-hour local time (hour ranges from 6 to 29).\n");
printf("\t-g\t\tShow Greenwich time.\n");
printf("\t-s\t\tShow Greenwich Mean Sidereal Time (GMST) in 24-hour format. \n");
printf("\t-L <Longitude>\tShow Local Sidereal Time (LST) in 24-hour format. \n");
--
2.45.2

Jeremy Sowden

unread,
Jan 1, 2025, 8:52:42 AMJan 1
to Window Maker Dev
Original patch by Reid W. Barton.

Link: https://bugs.debian.org/292735
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
wmCalClock/Src/wmCalClock.1 | 3 +++
1 file changed, 3 insertions(+)

diff --git a/wmCalClock/Src/wmCalClock.1 b/wmCalClock/Src/wmCalClock.1
index 0e46213984e3..38cd1b58545f 100644
--- a/wmCalClock/Src/wmCalClock.1
+++ b/wmCalClock/Src/wmCalClock.1
@@ -25,6 +25,9 @@ has white space in it).
.B \-24
Show time in 24-hour format instead of default 12-hour AM/PM format.
.TP
+.B \-g
+Show Greenwich Mean Time (GMT).
+.TP
.B \-s
Show Greenwich Mean Sidereal Time (GMST) in 24-hour format.
.TP
--
2.45.2

Jeremy Sowden

unread,
Jan 1, 2025, 8:52:42 AMJan 1
to Window Maker Dev
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
wmCalClock/INSTALL | 28 +++++++++----------------
wmCalClock/Makefile.am | 3 +++
wmCalClock/Src/Makefile | 36 ---------------------------------
wmCalClock/Src/Makefile.am | 18 +++++++++++++++++
wmCalClock/Src/Makefile.sgi | 36 ---------------------------------
wmCalClock/Src/Makefile.solaris | 36 ---------------------------------
wmCalClock/Src/wmCalClock.c | 5 ++++-
wmCalClock/Src/xutils.c | 3 +++
wmCalClock/autogen | 6 ++++++
wmCalClock/configure.ac | 21 +++++++++++++++++++
10 files changed, 65 insertions(+), 127 deletions(-)
create mode 100644 wmCalClock/Makefile.am
delete mode 100644 wmCalClock/Src/Makefile
create mode 100644 wmCalClock/Src/Makefile.am
delete mode 100644 wmCalClock/Src/Makefile.sgi
delete mode 100644 wmCalClock/Src/Makefile.solaris
create mode 100755 wmCalClock/autogen
create mode 100644 wmCalClock/configure.ac

diff --git a/wmCalClock/INSTALL b/wmCalClock/INSTALL
index c8b03e4ab4a3..50e402dbfa62 100644
--- a/wmCalClock/INSTALL
+++ b/wmCalClock/INSTALL
@@ -1,24 +1,16 @@
Installation instructions for wmCalClock.

Requirements
---------------------------------------------------------------
-wmCalClock requires the Xpm library (which should be available on
-most machines with XFree86 installed).
+--------------------------------------------------------------------------------
+wmCalClock requires the Xpm and Xext libraries (which should be available on
+most machines with X11 installed).

Installation
---------------------------------------------------------------
+--------------------------------------------------------------------------------
1) gunzip wmCalClock-x.xx.tar.gz
-1) tar -xvf wmCalClock-x.xx.tar
-2) cd wmCalClock-x.xx/Src/
-3) make
-4) make install (must be root)
-5) wmCalClock & (or 'wmCalClock -h' for help, or 'man wmCalClock' for the man page)
-
-
-Notes:
-
-- On FreeBSD, you may need to use gmake.
-- On Solaris 2.6, -lsocket is required (use the Solaris-specfic
- LIB line in the Makefile instead of the default one for Linux).
-- On SGI/IRIX, use gmake (?) or the Makefile.sgi
-
+2) tar -xvf wmCalClock-x.xx.tar
+3) cd wmCalClock-x.xx
+4) ./configure
+5) make
+6) make install (must be root)
+7) wmCalClock & (or 'wmCalClock -h' for help, or 'man wmCalClock' for the man page)
diff --git a/wmCalClock/Makefile.am b/wmCalClock/Makefile.am
new file mode 100644
index 000000000000..e917a94c1635
--- /dev/null
+++ b/wmCalClock/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = BUGS CHANGES HINTS INSTALL
+
+SUBDIRS = Src
diff --git a/wmCalClock/Src/Makefile b/wmCalClock/Src/Makefile
deleted file mode 100644
index d0e6b22baf49..000000000000
--- a/wmCalClock/Src/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
-
-# for Linux
-LIBS = -lXpm -lX11 -lXext
-
-# for Solaris
-# LIBS = -lXpm -lX11 -lXext -lsocket -lnsl
-
-OBJS = wmCalClock.o \
- xutils.o
-
-
-.c.o:
- $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-
-
-all: wmCalClock.o wmCalClock
-
-wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
-wmCalClock: $(OBJS)
- $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
-
-clean:
- for i in $(OBJS) ; do \
- rm -f $$i; \
- done
- rm -f wmCalClock
-
-install:: wmCalClock
- install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
-
diff --git a/wmCalClock/Src/Makefile.am b/wmCalClock/Src/Makefile.am
new file mode 100644
index 000000000000..d5b6d032aca1
--- /dev/null
+++ b/wmCalClock/Src/Makefile.am
@@ -0,0 +1,18 @@
+AM_CFLAGS = $(x11_CFLAGS) \
+ $(xext_CFLAGS) \
+ $(xpm_CFLAGS)
+
+LDADD = $(x11_LIBS) \
+ $(xext_LIBS) \
+ $(xpm_LIBS)
+
+bin_PROGRAMS = wmCalClock
+
+wmCalClock_SOURCES = wmCalClock.c \
+ wmCalClock_mask.xbm \
+ wmCalClock_master.xpm \
+ wmCalClock_master_LowColor.xpm \
+ xutils.c \
+ xutils.h
+
+dist_man_MANS = wmCalClock.1
diff --git a/wmCalClock/Src/Makefile.sgi b/wmCalClock/Src/Makefile.sgi
deleted file mode 100644
index 436dc5ac3d9c..000000000000
--- a/wmCalClock/Src/Makefile.sgi
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
-
-# for Linux, IRIX
-LIBS = -lXpm -lX11 -lXext
-
-# for Solaris
-# LIBS = -lXpm -lX11 -lXext -lsocket -lnsl
-
-OBJS = wmCalClock.o \
- xutils.o
-
-
-.c.o:
- $(CC) $(CFLAGS) -c $< -o $*.o $(INCDIR)
-
-
-all: wmCalClock.o wmCalClock
-
-wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
-wmCalClock: $(OBJS)
- $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $(OBJS) $(INCDIR) $(LIBDIR) $(LIBS)
-
-clean:
- for i in $(OBJS) ; do \
- rm -f $$i; \
- done
- rm -f wmCalClock
-
-install:: wmCalClock
- install -s -m 0755 wmCalClock $(DESTDIR)/bin
- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
-
diff --git a/wmCalClock/Src/Makefile.solaris b/wmCalClock/Src/Makefile.solaris
deleted file mode 100644
index 4385c29f9e98..000000000000
--- a/wmCalClock/Src/Makefile.solaris
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
-
-# for Linux
-#LIBS = -lXpm -lX11 -lXext
-
-# for Solaris
-LIBS = -lXpm -lX11 -lXext -lsocket -lnsl
-
-OBJS = wmCalClock.o \
- xutils.o
-
-
-.c.o:
- $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-
-
-all: wmCalClock.o wmCalClock
-
-wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
-wmCalClock: $(OBJS)
- $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
-
-clean:
- for i in $(OBJS) ; do \
- rm -f $$i; \
- done
- rm -f wmCalClock
-
-install:: wmCalClock
- install -s -m 0755 wmCalClock $(DESTDIR)/bin
- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
-
diff --git a/wmCalClock/Src/wmCalClock.c b/wmCalClock/Src/wmCalClock.c
index e5dc520c236c..dbe9467a2faf 100644
--- a/wmCalClock/Src/wmCalClock.c
+++ b/wmCalClock/Src/wmCalClock.c
@@ -87,6 +87,9 @@
/*
* Includes
*/
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
@@ -105,7 +108,7 @@
* Delay between refreshes (in microseconds)
*/
#define DELAY 10000L
-#define WMCALCLOCK_VERSION "1.25"
+#define WMCALCLOCK_VERSION PACKAGE_VERSION



diff --git a/wmCalClock/Src/xutils.c b/wmCalClock/Src/xutils.c
index 008afa577eba..51c82f4e60e0 100644
--- a/wmCalClock/Src/xutils.c
+++ b/wmCalClock/Src/xutils.c
@@ -28,6 +28,9 @@
*
*
*/
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/wmCalClock/autogen b/wmCalClock/autogen
new file mode 100755
index 000000000000..2a595ccfc9fd
--- /dev/null
+++ b/wmCalClock/autogen
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+AUTOMAKE="automake --add-missing"
+export AUTOMAKE
+
+exec autoreconf --install "$@"
diff --git a/wmCalClock/configure.ac b/wmCalClock/configure.ac
new file mode 100644
index 000000000000..1fd775c8d4b4
--- /dev/null
+++ b/wmCalClock/configure.ac
@@ -0,0 +1,21 @@
+AC_INIT([wmCalClock], [1.25], [wmake...@googlegroups.com])
+AC_PREREQ([2.69])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([1.13 no-dist-gzip dist-xz foreign subdir-objects tar-pax -Wall])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([Src/wmCalClock.c])
+
+AC_PROG_CC
+AC_PROG_INSTALL
+
+PKG_CHECK_MODULES([x11], [x11])
+PKG_CHECK_MODULES([xext], [xext])
+PKG_CHECK_MODULES([xpm], [xpm])
+
+AC_CHECK_LIB([nsl], [gethostbyname])
+AC_CHECK_LIB([socket], [connect])
+
+AC_CHECK_HEADERS([unistd.h])
+
+AC_CONFIG_FILES([Makefile Src/Makefile])
+AC_OUTPUT
--
2.45.2

Jeremy Sowden

unread,
Jan 1, 2025, 8:52:42 AMJan 1
to Window Maker Dev
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
wmCalClock/Src/wmCalClock.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmCalClock/Src/wmCalClock.1 b/wmCalClock/Src/wmCalClock.1
index 768d2bc4f8ee..53837f51d6d5 100644
--- a/wmCalClock/Src/wmCalClock.1
+++ b/wmCalClock/Src/wmCalClock.1
@@ -37,7 +37,7 @@ Show Greenwich Mean Time (GMT).
Show Greenwich Mean Sidereal Time (GMST) in 24-hour format.
.TP
.B \-S
-Dont show seconds.
+Don't show seconds.
.TP
.B \-L <Longitude>
Show Local Sidereal Time (LST) in 24-hour format. Longitude is in degrees
--
2.45.2

Reply all
Reply to author
Forward
0 new messages