Date: Wed, 2 Sep 2020 10:05:06 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547351 - in head/x11-clocks/wmbinclock: . files Message-ID: <202009021005.082A56cK003234@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Wed Sep 2 10:05:06 2020 New Revision: 547351 URL: https://svnweb.freebsd.org/changeset/ports/547351 Log: x11-clocks/wmbinclock: fix build in current Another case of -fno-common issue. While here, add a couple of missing xorg modules and remove a noop REINPLACE_CMD PR: 249048 Submitted by: logix@foobar.franken.de MFH: 2020Q3 (build fix, -fno-common) Added: head/x11-clocks/wmbinclock/files/ head/x11-clocks/wmbinclock/files/patch-wmBinClock.c (contents, props changed) head/x11-clocks/wmbinclock/files/patch-xutils.c (contents, props changed) head/x11-clocks/wmbinclock/files/patch-xutils.h (contents, props changed) Modified: head/x11-clocks/wmbinclock/Makefile Modified: head/x11-clocks/wmbinclock/Makefile ============================================================================== --- head/x11-clocks/wmbinclock/Makefile Wed Sep 2 09:38:08 2020 (r547350) +++ head/x11-clocks/wmbinclock/Makefile Wed Sep 2 10:05:06 2020 (r547351) @@ -16,10 +16,9 @@ GH_ACCOUNT= engerim42 PLIST_FILES= bin/wmBinClock USES= gmake xorg -USE_XORG= xpm +USE_XORG= x11 xext xpm post-patch: - @${REINPLACE_CMD} -e 's|#include <values.h>||' ${WRKSRC}/wmBinClock.c @${REINPLACE_CMD} -e 's|^CC.*=|CC ?=|' -e 's|^CFLAGS.*=|CFLAGS +=|' \ -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile Added: head/x11-clocks/wmbinclock/files/patch-wmBinClock.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/wmbinclock/files/patch-wmBinClock.c Wed Sep 2 10:05:06 2020 (r547351) @@ -0,0 +1,76 @@ +--- wmBinClock.c.orig 2015-12-06 01:59:53 UTC ++++ wmBinClock.c +@@ -58,8 +58,9 @@ int GotFirstClick1, GotDoubleClick1; + int GotFirstClick2, GotDoubleClick2; + int GotFirstClick3, GotDoubleClick3; + int DblClkDelay; ++extern Display *display; + +-void IntToBinary(int x, int *str[]); ++void IntToBinary(int x, int *str); + void PrintHelp(char err[]); + + int main(int argc, char *argv[]) +@@ -660,7 +661,7 @@ int main(int argc, char *argv[]) + } + + tmp_hour = tmworld->tm_hour; +- IntToBinary(tmp_hour, &tmp_str); ++ IntToBinary(tmp_hour, tmp_str); + + for (s = 0; s < 6; s++) + { +@@ -671,7 +672,7 @@ int main(int argc, char *argv[]) + } + + tmp_minute = tmworld->tm_min; +- IntToBinary(tmp_minute, &tmp_str); ++ IntToBinary(tmp_minute, tmp_str); + for (s = 0; s < 6; s++) + { + if (tmp_str[s] == 1) +@@ -681,7 +682,7 @@ int main(int argc, char *argv[]) + } + + tmp_second = tmworld->tm_sec; +- IntToBinary(tmp_second, &tmp_str); ++ IntToBinary(tmp_second, tmp_str); + + for (s = 0; s < 6; s++) + { +@@ -692,7 +693,7 @@ int main(int argc, char *argv[]) + } + + tmp_day = tmworld->tm_mday; +- IntToBinary(tmp_day, &tmp_str); ++ IntToBinary(tmp_day, tmp_str); + + for (s = 0; s < 6; s++) + { +@@ -703,7 +704,7 @@ int main(int argc, char *argv[]) + } + + tmp_month = tmworld->tm_mon + 1; +- IntToBinary(tmp_month, &tmp_str); ++ IntToBinary(tmp_month, tmp_str); + + for (s = 0; s < 6; s++) + { +@@ -773,7 +774,7 @@ int main(int argc, char *argv[]) + usleep(DELAY); + } + } +-void IntToBinary(int x, int *str[]) ++void IntToBinary(int x, int *str) + { + int i = 0; + int counter = 0; +@@ -884,7 +885,7 @@ void PrintHelp(char err[]) + strcpy(str,"Error in "); + strcat(str,err); + strcat(str,".\n\n"); +- printf(str); ++ printf("%s", str); + } + + printf("Usage: wmBinClock [OPTIONS]\n\n"); Added: head/x11-clocks/wmbinclock/files/patch-xutils.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/wmbinclock/files/patch-xutils.c Wed Sep 2 10:05:06 2020 (r547351) @@ -0,0 +1,15 @@ +--- xutils.c.orig 2015-12-06 01:59:53 UTC ++++ xutils.c +@@ -52,6 +52,12 @@ char *Geometry = ""; + XpmIcon wmgen; + Pixmap pixmask; + ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; ++GC NormalGC; + + + Added: head/x11-clocks/wmbinclock/files/patch-xutils.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/wmbinclock/files/patch-xutils.h Wed Sep 2 10:05:06 2020 (r547351) @@ -0,0 +1,18 @@ +--- xutils.h.orig 2015-12-06 01:59:53 UTC ++++ xutils.h +@@ -15,15 +15,6 @@ typedef struct { + + + +-/* +- * Global variable +- */ +-Display *display; +-Window Root; +-Window iconwin, win; +-int screen; +-int DisplayDepth; +-GC NormalGC; + + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009021005.082A56cK003234>