diff options
author | tobik <tobik@FreeBSD.org> | 2018-08-02 14:26:41 +0800 |
---|---|---|
committer | tobik <tobik@FreeBSD.org> | 2018-08-02 14:26:41 +0800 |
commit | 49718a783c0fd495ffa2eee76fb2809ef7541417 (patch) | |
tree | e2aef57a1e639aaf67e5e4e3425b4a35cf6fb223 /games | |
parent | ce2fb2db05c4b2359994c933e2f7148872b84764 (diff) | |
download | freebsd-ports-gnome-49718a783c0fd495ffa2eee76fb2809ef7541417.tar.gz freebsd-ports-gnome-49718a783c0fd495ffa2eee76fb2809ef7541417.tar.zst freebsd-ports-gnome-49718a783c0fd495ffa2eee76fb2809ef7541417.zip |
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
Diffstat (limited to 'games')
-rw-r--r-- | games/spellathon/files/patch-src_cl_main.cc | 15 | ||||
-rw-r--r-- | games/spellathon/files/patch-src_gui_mainwindow.cc | 15 |
2 files changed, 30 insertions, 0 deletions
diff --git a/games/spellathon/files/patch-src_cl_main.cc b/games/spellathon/files/patch-src_cl_main.cc new file mode 100644 index 000000000000..120010e31f74 --- /dev/null +++ b/games/spellathon/files/patch-src_cl_main.cc @@ -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" diff --git a/games/spellathon/files/patch-src_gui_mainwindow.cc b/games/spellathon/files/patch-src_gui_mainwindow.cc new file mode 100644 index 000000000000..76a60d7b974e --- /dev/null +++ b/games/spellathon/files/patch-src_gui_mainwindow.cc @@ -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 |