svn commit: r484225 - in head/games/crimson: . files
Tobias Kortkamp
tobik at FreeBSD.org
Mon Nov 5 21:42:26 UTC 2018
Author: tobik
Date: Mon Nov 5 21:42:24 2018
New Revision: 484225
URL: https://svnweb.freebsd.org/changeset/ports/484225
Log:
games/crimson: Unbreak build with Clang 6 (C++14 by default)
main.cpp:176:31: error: invalid suffix on literal; C++11 requires a space
between literal and identifier [-Wreserved-user-defined-literal]
cout << PROGRAMNAME" "VERSION << endl;
^
PR: 232992
Submitted by: w.schwarzenfeld at utanet.at
Added:
head/games/crimson/files/patch-src__cf-main.cpp (contents, props changed)
head/games/crimson/files/patch-src__common-font.cpp (contents, props changed)
head/games/crimson/files/patch-tools_cfed.cpp (contents, props changed)
Modified:
head/games/crimson/Makefile
Modified: head/games/crimson/Makefile
==============================================================================
--- head/games/crimson/Makefile Mon Nov 5 21:36:05 2018 (r484224)
+++ head/games/crimson/Makefile Mon Nov 5 21:42:24 2018 (r484225)
@@ -15,8 +15,6 @@ COMMENT= Tactical war game in the tradition of Battle
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN= fails to build
-
GNU_CONFIGURE= yes
USES= gmake
USE_SDL= mixer sdl ttf
Added: head/games/crimson/files/patch-src__cf-main.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/crimson/files/patch-src__cf-main.cpp Mon Nov 5 21:42:24 2018 (r484225)
@@ -0,0 +1,11 @@
+--- src/cf/main.cpp.orig 2018-11-05 15:29:43 UTC
++++ src/cf/main.cpp
+@@ -173,7 +173,7 @@ static void parse_options( int argc, cha
+ else opts.sfx = opts.music = false;
+ } else {
+ if (strcmp(argv[argc], "--version") == 0)
+- cout << PROGRAMNAME" "VERSION << endl;
++ cout << PROGRAMNAME " " VERSION << endl;
+ else print_usage( argv[0] );
+ exit ( 0 );
+ }
Added: head/games/crimson/files/patch-src__common-font.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/crimson/files/patch-src__common-font.cpp Mon Nov 5 21:42:24 2018 (r484225)
@@ -0,0 +1,13 @@
+--- src/common/font.cpp.orig 2018-11-05 15:29:33 UTC
++++ src/common/font.cpp
+@@ -200,8 +200,8 @@ int Font::Write( const char *str, Surfac
+ SDL_Color scol = { col.r, col.g, col.b };
+ SDL_Surface *s = TTF_RenderUTF8_Blended( f, str, scol );
+ if ( s ) {
+- SDL_Rect src = { 0, 0, s->w, s->h };
+- SDL_Rect dst = { x, y, s->w, s->h };
++ SDL_Rect src = { 0, 0, static_cast<Uint16>(s->w), static_cast<Uint16>(s->h) };
++ SDL_Rect dst = { x, y, static_cast<Uint16>(s->w), static_cast<Uint16>(s->h) };
+ SDL_BlitSurface( s, &src, dest->s_surface, &dst );
+ SDL_FreeSurface( s );
+ return src.w;
Added: head/games/crimson/files/patch-tools_cfed.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/crimson/files/patch-tools_cfed.cpp Mon Nov 5 21:42:24 2018 (r484225)
@@ -0,0 +1,11 @@
+--- tools/cfed.cpp.orig 2018-11-05 15:29:25 UTC
++++ tools/cfed.cpp
+@@ -970,7 +970,7 @@ int main( int argc, char **argv ) {
+ for ( i = argc - 1; i > 1; --i ) {
+ if (strcmp(argv[i], "--help") == 0) show_help = 1;
+ else if (strcmp(argv[i], "--version") == 0) {
+- cout << "cfed "VERSION << endl;
++ cout << "cfed " VERSION << endl;
+ return 0;
+ }
+ else if (strcmp(argv[i-1], "--units") == 0) uset = argv[i];
More information about the svn-ports-head
mailing list