FreeBSD Bugzilla – Attachment 217687 Details for
Bug 249048
x11-clocks/wmbinclock: fix recent "ld: error: duplicate symbol" breakage
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svnlite diff
x11-clocks_wmbinclock.diff (text/plain), 4.10 KB, created by
Harold Gutch
on 2020-09-01 08:28:35 UTC
(
hide
)
Description:
svnlite diff
Filename:
MIME Type:
Creator:
Harold Gutch
Created:
2020-09-01 08:28:35 UTC
Size:
4.10 KB
patch
obsolete
>Index: files/patch-wmBinClock.c >=================================================================== >--- files/patch-wmBinClock.c (nonexistent) >+++ files/patch-wmBinClock.c (working copy) >@@ -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"); > >Property changes on: files/patch-wmBinClock.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-xutils.c >=================================================================== >--- files/patch-xutils.c (nonexistent) >+++ files/patch-xutils.c (working copy) >@@ -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; >+ >+ >+ > >Property changes on: files/patch-xutils.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-xutils.h >=================================================================== >--- files/patch-xutils.h (nonexistent) >+++ files/patch-xutils.h (working copy) >@@ -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; >+ >+ >+ > >Property changes on: files/patch-xutils.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 249048
:
217687
|
217702