FreeBSD Bugzilla – Attachment 196518 Details for
Bug 230881
biology/seaview: Fix build with Clang 6
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
biology__seaview.diff
biology__seaview.diff (text/plain), 4.61 KB, created by
Tobias Kortkamp
on 2018-08-25 03:53:40 UTC
(
hide
)
Description:
biology__seaview.diff
Filename:
MIME Type:
Creator:
Tobias Kortkamp
Created:
2018-08-25 03:53:40 UTC
Size:
4.61 KB
patch
obsolete
>Index: files/patch-seaview.cxx >=================================================================== >--- files/patch-seaview.cxx (nonexistent) >+++ files/patch-seaview.cxx (working copy) >@@ -0,0 +1,34 @@ >+--- seaview.cxx.orig 2018-08-25 03:49:10 UTC >++++ seaview.cxx >+@@ -3349,7 +3349,7 @@ else if(reponse == PRINTOUT && view->tot_seqs > 0) { >+ if(p != NULL) *p = 0; >+ if(printout_black == TEXT_ONLY) strcat(suggested, ".txt"); >+ else { >+- strcat(suggested, "."PDF_OR_PS_EXT); >++ strcat(suggested, "." PDF_OR_PS_EXT); >+ } >+ if( view->alt_col_rank != NULL ) { >+ for(anerr = 0; anerr < view->tot_seqs; anerr++) >+@@ -3459,7 +3459,7 @@ fl_font(FL_HELVETICA, FL_NORMAL_SIZE); >+ >+ pdf_form = new Fl_Window(415, 90); >+ pdf_form->box(FL_FLAT_BOX); >+-pdf_form->label("Set "PDF_OR_PS" output options"); >++pdf_form->label("Set " PDF_OR_PS " output options"); >+ >+ x = 5 + (int)fl_width("block size:"); y = 5; w = 50; h = 25; >+ sizeinput = new Fl_Input(x, y, w, h, "font size:"); >+@@ -5048,10 +5048,10 @@ menus->spacing(2); >+ {"Save prot alignmt", 0,file_menu_callback, 0, FL_MENU_INACTIVE}, >+ {"Save bootstrap replicates", 0,file_menu_callback, 0, FL_MENU_INACTIVE | FL_MENU_DIVIDER}, >+ #if !defined(__APPLE__) >+- {"Prepare "PDF_OR_PS"", 0, file_menu_callback, 0, 0}, >+- {""PDF_OR_PS" options...", 0, file_menu_callback, 0, FL_MENU_DIVIDER}, >++ {"Prepare " PDF_OR_PS "", 0, file_menu_callback, 0, 0}, >++ {"" PDF_OR_PS " options...", 0, file_menu_callback, 0, FL_MENU_DIVIDER}, >+ #else >+- {"Prepare "PDF_OR_PS"", 0, file_menu_callback, 0, FL_MENU_DIVIDER}, >++ {"Prepare " PDF_OR_PS "", 0, file_menu_callback, 0, FL_MENU_DIVIDER}, >+ #endif >+ {"Concatenate", 0,file_menu_callback, 0, FL_MENU_DIVIDER}, >+ {"New window", FL_COMMAND | 'n', file_menu_callback, 0, 0}, > >Property changes on: files/patch-seaview.cxx >___________________________________________________________________ >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-treedraw.cxx >=================================================================== >--- files/patch-treedraw.cxx (nonexistent) >+++ files/patch-treedraw.cxx (working copy) >@@ -0,0 +1,11 @@ >+--- treedraw.cxx.orig 2018-08-25 03:51:23 UTC >++++ treedraw.cxx >+@@ -322,7 +322,7 @@ Fl_Window *treedraw(char *trees, SEA_VIEW *view, const >+ {"Save all trees", 0, file_callback, NULL, 0}, >+ {"Save patristic distances", 0, patristic_callback, NULL, FL_MENU_DIVIDER}, >+ {"Print", FL_COMMAND | 'p', file_callback, NULL, 0}, >+- {"Save as "PDF_OR_PS"", 0, file_callback, NULL, 0}, >++ {"Save as " PDF_OR_PS "", 0, file_callback, NULL, 0}, >+ {"A4", 0, file_callback, NULL, FL_MENU_RADIO | 0}, >+ {"Letter", 0, file_callback, NULL, FL_MENU_RADIO | 0}, >+ {"Landscape", 0, file_callback, NULL, FL_MENU_TOGGLE}, > >Property changes on: files/patch-treedraw.cxx >___________________________________________________________________ >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-xfmatpt.cxx >=================================================================== >--- files/patch-xfmatpt.cxx (nonexistent) >+++ files/patch-xfmatpt.cxx (working copy) >@@ -0,0 +1,20 @@ >+--- xfmatpt.cxx.orig 2018-08-25 03:50:10 UTC >++++ xfmatpt.cxx >+@@ -205,7 +205,7 @@ fin += width + 2; >+ compute->callback(compute_proc, fdui); >+ fdui->compute_butt = compute; >+ >+-Fl_Widget *postscript = cre_button(fin, curr_y, &width, but_height, fontsize, "Write "PDF_OR_PS); >++Fl_Widget *postscript = cre_button(fin, curr_y, &width, but_height, fontsize, "Write " PDF_OR_PS); >+ fin += width; >+ postscript->callback(plot_button_proc, fdui); >+ >+@@ -870,7 +870,7 @@ if (setjmp(*jbuf) == 0) { >+ #ifndef MICRO >+ matpt->form->hide(); Fl::flush(); // because of strange bug on 32-bit Linux only >+ #endif >+- fl_message("Dot plot is now in file\n%s\nin "PDF_OR_PS" format", surface->outfname()); >++ fl_message("Dot plot is now in file\n%s\nin " PDF_OR_PS " format", surface->outfname()); >+ delete surface; >+ #ifndef MICRO >+ matpt->form->show(); Fl::flush(); > >Property changes on: files/patch-xfmatpt.cxx >___________________________________________________________________ >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 230881
: 196518