From 33c927b5d02368d7b0c374578ba660b6299e1ca1 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Fri, 20 Jul 2018 13:11:59 +0000 Subject: x11/wbar: Unbreak build with Clang 6 ./src/core/Main.cc:84:38: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] command = PACKAGE_NAME" "DEFAULT_ARGV; ^ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p474767_s336359/logs/wbar-2.3.4_1.log http://thunderx1.nyi.freebsd.org/data/head-arm64-default/p474481_s336216/logs/wbar-2.3.4_1.log --- x11/wbar/files/patch-src_config_Functions.cc | 29 ++++++++++++++++++++++++++++ x11/wbar/files/patch-src_config_Run.cc | 16 +++++++++++++++ x11/wbar/files/patch-src_core_Main.cc | 15 ++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 x11/wbar/files/patch-src_config_Functions.cc create mode 100644 x11/wbar/files/patch-src_config_Run.cc create mode 100644 x11/wbar/files/patch-src_core_Main.cc (limited to 'x11/wbar') diff --git a/x11/wbar/files/patch-src_config_Functions.cc b/x11/wbar/files/patch-src_config_Functions.cc new file mode 100644 index 000000000000..d564df6aa63f --- /dev/null +++ b/x11/wbar/files/patch-src_config_Functions.cc @@ -0,0 +1,29 @@ +../src/config/Functions.cc:14:34: error: invalid suffix on literal; C++11 requires a + space between literal and identifier [-Wreserved-user-defined-literal] +#define ICON_DEFAULT PIXMAPDIR"/"PACKAGE_NAME".png" + ^ + +../src/config/Functions.cc:307:38: error: invalid suffix on literal; C++11 requires a + space between literal and identifier [-Wreserved-user-defined-literal] + command = PACKAGE_NAME" "DEFAULT_ARGV; + +--- src/config/Functions.cc.orig 2012-09-19 02:54:53 UTC ++++ src/config/Functions.cc +@@ -11,7 +11,7 @@ + #include "Run.h" + #include "OptParser.h" + +-#define ICON_DEFAULT PIXMAPDIR"/"PACKAGE_NAME".png" ++#define ICON_DEFAULT PIXMAPDIR "/" PACKAGE_NAME ".png" + + static const gchar *authors[] = + { +@@ -304,7 +304,7 @@ void set_config_states(std::string command) + + if (command.empty()) + { +- command = PACKAGE_NAME" "DEFAULT_ARGV; ++ command = PACKAGE_NAME " " DEFAULT_ARGV; + } + + if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG )) diff --git a/x11/wbar/files/patch-src_config_Run.cc b/x11/wbar/files/patch-src_config_Run.cc new file mode 100644 index 000000000000..d843b956824c --- /dev/null +++ b/x11/wbar/files/patch-src_config_Run.cc @@ -0,0 +1,16 @@ +../src/config/Run.cc:139:31: error: invalid suffix on literal; C++11 requires a space + between literal and identifier [-Wreserved-user-defined-literal] + if (system ("killall "PACKAGE_NAME) != 0) + ^ + +--- src/config/Run.cc.orig 2018-07-20 12:53:00 UTC ++++ src/config/Run.cc +@@ -136,7 +136,7 @@ void Run::stop() + { + if (Run::getPID() > 0) + { +- if (system ("killall "PACKAGE_NAME) != 0) ++ if (system ("killall " PACKAGE_NAME) != 0) + { + std::cout << _("Error kill program: ") << PACKAGE_NAME << std::endl; + } diff --git a/x11/wbar/files/patch-src_core_Main.cc b/x11/wbar/files/patch-src_core_Main.cc new file mode 100644 index 000000000000..af0f6d9660e9 --- /dev/null +++ b/x11/wbar/files/patch-src_core_Main.cc @@ -0,0 +1,15 @@ +./src/core/Main.cc:84:38: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] + command = PACKAGE_NAME" "DEFAULT_ARGV; + ^ + +--- src/core/Main.cc.orig 2018-07-20 12:51:16 UTC ++++ src/core/Main.cc +@@ -81,7 +81,7 @@ int main(int argc, char **argv) + + if (command.empty()) + { +- command = PACKAGE_NAME" "DEFAULT_ARGV; ++ command = PACKAGE_NAME " " DEFAULT_ARGV; + } + + if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG )) -- cgit v1.2.3