r3956 - packages/trunk/torus-trooper/debian/patches
Peter De Wachter
pdewacht-guest at alioth.debian.org
Wed Aug 29 17:46:14 UTC 2007
Author: pdewacht-guest
Date: 2007-08-29 17:46:14 +0000 (Wed, 29 Aug 2007)
New Revision: 3956
Modified:
packages/trunk/torus-trooper/debian/patches/fixes.patch
Log:
gdc 0.24 made 'ref' a reserved keyword ?!?
Modified: packages/trunk/torus-trooper/debian/patches/fixes.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/fixes.patch 2007-08-29 17:45:02 UTC (rev 3955)
+++ packages/trunk/torus-trooper/debian/patches/fixes.patch 2007-08-29 17:46:14 UTC (rev 3956)
@@ -1,7 +1,7 @@
-Index: torus-trooper_0.22.dfsg1/import/SDL.d
+Index: torus-trooper-0.22.dfsg1/import/SDL.d
===================================================================
---- torus-trooper_0.22.dfsg1.orig/import/SDL.d 2007-08-29 19:11:03.000000000 +0200
-+++ torus-trooper_0.22.dfsg1/import/SDL.d 2007-08-29 19:11:05.000000000 +0200
+--- torus-trooper-0.22.dfsg1.orig/import/SDL.d 2007-08-29 19:41:27.000000000 +0200
++++ torus-trooper-0.22.dfsg1/import/SDL.d 2007-08-29 19:41:30.000000000 +0200
@@ -20,18 +20,28 @@
slouken at devolution.com
*/
@@ -64,10 +64,10 @@
- SDL_Quit();
-}
-+/
-Index: torus-trooper_0.22.dfsg1/import/SDL_events.d
+Index: torus-trooper-0.22.dfsg1/import/SDL_events.d
===================================================================
---- torus-trooper_0.22.dfsg1.orig/import/SDL_events.d 2007-08-29 19:11:03.000000000 +0200
-+++ torus-trooper_0.22.dfsg1/import/SDL_events.d 2007-08-29 19:11:05.000000000 +0200
+--- torus-trooper-0.22.dfsg1.orig/import/SDL_events.d 2007-08-29 19:41:27.000000000 +0200
++++ torus-trooper-0.22.dfsg1/import/SDL_events.d 2007-08-29 19:41:30.000000000 +0200
@@ -304,8 +304,8 @@
If 'state' is set to SDL_QUERY, SDL_EventState() will return the
current processing state of the specified event.
@@ -81,10 +81,10 @@
+const int SDL_DISABLE = 0;
+const int SDL_ENABLE = 1;
Uint8 SDL_EventState(Uint8 type, int state);
-Index: torus-trooper_0.22.dfsg1/Makefile
+Index: torus-trooper-0.22.dfsg1/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ torus-trooper_0.22.dfsg1/Makefile 2007-08-29 19:11:24.000000000 +0200
++++ torus-trooper-0.22.dfsg1/Makefile 2007-08-29 19:41:30.000000000 +0200
@@ -0,0 +1,27 @@
+DC=gdmd
+#DC=gdc
@@ -113,10 +113,10 @@
+
+
+
-Index: torus-trooper_0.22.dfsg1/src/abagames/util/logger.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/util/logger.d
===================================================================
---- torus-trooper_0.22.dfsg1.orig/src/abagames/util/logger.d 2007-08-29 19:11:03.000000000 +0200
-+++ torus-trooper_0.22.dfsg1/src/abagames/util/logger.d 2007-08-29 19:11:05.000000000 +0200
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/util/logger.d 2007-08-29 19:41:27.000000000 +0200
++++ torus-trooper-0.22.dfsg1/src/abagames/util/logger.d 2007-08-29 19:41:30.000000000 +0200
@@ -5,7 +5,7 @@
*/
module abagames.util.logger;
@@ -162,10 +162,10 @@
if (e.next)
error(e.next);
}
-Index: torus-trooper_0.22.dfsg1/src/abagames/util/sdl/luminous.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/util/sdl/luminous.d
===================================================================
---- torus-trooper_0.22.dfsg1.orig/src/abagames/util/sdl/luminous.d 2007-08-29 19:11:03.000000000 +0200
-+++ torus-trooper_0.22.dfsg1/src/abagames/util/sdl/luminous.d 2007-08-29 19:11:05.000000000 +0200
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/util/sdl/luminous.d 2007-08-29 19:41:27.000000000 +0200
++++ torus-trooper-0.22.dfsg1/src/abagames/util/sdl/luminous.d 2007-08-29 19:41:30.000000000 +0200
@@ -9,6 +9,7 @@
private import std.string;
private import opengl;
@@ -183,10 +183,10 @@
int i;
memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof);
glGenTextures(1, &luminousTexture);
-Index: torus-trooper_0.22.dfsg1/src/abagames/tt/barrage.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/tt/barrage.d
===================================================================
---- torus-trooper_0.22.dfsg1.orig/src/abagames/tt/barrage.d 2007-08-29 19:11:03.000000000 +0200
-+++ torus-trooper_0.22.dfsg1/src/abagames/tt/barrage.d 2007-08-29 19:11:05.000000000 +0200
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/barrage.d 2007-08-29 19:41:27.000000000 +0200
++++ torus-trooper-0.22.dfsg1/src/abagames/tt/barrage.d 2007-08-29 19:41:30.000000000 +0200
@@ -98,6 +98,7 @@
public static void load() {
char[][] dirs = listdir(BARRAGE_DIR_NAME);
@@ -195,10 +195,10 @@
char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName);
foreach (char[] fileName; files) {
if (getExt(fileName) != "xml")
-Index: torus-trooper_0.22.dfsg1/src/abagames/tt/camera.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/tt/camera.d
===================================================================
---- torus-trooper_0.22.dfsg1.orig/src/abagames/tt/camera.d 2007-08-29 19:11:03.000000000 +0200
-+++ torus-trooper_0.22.dfsg1/src/abagames/tt/camera.d 2007-08-29 19:11:05.000000000 +0200
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/camera.d 2007-08-29 19:41:27.000000000 +0200
++++ torus-trooper-0.22.dfsg1/src/abagames/tt/camera.d 2007-08-29 19:41:30.000000000 +0200
@@ -155,10 +155,10 @@
moveCnt--;
if (moveCnt < 0) {
@@ -214,10 +214,10 @@
zoomTrg = 3.0f / ofs;
if (zoomTrg < zoomMin)
zoomTrg = zoomMin;
-Index: torus-trooper_0.22.dfsg1/src/abagames/tt/shape.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/tt/shape.d
===================================================================
---- torus-trooper_0.22.dfsg1.orig/src/abagames/tt/shape.d 2007-08-29 19:11:03.000000000 +0200
-+++ torus-trooper_0.22.dfsg1/src/abagames/tt/shape.d 2007-08-29 19:11:05.000000000 +0200
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/shape.d 2007-08-29 19:41:27.000000000 +0200
++++ torus-trooper-0.22.dfsg1/src/abagames/tt/shape.d 2007-08-29 19:41:30.000000000 +0200
@@ -248,21 +248,23 @@
float wingD1, float wingD2, int color, int shp, int divNum,
int rev, bool damaged = false) {
@@ -257,10 +257,10 @@
float wofs = offset;
float whgt = rocketLength * (rand.nextFloat(0.5) + 1.5);
for (int i = 0; i < wingNum; i++) {
-Index: torus-trooper_0.22.dfsg1/src/abagames/util/rand.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/util/rand.d
===================================================================
---- torus-trooper_0.22.dfsg1.orig/src/abagames/util/rand.d 2007-08-29 19:11:03.000000000 +0200
-+++ torus-trooper_0.22.dfsg1/src/abagames/util/rand.d 2007-08-29 19:11:05.000000000 +0200
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/util/rand.d 2007-08-29 19:41:27.000000000 +0200
++++ torus-trooper-0.22.dfsg1/src/abagames/util/rand.d 2007-08-29 19:41:30.000000000 +0200
@@ -165,14 +165,14 @@
void next_state()
@@ -278,3 +278,25 @@
for (int j=N-M+1; --j; p++)
*p = p[M] ^ TWIST(p[0], p[1]);
+Index: torus-trooper-0.22.dfsg1/import/opengl.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/import/opengl.d 2007-08-29 19:41:36.000000000 +0200
++++ torus-trooper-0.22.dfsg1/import/opengl.d 2007-08-29 19:41:52.000000000 +0200
+@@ -1116,7 +1116,7 @@
+ /*************************************************************/
+
+ void /*APIENTRY*/glAccum (GLenum op, GLfloat value);
+-void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref);
++void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref_);
+ GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences);
+ void /*APIENTRY*/glArrayElement (GLint i);
+ void /*APIENTRY*/glBegin (GLenum mode);
+@@ -1369,7 +1369,7 @@
+ void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+ void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer);
+ void /*APIENTRY*/glShadeModel (GLenum mode);
+-void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask);
++void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref_, GLuint mask);
+ void /*APIENTRY*/glStencilMask (GLuint mask);
+ void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+ void /*APIENTRY*/glTexCoord1d (GLdouble s);
More information about the Pkg-games-commits
mailing list