r3065 - in packages/trunk/openarena/debian: . patches

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2007-06-22 15:47:20 +0000 (Fri, 22 Jun 2007)
New Revision: 3065

Added:
   packages/trunk/openarena/debian/patches/10_fix-gcc4.2-compilation.dpatch
Modified:
   packages/trunk/openarena/debian/changelog
   packages/trunk/openarena/debian/patches/00list
Log:
fix #410178 with a nasty patch that removes useless code. strange thing...

Modified: packages/trunk/openarena/debian/changelog
===================================================================
--- packages/trunk/openarena/debian/changelog	2007-06-22 15:44:17 UTC (rev 3064)
+++ packages/trunk/openarena/debian/changelog	2007-06-22 15:47:20 UTC (rev 3065)
@@ -1,6 +1,7 @@
 openarena (0.6.0-4) UNRELEASED; urgency=low
 
   * Update build dependencies to libcurl4
+  * Add patch to make the engine compile with gcc-4.2 (Closes: #410178)
 
  -- Bruno "Fuddl" Kleinert <fuddl at gmx.de>  Fri, 22 Jun 2007 12:42:36 +0200
 

Modified: packages/trunk/openarena/debian/patches/00list
===================================================================
--- packages/trunk/openarena/debian/patches/00list	2007-06-22 15:44:17 UTC (rev 3064)
+++ packages/trunk/openarena/debian/patches/00list	2007-06-22 15:47:20 UTC (rev 3065)
@@ -1,2 +1,3 @@
 10_fix_buffer_overflow_and_format_string_bug_in_auth_server_response.dpatch
 10_fix_build_and_binary_on_alpha.dpatch
+10_fix-gcc4.2-compilation.dpatch

Added: packages/trunk/openarena/debian/patches/10_fix-gcc4.2-compilation.dpatch
===================================================================
--- packages/trunk/openarena/debian/patches/10_fix-gcc4.2-compilation.dpatch	                        (rev 0)
+++ packages/trunk/openarena/debian/patches/10_fix-gcc4.2-compilation.dpatch	2007-06-22 15:47:20 UTC (rev 3065)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix-gcc4.2-compilation.dpatch by Bruno "Fuddl" Kleinert <fuddl at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes compilation error introduced by gcc4.2
+
+ at DPATCH@
+diff -urNad openarena-0.6.0~/code/tools/asm/cmdlib.c openarena-0.6.0/code/tools/asm/cmdlib.c
+--- openarena-0.6.0~/code/tools/asm/cmdlib.c	2007-06-22 17:41:00.000000000 +0200
++++ openarena-0.6.0/code/tools/asm/cmdlib.c	2007-06-22 17:44:14.038546232 +0200
+@@ -312,8 +312,6 @@
+ char *ExpandPath (const char *path)
+ {
+ 	static char full[1024];
+-	if (!qdir)
+-		Error ("ExpandPath called without qdir set");
+ 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
+ 		strcpy( full, path );
+ 		return full;
+@@ -325,8 +323,6 @@
+ char *ExpandGamePath (const char *path)
+ {
+ 	static char full[1024];
+-	if (!qdir)
+-		Error ("ExpandGamePath called without qdir set");
+ 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
+ 		strcpy( full, path );
+ 		return full;


Property changes on: packages/trunk/openarena/debian/patches/10_fix-gcc4.2-compilation.dpatch
___________________________________________________________________
Name: svn:executable
   + *