Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Aug 2020 03:11:47 +0000 (UTC)
From:      Josh Paetzel <jpaetzel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r546968 - in head/x11-clocks/wmtime: . files
Message-ID:  <202008300311.07U3BlZd057317@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jpaetzel
Date: Sun Aug 30 03:11:46 2020
New Revision: 546968
URL: https://svnweb.freebsd.org/changeset/ports/546968

Log:
  Patch source code to fix the problem -fno-common tripped over
  
  Along the way take maintainership.  I have a soft spot for WM
  
  Fixing this was faster than replying to the thread caused by r546907

Added:
  head/x11-clocks/wmtime/files/patch-wmgeneral.h   (contents, props changed)
  head/x11-clocks/wmtime/files/patch-wmtime.c   (contents, props changed)
Deleted:
  head/x11-clocks/wmtime/files/patch-wmtime.c2
Modified:
  head/x11-clocks/wmtime/Makefile

Modified: head/x11-clocks/wmtime/Makefile
==============================================================================
--- head/x11-clocks/wmtime/Makefile	Sun Aug 30 03:10:23 2020	(r546967)
+++ head/x11-clocks/wmtime/Makefile	Sun Aug 30 03:11:46 2020	(r546968)
@@ -3,20 +3,14 @@
 
 PORTNAME=	wmtime
 PORTVERSION=	1.0b2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ \
 		http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Time/Date applet for WindowMaker
-
-# Fix build with llvm 11
-CFLAGS+=	-fcommon
-
-DEPRECATED=	Unmaintained and dead upstream
-EXPIRATION_DATE=2020-09-30
 
 WRKSRC=		${WRKDIR}/wmtime.app/wmtime
 USES=		imake xorg

Added: head/x11-clocks/wmtime/files/patch-wmgeneral.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-clocks/wmtime/files/patch-wmgeneral.h	Sun Aug 30 03:11:46 2020	(r546968)
@@ -0,0 +1,11 @@
+--- ../wmgeneral/wmgeneral.h.orig	2020-08-29 19:54:52.707315000 -0700
++++ ../wmgeneral/wmgeneral.h	2020-08-29 19:55:08.284120000 -0700
+@@ -28,7 +28,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */

Added: head/x11-clocks/wmtime/files/patch-wmtime.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-clocks/wmtime/files/patch-wmtime.c	Sun Aug 30 03:11:46 2020	(r546968)
@@ -0,0 +1,19 @@
+--- wmtime.c.orig	1998-05-19 21:04:53 UTC
++++ wmtime.c
+@@ -89,7 +89,7 @@
+ char	*ProgName;
+ int		digital = 0;
+ char	day_of_week[7][3] = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" };
+-char	mon_of_year[12][4] = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOW", "DEC" };
++char	mon_of_year[12][4] = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" };
+ 
+ /* functions */
+ void usage(void);
+@@ -166,6 +166,7 @@ void get_lang(){
+ char		*left_action = NULL;
+ char		*right_action = NULL;
+ char		*middle_action = NULL;
++Display		*display;
+ 
+ void DrawTime(int, int, int);
+ void DrawWijzer(int, int, int);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008300311.07U3BlZd057317>