sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-01 02:56:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

MFH: r547351

Browse source 
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

Approved by:	ports-secteam (blanket, build fix, -fno-common)
This commit is contained in:
Fernando Apesteguía 2020-09-02 10:12:23 +00:00
parent d3fd134e56
commit e2b0c0d455
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q3/; revision=547352
4 changed files with 110 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
x11-clocks/wmbinclock/Makefile
View file

@ -16,10 +16,9 @@ GH_ACCOUNT= engerim42
PLIST_FILES= bin/wmBinClock PLIST_FILES= bin/wmBinClock
USES= gmake xorg USES= gmake xorg
USE_XORG= xpm USE_XORG= x11 xext xpm
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|#include <values.h>||' ${WRKSRC}/wmBinClock.c
@${REINPLACE_CMD} -e 's|^CC.*=|CC ?=|' -e 's|^CFLAGS.*=|CFLAGS +=|' \ @${REINPLACE_CMD} -e 's|^CC.*=|CC ?=|' -e 's|^CFLAGS.*=|CFLAGS +=|' \
-e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile

76
x11-clocks/wmbinclock/files/patch-wmBinClock.c Normal file
View file

@ -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");

15
x11-clocks/wmbinclock/files/patch-xutils.c Normal file
View file

@ -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;

18
x11-clocks/wmbinclock/files/patch-xutils.h Normal file
View file

@ -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;