aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobik <tobik@FreeBSD.org>2018-09-08 17:01:35 +0800
committertobik <tobik@FreeBSD.org>2018-09-08 17:01:35 +0800
commited07786b43153d38fe5d87d31ecd58659752776c (patch)
tree31a3f83fb54750e422fb85072476255f7316f9d9
parent3d476a2a5f5066f2bd17e6582b64dc775315914b (diff)
downloadfreebsd-ports-gnome-ed07786b43153d38fe5d87d31ecd58659752776c.tar.gz
freebsd-ports-gnome-ed07786b43153d38fe5d87d31ecd58659752776c.tar.zst
freebsd-ports-gnome-ed07786b43153d38fe5d87d31ecd58659752776c.zip
biology/seaview: Fix build with Clang 6
seaview.cxx:3352:24: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] strcat(suggested, "."PDF_OR_PS_EXT); ^ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p479076_s338486/logs/errors/seaview-4.7,1.log PR: 230881 Submitted by: tobik Approved by: bofh (maintainer timeout, 2 weeks)
-rw-r--r--biology/seaview/files/patch-seaview.cxx34
-rw-r--r--biology/seaview/files/patch-treedraw.cxx11
-rw-r--r--biology/seaview/files/patch-xfmatpt.cxx20
3 files changed, 65 insertions, 0 deletions
diff --git a/biology/seaview/files/patch-seaview.cxx b/biology/seaview/files/patch-seaview.cxx
new file mode 100644
index 000000000000..65b5b321c33d
--- /dev/null
+++ b/biology/seaview/files/patch-seaview.cxx
@@ -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},
diff --git a/biology/seaview/files/patch-treedraw.cxx b/biology/seaview/files/patch-treedraw.cxx
new file mode 100644
index 000000000000..c7c271bc55a5
--- /dev/null
+++ b/biology/seaview/files/patch-treedraw.cxx
@@ -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},
diff --git a/biology/seaview/files/patch-xfmatpt.cxx b/biology/seaview/files/patch-xfmatpt.cxx
new file mode 100644
index 000000000000..e4197bcb656e
--- /dev/null
+++ b/biology/seaview/files/patch-xfmatpt.cxx
@@ -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();