diff options
author | Nicola Vitale <nivit@FreeBSD.org> | 2017-02-06 18:29:22 +0000 |
---|---|---|
committer | Nicola Vitale <nivit@FreeBSD.org> | 2017-02-06 18:29:22 +0000 |
commit | ee38116b66c0acb825fc8ec00ffb2c2c9ae2bd77 (patch) | |
tree | 12223c8775e58b73286ab73ecadd3639eb976a97 | |
parent | Undocument a linux-*-curl vulnerability that has low impact and Red Hat (diff) |
- Fix build with gcc 5
PR: 216806
Submitted by: jbeich
Notes
Notes:
svn path=/head/; revision=433507
-rw-r--r-- | graphics/gle-graphics/files/patch-src_manip_all.h | 11 | ||||
-rw-r--r-- | graphics/gle-graphics/files/patch-src_manip_filemenu.cpp | 17 |
2 files changed, 28 insertions, 0 deletions
diff --git a/graphics/gle-graphics/files/patch-src_manip_all.h b/graphics/gle-graphics/files/patch-src_manip_all.h new file mode 100644 index 000000000000..81fd7e98942d --- /dev/null +++ b/graphics/gle-graphics/files/patch-src_manip_all.h @@ -0,0 +1,11 @@ +--- src/manip/all.h.orig 2010-12-26 17:07:31 UTC ++++ src/manip/all.h +@@ -143,7 +143,7 @@ typedef char (*(*TOKENS)[500]); + typedef unsigned char uchar; + typedef double dbl; + char *unquote(char *s); +-const char *gledir(const char *s); ++string gledir(const char *s); + int set_missing(int x, int y); + double vcell(int x, int y); + void var_find_rc(int *idx, int *var, int *nd, int c); diff --git a/graphics/gle-graphics/files/patch-src_manip_filemenu.cpp b/graphics/gle-graphics/files/patch-src_manip_filemenu.cpp new file mode 100644 index 000000000000..fa79ffdfd975 --- /dev/null +++ b/graphics/gle-graphics/files/patch-src_manip_filemenu.cpp @@ -0,0 +1,17 @@ +--- src/manip/filemenu.cpp.orig 2010-06-14 15:34:39 UTC ++++ src/manip/filemenu.cpp +@@ -404,10 +404,12 @@ void do_help(const char *k1, const char + gotoxy(1,1); + wprintf("Manip help on topic {%s}, sub topic {%s}",k1,k2); + scr_menubg(); +- hfile = fopen(gledir(hfilename),"r"); ++ string fname = gledir(hfilename); ++ hfilename = fname.c_str(); ++ hfile = fopen(fname.c_str(),"r"); + if (hfile==NULL) { + gotoxy(1,3); +- wprintf("Unable to open {%s} \n",gledir(hfilename)); ++ wprintf("Unable to open {%s} \n",hfilename); + text_inkey(); + return; + } |