Attachment #129655 for bug #173687

View | Details | Raw Unified | Return to bug 173687
Collapse All | Expand All

Lines 6-13 Link Here

(-)xlockmore/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= xlockmore	8	PORTNAME= xlockmore
9	PORTVERSION= 5.40	9	PORTVERSION= 5.41
10	PORTREVISION= 1
11	CATEGORIES?= x11	10	CATEGORIES?= x11
12	MASTER_SITES= ftp://ibiblio.org/pub/Linux/X11/screensavers/ \	11	MASTER_SITES= ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
13	http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \	12	http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \

Lines 1-2 Link Here

(-)xlockmore/distinfo (-2 lines)
1	SHA256 (xlockmore-5.40.tar.bz2) = 38ff3e32983b3f9df957431f7f8ed50e823d10246aeb0319e83876793ce5c1b3
2	SIZE (xlockmore-5.40.tar.bz2) = 1962001




--- ./modes/dclock.c.orig	2012-01-23 05:19:21.000000000 -0800
+++ ./modes/dclock.c	2012-10-17 15:20:26.000000000 -0700
@@ -376,11 +376,11 @@
 extern char *message;
 
 static unsigned long
-timeAtLastNewYear(long timeNow)
+timeAtLastNewYear(time_t timeNow)
 {
 	struct tm *t;
 
-	t = localtime((const time_t *) &timeNow);
+	t = localtime(&timeNow);
 	return (unsigned long)(t->tm_year);
 }
 
@@ -420,7 +420,7 @@
 }
 
 static void
-dayhrminsec(long timeCount, int tzoffset, char *string)
+dayhrminsec(time_t timeCount, int tzoffset, char *string)
 {
 	int days, hours, minutes, secs;
 	int bufsize, i;
@@ -675,7 +675,7 @@
 				"%a %b %d %Y", localtime(&(dp->timeold)));
 		}
 	  } else {
-		long timeNow, timeLocal;
+		time_t timeNow, timeLocal;
 		timeNow = seconds();
 		timeLocal = timeNow + dp->tzoffset;
 
@@ -950,7 +950,7 @@
 {
 	Display *display = MI_DISPLAY(mi);
 	dclockstruct *dp;
-	long timeNow, timeLocal;
+	time_t timeNow, timeLocal;
 	int i, j;
 
 	if (dclocks == NULL) {
@@ -1252,7 +1252,7 @@
 			dayhrminsec(MAYAN_TIME_START - timeLocal, dp->tzoffset, dp->strnew[1]);
 			dp->strpta[1] = dp->strnew[1];
 		} else {
-			struct tm *t = localtime((const time_t *) &timeLocal);
+			struct tm *t = localtime(&timeLocal);
 
 			if (dp->time24)
 			  (void) strftime(dp->strnew[0], STRSIZE, "%H:%M:%S", t);

Return to bug 173687

Lines 1-52 Link Here

(-)xlockmore/files/patch-modes__dclock.c (-52 lines)
1	--- ./modes/dclock.c.orig 2012-01-23 05:19:21.000000000 -0800
2	+++ ./modes/dclock.c 2012-10-17 15:20:26.000000000 -0700
3	@@ -376,11 +376,11 @@
4	extern char *message;
5
6	static unsigned long
7	-timeAtLastNewYear(long timeNow)
8	+timeAtLastNewYear(time_t timeNow)
9	{
10	struct tm *t;
11
12	- t = localtime((const time_t *) &timeNow);
13	+ t = localtime(&timeNow);
14	return (unsigned long)(t->tm_year);
15	}
16
17	@@ -420,7 +420,7 @@
18	}
19
20	static void
21	-dayhrminsec(long timeCount, int tzoffset, char *string)
22	+dayhrminsec(time_t timeCount, int tzoffset, char *string)
23	{
24	int days, hours, minutes, secs;
25	int bufsize, i;
26	@@ -675,7 +675,7 @@
27	"%a %b %d %Y", localtime(&(dp->timeold)));
28	}
29	} else {
30	- long timeNow, timeLocal;
31	+ time_t timeNow, timeLocal;
32	timeNow = seconds();
33	timeLocal = timeNow + dp->tzoffset;
34
35	@@ -950,7 +950,7 @@
36	{
37	Display *display = MI_DISPLAY(mi);
38	dclockstruct *dp;
39	- long timeNow, timeLocal;
40	+ time_t timeNow, timeLocal;
41	int i, j;
42
43	if (dclocks == NULL) {
44	@@ -1252,7 +1252,7 @@
45	dayhrminsec(MAYAN_TIME_START - timeLocal, dp->tzoffset, dp->strnew[1]);
46	dp->strpta[1] = dp->strnew[1];
47	} else {
48	- struct tm t = localtime((const time_t ) &timeLocal);
49	+ struct tm *t = localtime(&timeLocal);
50
51	if (dp->time24)
52	(void) strftime(dp->strnew[0], STRSIZE, "%H:%M:%S", t);