ports/x11/wbar/files/patch-src_config_Functions.cc
Tobias Kortkamp 33c927b5d0 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
2018-07-20 13:11:59 +00:00

29 lines
1.1 KiB
C++

../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 ))