d/patches: remove obsolete patches
Most of them have been upstreamed, and the rest rendered obsolete by the new autotools build-system. Signed-off-by: Jeremy Sowden <azazel@debian.org>
This commit is contained in:
Jeremy Sowden
37
debian/patches/00-debian-local-changes.patch
vendored
37
debian/patches/00-debian-local-changes.patch
vendored
@ -1,37 +0,0 @@
|
||||
From: Unknown
|
||||
Subject: Local Debian changes
|
||||
|
||||
diff --git a/Src/Makefile b/Src/Makefile
|
||||
index fecc1f9..8f40445 100644
|
||||
--- a/Src/Makefile
|
||||
+++ b/Src/Makefile
|
||||
@@ -3,6 +3,7 @@ CFLAGS = -O2 -Wall
|
||||
INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
|
||||
DESTDIR= /usr/X11R6
|
||||
LIBDIR = -L/usr/X11R6/lib
|
||||
+INSTALL_PROGRAM = install -c -s -m 0755
|
||||
|
||||
# for Linux
|
||||
LIBS = -lXpm -lX11 -lXext
|
||||
@@ -31,6 +32,6 @@ clean:
|
||||
rm -f wmCalClock
|
||||
|
||||
install:: wmCalClock
|
||||
- install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
|
||||
- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
|
||||
+ $(INSTALL_PROGRAM) wmCalClock $(DESTDIR)/bin/wmcalclock
|
||||
+ install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1/wmcalclock.1
|
||||
|
||||
diff --git a/Src/wmCalClock.c b/Src/wmCalClock.c
|
||||
index fa9a2f7..a6dcf59 100644
|
||||
--- a/Src/wmCalClock.c
|
||||
+++ b/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");
|
||||
|
||||
}
|
||||
|
||||
16
debian/patches/01-manpage-patch.patch
vendored
16
debian/patches/01-manpage-patch.patch
vendored
@ -1,16 +0,0 @@
|
||||
From: Kevin Coyner <kcoyner@debian.org>
|
||||
Subject: manpage-patch
|
||||
|
||||
|
||||
--- wmcalclock-1.25/Src/wmCalClock.1 1999-03-28 22:16:23.000000000 +0000
|
||||
+++ wmcalclock-1.25-rwbarton/Src/wmCalClock.1 2005-01-29 10:02:30.000000000 +0000
|
||||
@@ -25,6 +25,9 @@
|
||||
.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
|
||||
69
debian/patches/02-30hr-patch.patch
vendored
69
debian/patches/02-30hr-patch.patch
vendored
@ -1,69 +0,0 @@
|
||||
From: Kevin Coyner <kcoyner@debian.org>
|
||||
Subject: 30hr-patch See Debian bug #292736
|
||||
Original patch from Reid W. Barton
|
||||
Show local time in 30-hour format. Times between midnight and 6 AM
|
||||
are displayed as belonging to the previous day,
|
||||
|
||||
|
||||
--- wmcalclock-1.25/Src/wmCalClock.c~ 2007-06-04 11:16:43.000000000 -0400
|
||||
+++ wmcalclock-1.25/Src/wmCalClock.c 2007-06-04 11:14:31.000000000 -0400
|
||||
@@ -259,6 +259,7 @@
|
||||
int yAMPM = 95;
|
||||
int ydAMPM = 6;
|
||||
int Show24HourTime = 0;
|
||||
+int Show30HourTime = 0;
|
||||
int ShowGreenwichTime = 0;
|
||||
int ShowSiderealTime = 0;
|
||||
double Longitude;
|
||||
@@ -502,6 +503,26 @@
|
||||
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,16 @@
|
||||
|
||||
Show24HourTime = 1;
|
||||
|
||||
+ } else if (!strcmp(argv[i], "-30")){
|
||||
+
|
||||
+ Show24HourTime = 1; /* Don't display AM/PM */
|
||||
+ Show30HourTime = 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] == '-')) {
|
||||
@@ -883,6 +914,7 @@
|
||||
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");
|
||||
18
debian/patches/03-manapge-30hr-patch.patch
vendored
18
debian/patches/03-manapge-30hr-patch.patch
vendored
@ -1,18 +0,0 @@
|
||||
From: Kevin Coyner <kcoyner@debian.org>
|
||||
Subject: mapage 30hr
|
||||
|
||||
|
||||
--- wmcalclock-1.25/Src/wmCalClock.1~ 2007-06-04 11:37:04.000000000 -0400
|
||||
+++ wmcalclock-1.25/Src/wmCalClock.1 2007-06-04 11:37:46.000000000 -0400
|
||||
@@ -25,6 +25,11 @@
|
||||
.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
|
||||
31
debian/patches/04-makefile-modifications.patch
vendored
31
debian/patches/04-makefile-modifications.patch
vendored
@ -1,31 +0,0 @@
|
||||
From: Kevin Coyner <kcoyner@debian.org>
|
||||
Subject: Modifications to Src/Makefile
|
||||
|
||||
diff -urNad wmcalclock-1.25~/Src/Makefile wmcalclock-1.25/Src/Makefile
|
||||
--- wmcalclock-1.25~/Src/Makefile 2009-10-18 22:35:56.000000000 -0400
|
||||
+++ wmcalclock-1.25/Src/Makefile 2009-10-21 12:31:49.000000000 -0400
|
||||
@@ -1,9 +1,9 @@
|
||||
-CC = gcc
|
||||
-CFLAGS = -O2 -Wall
|
||||
+CC = $(DEB_HOST_GNU_TYPE)-gcc
|
||||
+CFLAGS = -W -Wall
|
||||
INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
|
||||
DESTDIR= /usr/X11R6
|
||||
LIBDIR = -L/usr/X11R6/lib
|
||||
-INSTALL_PROGRAM = install -c -s -m 0755
|
||||
+INSTALL_PROGRAM = install -p -o root -g root -m 755
|
||||
|
||||
# for Linux
|
||||
LIBS = -lXpm -lX11 -lXext
|
||||
@@ -14,11 +14,9 @@
|
||||
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
|
||||
41
debian/patches/05-fix-ftbfs.patch
vendored
41
debian/patches/05-fix-ftbfs.patch
vendored
@ -1,41 +0,0 @@
|
||||
Description: Fix ftbfs with GCC-10
|
||||
|
||||
Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
|
||||
Bug-Debian: https://bugs.debian.org/957941
|
||||
Forwarded: no
|
||||
|
||||
---
|
||||
|
||||
--- a/Src/xutils.c
|
||||
+++ b/Src/xutils.c
|
||||
@@ -53,6 +53,11 @@
|
||||
XpmIcon wmgen;
|
||||
Pixmap pixmask;
|
||||
|
||||
+Display *display;
|
||||
+Window Root;
|
||||
+Window iconwin, win;
|
||||
+int screen;
|
||||
+int DisplayDepth;
|
||||
|
||||
/*
|
||||
* Colors for wmCalClock
|
||||
--- a/Src/xutils.h
|
||||
+++ b/Src/xutils.h
|
||||
@@ -18,11 +18,11 @@
|
||||
/*
|
||||
* Global variable
|
||||
*/
|
||||
-Display *display;
|
||||
-Window Root;
|
||||
-Window iconwin, win;
|
||||
-int screen;
|
||||
-int DisplayDepth;
|
||||
+extern Display *display;
|
||||
+extern Window Root;
|
||||
+extern Window iconwin, win;
|
||||
+extern int screen;
|
||||
+extern int DisplayDepth;
|
||||
|
||||
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
Author: Jeremy Sowden <azazel@debian.org>
|
||||
Last-Update: 2024-12-24
|
||||
Description: fix type of arguments to `gmtime(3)` and `localtime(3)`
|
||||
With recent versions of gcc, on architectures where `long` and `time_t` are not
|
||||
the same size, passing pointers to `long` to `gmtime(3)` and `localtime(3)`,
|
||||
leads to "incompatible pointer type" errors. Use `time_t` instead.
|
||||
Bug-Debian: https://bugs.debian.org/1091253
|
||||
Forwarded: https://groups.google.com/g/wmaker-dev/c/WO4eE63SCEo
|
||||
|
||||
--- a/Src/wmCalClock.c
|
||||
+++ b/Src/wmCalClock.c
|
||||
@@ -300,7 +300,7 @@
|
||||
int i, n, wid, extrady, extradx;
|
||||
int Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth;
|
||||
int Hours, Mins, Secs, OldSecs, digit, xoff, D[10], xsize;
|
||||
- long CurrentLocalTime;
|
||||
+ time_t CurrentLocalTime;
|
||||
double UT, TU, TU2, TU3, T0, gmst, jd(), hour24();
|
||||
|
||||
|
||||
7
debian/patches/series
vendored
7
debian/patches/series
vendored
@ -1,7 +0,0 @@
|
||||
00-debian-local-changes.patch
|
||||
01-manpage-patch.patch
|
||||
02-30hr-patch.patch
|
||||
03-manapge-30hr-patch.patch
|
||||
04-makefile-modifications.patch
|
||||
05-fix-ftbfs.patch
|
||||
06-fix-incompatible-pointer-type-errors.patch
|
||||
Reference in New Issue
Block a user