Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Feb 2017 07:18:56 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433376 - in head/games/super_methane_brothers: . files
Message-ID:  <201702050718.v157IuQj031827@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Feb  5 07:18:55 2017
New Revision: 433376
URL: https://svnweb.freebsd.org/changeset/ports/433376

Log:
  games/super_methane_brothers: use clang and unbreak with gcc5 or later
  
  sources/misc.cpp:43:65: error: narrowing conversion of '4294967248u' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
   static PARTYOFFS party_0c = {SPR_ENDSPR_1+0x0c,0x0020,0xFFFFFFD0};
                                                                   ^
  sources/misc.cpp:46:65: error: narrowing conversion of '4294967282u' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
   static PARTYOFFS party_0f = {SPR_ENDSPR_1+0x0f,0x005E,0xFFFFFFF2};
                                                                   ^
  sources/misc.cpp:47:65: error: narrowing conversion of '4294967290u' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
   static PARTYOFFS party_10 = {SPR_ENDSPR_1+0x10,0x007E,0xFFFFFFFA};
                                                                   ^
  sources/misc.cpp:48:65: error: narrowing conversion of '4294967289u' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
   static PARTYOFFS party_11 = {SPR_ENDSPR_1+0x11,0x008E,0xFFFFFFF9};
                                                                   ^
  sources/misc.cpp:50:65: error: narrowing conversion of '4294967291u' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
   static PARTYOFFS party_13 = {SPR_ENDSPR_1+0x13,0x00B2,0xFFFFFFFB};
                                                                   ^
  sources/misc.cpp:51:65: error: narrowing conversion of '4294967290u' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
   static PARTYOFFS party_14 = {SPR_ENDSPR_1+0x14,0x00C2,0xFFFFFFFA};
                                                                   ^
  sources/misc.cpp:60:65: error: narrowing conversion of '4294967280u' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
   static PARTYOFFS party_1d = {SPR_ENDSPR_1+0x1d,0x0030,0xFFFFFFF0};
                                                                   ^
  
  PR:		216707
  Reported by:	antoine (via exp-run)

Added:
  head/games/super_methane_brothers/files/patch-sources_misc.cpp   (contents, props changed)
Modified:
  head/games/super_methane_brothers/Makefile   (contents, props changed)

Modified: head/games/super_methane_brothers/Makefile
==============================================================================
--- head/games/super_methane_brothers/Makefile	Sun Feb  5 05:32:42 2017	(r433375)
+++ head/games/super_methane_brothers/Makefile	Sun Feb  5 07:18:55 2017	(r433376)
@@ -3,7 +3,7 @@
 
 PORTNAME=	super_methane_brothers
 PORTVERSION=	1.5.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	SF/methane/Methane%20Stable/Methane%20V${PORTVERSION}
 DISTNAME=	methane-${PORTVERSION}
@@ -16,7 +16,6 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libclan23Core.so:devel/clanlib
 
 USES=		execinfo gmake pkgconfig tar:tgz
-USE_GCC=	yes
 MAKE_ENV=	METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LIBS}"
 MAKE_JOBS_UNSAFE=	yes
 

Added: head/games/super_methane_brothers/files/patch-sources_misc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/super_methane_brothers/files/patch-sources_misc.cpp	Sun Feb  5 07:18:55 2017	(r433376)
@@ -0,0 +1,33 @@
+--- sources/misc.cpp.orig	2009-04-28 14:42:43 UTC
++++ sources/misc.cpp
+@@ -40,15 +40,15 @@ static PARTYOFFS	party_08 = {SPR_ENDSPR_
+ static PARTYOFFS	party_09 = {SPR_ENDSPR_1+0x09,0x0048,0x0002};
+ static PARTYOFFS	party_0a = {SPR_ENDSPR_1+0x0a,0x0058,0x0002};
+ static PARTYOFFS	party_0b = {SPR_ENDSPR_1+0x0b,0x0000,0x0000};
+-static PARTYOFFS	party_0c = {SPR_ENDSPR_1+0x0c,0x0020,0xFFFFFFD0};
++static PARTYOFFS	party_0c = {SPR_ENDSPR_1+0x0c,0x0020,0xFFFFFD0};
+ static PARTYOFFS	party_0d = {SPR_ENDSPR_1+0x0d,0x0040,0x0000};
+ static PARTYOFFS	party_0e = {SPR_ENDSPR_1+0x0e,0x0000,0x0000};
+-static PARTYOFFS	party_0f = {SPR_ENDSPR_1+0x0f,0x005E,0xFFFFFFF2};
+-static PARTYOFFS	party_10 = {SPR_ENDSPR_1+0x10,0x007E,0xFFFFFFFA};
+-static PARTYOFFS	party_11 = {SPR_ENDSPR_1+0x11,0x008E,0xFFFFFFF9};
++static PARTYOFFS	party_0f = {SPR_ENDSPR_1+0x0f,0x005E,0xFFFFFF2};
++static PARTYOFFS	party_10 = {SPR_ENDSPR_1+0x10,0x007E,0xFFFFFFA};
++static PARTYOFFS	party_11 = {SPR_ENDSPR_1+0x11,0x008E,0xFFFFFF9};
+ static PARTYOFFS	party_12 = {SPR_ENDSPR_1+0x12,0x0092,0x000B};
+-static PARTYOFFS	party_13 = {SPR_ENDSPR_1+0x13,0x00B2,0xFFFFFFFB};
+-static PARTYOFFS	party_14 = {SPR_ENDSPR_1+0x14,0x00C2,0xFFFFFFFA};
++static PARTYOFFS	party_13 = {SPR_ENDSPR_1+0x13,0x00B2,0xFFFFFFB};
++static PARTYOFFS	party_14 = {SPR_ENDSPR_1+0x14,0x00C2,0xFFFFFFA};
+ static PARTYOFFS	party_15 = {SPR_ENDSPR_1+0x15,0x0000,0x0000};
+ static PARTYOFFS	party_16 = {SPR_ENDSPR_1+0x16,0x0020,0x0008};
+ static PARTYOFFS	party_17 = {SPR_ENDSPR_1+0x17,0x0020,0x0000};
+@@ -57,7 +57,7 @@ static PARTYOFFS	party_19 = {SPR_ENDSPR_
+ static PARTYOFFS	party_1a = {SPR_ENDSPR_1+0x1a,0x0020,0x0000};
+ static PARTYOFFS	party_1b = {SPR_ENDSPR_1+0x1b,0x0000,0x0010};
+ static PARTYOFFS	party_1c = {SPR_ENDSPR_1+0x1c,0x0010,0x0};
+-static PARTYOFFS	party_1d = {SPR_ENDSPR_1+0x1d,0x0030,0xFFFFFFF0};
++static PARTYOFFS	party_1d = {SPR_ENDSPR_1+0x1d,0x0030,0xFFFFFF0};
+ 
+ static PARTYOFFS	*party_group1[] = {
+ 	&party_00,&party_01,&party_02,&party_00,&party_03,&party_04,0};



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702050718.v157IuQj031827>