From owner-svn-ports-all@freebsd.org Mon Nov 5 21:42:26 2018 Return-Path: Delivered-To: svn-ports-all@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 7AAAB110CA6B; Mon, 5 Nov 2018 21:42:26 +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 F009074876; Mon, 5 Nov 2018 21:42:25 +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 D1D131D3EA; Mon, 5 Nov 2018 21:42:25 +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 wA5LgPhR050289; Mon, 5 Nov 2018 21:42:25 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5LgPUP050284; Mon, 5 Nov 2018 21:42:25 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201811052142.wA5LgPUP050284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 5 Nov 2018 21:42:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484225 - in head/games/crimson: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/crimson: . files X-SVN-Commit-Revision: 484225 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F009074876 X-Spamd-Result: default: False [-101.79 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.78)[-0.783,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.90)[-0.896,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Nov 2018 21:42:26 -0000 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@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(s->w), static_cast(s->h) }; ++ SDL_Rect dst = { x, y, static_cast(s->w), static_cast(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];