cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] games/einstein: Fix build with AMD64/GCC4.2

Browse Source 
- Unbreak
	- Fix build with AMD64 and GCC4.2

PR:		ports/116832
Submitted by:	Martin Wilke <miwi@FreeBSD.org>
This commit is contained in:
Edwin Groothuis 2007-10-02 21:39:28 +00:00
parent 3c7bc9f84d
commit b7906ec96c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=200701
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
games/einstein/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= einstein
PORTVERSION= 2.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://games.flowix.com/files/einstein/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@ -18,15 +18,7 @@ COMMENT= Remake of old DOS game Sherlock, which was inspired by Albert Einstein'
USE_SDL= sdl ttf mixer
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
BROKEN= Does not compile with GCC 4.2
.endif
.endif
post-install:
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
.include <bsd.port.mk>

31
games/einstein/files/patch-formatter.cpp Normal file
View File

@ -0,0 +1,31 @@
diff -urN einstein-2.0.orig/formatter.cpp einstein-2.0/formatter.cpp
--- formatter.cpp 2005-08-13 22:40:58.000000000 -0400
+++ formatter.cpp 2006-08-15 11:18:28.000000000 -0400
@@ -58,7 +58,7 @@
if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
(c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
{
- int no = (int)c.data;
+ long int no = (long int)c.data;
args[no - 1] = c.type;
}
}
@@ -123,7 +123,7 @@
std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const
{
std::wstring s;
- int no;
+ long int no;
for (int i = 0; i < commandsCnt; i++) {
Command *cmd = &commands[i];
@@ -135,8 +135,8 @@
case STRING_ARG:
case INT_ARG:
- no = (int)cmd->data - 1;
- if (no < (int)argValues.size())
+ no = (long int)cmd->data - 1;
+ if (no < (long int)argValues.size())
s += argValues[no]->format(cmd);
break;