Date: Thu, 2 Aug 2018 06:26:41 +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: r476221 - head/games/spellathon/files Message-ID: <201808020626.w726QfaK082263@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Thu Aug 2 06:26:41 2018 New Revision: 476221 URL: https://svnweb.freebsd.org/changeset/ports/476221 Log: games/spellathon: Fix build with Clang 6 main.cc:378:31: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] fprintf(stderr, "Spellathon "VERSION" (svn%s) (c)"COPYRIGHT"\n\n" ^ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475964_s336959/logs/errors/spellathon-6.0_5.log Added: head/games/spellathon/files/ head/games/spellathon/files/patch-src_cl_main.cc (contents, props changed) head/games/spellathon/files/patch-src_gui_mainwindow.cc (contents, props changed) Added: head/games/spellathon/files/patch-src_cl_main.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spellathon/files/patch-src_cl_main.cc Thu Aug 2 06:26:41 2018 (r476221) @@ -0,0 +1,15 @@ +main.cc:378:31: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] + fprintf(stderr, "Spellathon "VERSION" (svn%s) (c)"COPYRIGHT"\n\n" + ^ + +--- src/cl/main.cc.orig 2018-08-02 06:21:54 UTC ++++ src/cl/main.cc +@@ -375,7 +375,7 @@ static void + help(void) + { + const char* svn_version(void); +- fprintf(stderr, "Spellathon "VERSION" (svn%s) (c)"COPYRIGHT"\n\n" ++ fprintf(stderr, "Spellathon " VERSION " (svn%s) (c)" COPYRIGHT "\n\n" + "usage: spellathon <option> [sub-options ...]\n\n" + "Options:\n" + " -i -- Game instructions.\n" Added: head/games/spellathon/files/patch-src_gui_mainwindow.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spellathon/files/patch-src_gui_mainwindow.cc Thu Aug 2 06:26:41 2018 (r476221) @@ -0,0 +1,15 @@ +mainwindow.cc:351:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] + QMessageBox::about(this, "About", QString("<font size=\"+2\">Spellathon </font>"VERSION" <font color=\"gray\">(svn%1)</font><br><br>©"COPYRIGHT"<br>").arg(svn_version())); + ^ + +--- src/gui/mainwindow.cc.orig 2018-08-02 06:22:41 UTC ++++ src/gui/mainwindow.cc +@@ -348,7 +348,7 @@ void + MainWindow::about() + { + const char* svn_version(); +- QMessageBox::about(this, "About", QString("<font size=\"+2\">Spellathon </font>"VERSION" <font color=\"gray\">(svn%1)</font><br><br>©"COPYRIGHT"<br>").arg(svn_version())); ++ QMessageBox::about(this, "About", QString("<font size=\"+2\">Spellathon </font>" VERSION " <font color=\"gray\">(svn%1)</font><br><br>©" COPYRIGHT "<br>").arg(svn_version())); + } + + void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808020626.w726QfaK082263>