Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 20 Jul 2018 13:11:59 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475013 - head/x11/wbar/files
Message-ID:  <201807201311.w6KDBxPp065586@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tobik
Date: Fri Jul 20 13:11:59 2018
New Revision: 475013
URL: https://svnweb.freebsd.org/changeset/ports/475013

Log:
  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

Added:
  head/x11/wbar/files/patch-src_config_Functions.cc   (contents, props changed)
  head/x11/wbar/files/patch-src_config_Run.cc   (contents, props changed)
  head/x11/wbar/files/patch-src_core_Main.cc   (contents, props changed)

Added: head/x11/wbar/files/patch-src_config_Functions.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/wbar/files/patch-src_config_Functions.cc	Fri Jul 20 13:11:59 2018	(r475013)
@@ -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 ))

Added: head/x11/wbar/files/patch-src_config_Run.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/wbar/files/patch-src_config_Run.cc	Fri Jul 20 13:11:59 2018	(r475013)
@@ -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;
+         }

Added: head/x11/wbar/files/patch-src_core_Main.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/wbar/files/patch-src_core_Main.cc	Fri Jul 20 13:11:59 2018	(r475013)
@@ -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 ))

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807201311.w6KDBxPp065586>