From owner-svn-ports-head@freebsd.org Sun Aug 30 03:11:48 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 082343C6CD3; Sun, 30 Aug 2020 03:11:48 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfJJz60lkz4SSV; Sun, 30 Aug 2020 03:11:47 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 99158FBEB; Sun, 30 Aug 2020 03:11:47 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07U3BlYE057321; Sun, 30 Aug 2020 03:11:47 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07U3BlZd057317; Sun, 30 Aug 2020 03:11:47 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <202008300311.07U3BlZd057317@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Sun, 30 Aug 2020 03:11:47 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jpaetzel X-SVN-Commit-Paths: in head/x11-clocks/wmtime: . files X-SVN-Commit-Revision: 546968 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 03:11:48 -0000 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);