ports/69949: Fix GCC3.4.2-related problems for games/scummvm on -CURRENT

[Andreas Braml]

>Number:         69949
>Category:       ports
>Synopsis:       Fix GCC3.4.2-related problems for games/scummvm on -CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 03 14:40:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Andreas Braml
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gorban.sonatorrek.home 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Mon Aug 2 13:26:07 CEST 2004 root at gorban.sonatorrek.home:/usr/obj/usr/src/sys/CUSTOM i386


	
>Description:
	scummvm 0.6.0 fails to compile with the new GCC of -CURRENT;
	can be fixed by substitution }; --> } in the acoording places
>How-To-Repeat:
	simply enter "make" on a recent -CURRENT machine ;)
>Fix:

I could fix the problem with the following patches in the files-directory
of the port:

--- patch-aa begins here ---
--- scumm/actor.cpp.orig	Tue Aug  3 15:55:01 2004
+++ scumm/actor.cpp	Tue Aug  3 15:55:35 2004
@@ -789,14 +789,14 @@
 		return _V1_talkingActor;
 	else
 		return VAR(VAR_TALK_ACTOR);
-};
+}
 
 void ScummEngine::talkingActor(int value) {
 	if (_gameId == GID_MANIAC && _version == 1)
 		_V1_talkingActor = value;
 	else
 		VAR(VAR_TALK_ACTOR) = value;
-};
+}
 
 void ScummEngine::showActors() {
 	int i;
--- patch-aa ends here ---

--- patch-ab begins here ---
--- scumm/debugger.cpp.orig	Tue Aug  3 15:55:47 2004
+++ scumm/debugger.cpp	Tue Aug  3 15:56:18 2004
@@ -57,7 +57,7 @@
 	va_end(va);
 
 	debug(buf);
-};
+}
 	
 ScummDebugger::ScummDebugger(ScummEngine *s)
 	: Common::Debugger<ScummDebugger>() {
@@ -592,7 +592,7 @@
 
 	DebugPrintf("Unknown flag. Type 'Debug ?' for syntax\n");
 	return true;
-};
+}
 
 bool ScummDebugger::Cmd_DebugLevel(int argc, const char **argv) {
 	if (argc == 1) {
--- patch-ab ends here ---

--- patch-ac begins here ---
--- base/main.cpp.orig	Tue Aug  3 15:56:29 2004
+++ base/main.cpp	Tue Aug  3 15:56:41 2004
@@ -262,7 +262,7 @@
 
 	// Free up memory
 	delete engine;
-};
+}
 
 #ifndef _WIN32_WCE
 int main(int argc, char *argv[]) {
--- patch-ac ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: