From cf616cb1bc773f8652574833a295213c60f33202 Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Thu, 18 Jan 2018 20:45:32 +0000 Subject: [PATCH] Make build under clang6 Added one patchfile main.cxx:517:21: error: invalid suffix on literal; C++11 requires a space +between literal and identifier [-Wreserved-user-defined-literal] printf("Version: "VERSION"\n"); Reported by: pkg-fallout --- comms/flrig/files/patch-configure | 4 ++-- comms/flrig/files/patch-src_main.cxx | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 comms/flrig/files/patch-src_main.cxx diff --git a/comms/flrig/files/patch-configure b/comms/flrig/files/patch-configure index 5468fa7dd849..9ad954fe9249 100644 --- a/comms/flrig/files/patch-configure +++ b/comms/flrig/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2017-04-01 02:21:18 UTC +--- configure.orig 2018-01-14 19:21:15 UTC +++ configure -@@ -6143,7 +6143,7 @@ $as_echo "$FLTK_CONFIG" >&6; } +@@ -6166,7 +6166,7 @@ $as_echo "$FLTK_CONFIG" >&6; } FLTK_LIBS=`$FLTK_CONFIG --ldflags --use-images` if test "x$target_mingw32" != "xyes"; then if test "x$target_darwin" != "xyes"; then diff --git a/comms/flrig/files/patch-src_main.cxx b/comms/flrig/files/patch-src_main.cxx new file mode 100644 index 000000000000..52bc4e57df31 --- /dev/null +++ b/comms/flrig/files/patch-src_main.cxx @@ -0,0 +1,11 @@ +--- src/main.cxx.orig 2018-01-18 20:38:50 UTC ++++ src/main.cxx +@@ -514,7 +514,7 @@ int parse_args(int argc, char **argv, int& idx) + exit(0); + } + if (strcasecmp("--version", argv[idx]) == 0) { +- printf("Version: "VERSION"\n"); ++ printf("Version: %s\n",VERSION); + exit (0); + } + if (strcasecmp("--rig_debug", argv[idx]) == 0) {