From owner-svn-ports-head@freebsd.org Fri Jul 20 13:12:00 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6380610452F8; Fri, 20 Jul 2018 13:12:00 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 119617C44C; Fri, 20 Jul 2018 13:12:00 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E890F10A27; Fri, 20 Jul 2018 13:11:59 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6KDBxTI065588; Fri, 20 Jul 2018 13:11:59 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6KDBxPp065586; Fri, 20 Jul 2018 13:11:59 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807201311.w6KDBxPp065586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 20 Jul 2018 13:11:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475013 - head/x11/wbar/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/x11/wbar/files X-SVN-Commit-Revision: 475013 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jul 2018 13:12:00 -0000 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 ))