Author: baby-guest
Date: 2008-04-08 10:40:41 +0000 (Tue, 08 Apr 2008)
New Revision: 6495
Added:
packages/trunk/holotz-castle/debian/patches/09_gcc-4.3.patch
Modified:
packages/trunk/holotz-castle/debian/changelog
packages/trunk/holotz-castle/debian/patches/01_jlib_makefile.patch
packages/trunk/holotz-castle/debian/patches/02_makefile.patch
packages/trunk/holotz-castle/debian/patches/03_manpage.patch
packages/trunk/holotz-castle/debian/patches/04_editor_manpage.patch
packages/trunk/holotz-castle/debian/patches/05_jlib.patch
packages/trunk/holotz-castle/debian/patches/06_casts.patch
packages/trunk/holotz-castle/debian/patches/07_hcenemy.patch
packages/trunk/holotz-castle/debian/patches/08_jlib_jtree.patch
packages/trunk/holotz-castle/debian/patches/series
Log:
* Added patch to fix gcc 4.3 issues: 09_gcc-4.3.patch
* Added copyright statements to patches
Modified: packages/trunk/holotz-castle/debian/changelog
===================================================================
--- packages/trunk/holotz-castle/debian/changelog 2008-04-07 23:28:30 UTC
(rev 6494)
+++ packages/trunk/holotz-castle/debian/changelog 2008-04-08 10:40:41 UTC
(rev 6495)
@@ -29,6 +29,8 @@
[ Miriam Ruiz ]
* Updated 05_jlib.patch. Fixed FTBFS with GCC 4.3. Closes: #417061
Thanks to Maximiliano Curia <[EMAIL PROTECTED]>
+ * Added patch to fix gcc 4.3 issues: 09_gcc-4.3.patch
+ * Added copyright statements to patches
* Added DM-Upload-Allowed: yes to debian/control
-- Miriam Ruiz <[EMAIL PROTECTED]> Fri, 29 Feb 2008 03:08:36 +0100
Modified: packages/trunk/holotz-castle/debian/patches/01_jlib_makefile.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/01_jlib_makefile.patch
2008-04-07 23:28:30 UTC (rev 6494)
+++ packages/trunk/holotz-castle/debian/patches/01_jlib_makefile.patch
2008-04-08 10:40:41 UTC (rev 6495)
@@ -1,3 +1,6 @@
+# Copyright (C) 2006, by Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
diff -ruN holotz-castle-1.3.8.orig/JLib/Makefile
holotz-castle-1.3.8.new/JLib/Makefile
--- holotz-castle-1.3.8.orig/JLib/Makefile 2006-01-20 13:59:37.000000000
+0100
+++ holotz-castle-1.3.8.new/JLib/Makefile 2006-09-23 15:58:26.000000000
+0200
Modified: packages/trunk/holotz-castle/debian/patches/02_makefile.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/02_makefile.patch
2008-04-07 23:28:30 UTC (rev 6494)
+++ packages/trunk/holotz-castle/debian/patches/02_makefile.patch
2008-04-08 10:40:41 UTC (rev 6495)
@@ -1,3 +1,6 @@
+# Copyright (C) 2006, by Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
diff -ruN holotz-castle-1.3.8.orig/src/Makefile
holotz-castle-1.3.8.new/src/Makefile
--- holotz-castle-1.3.8.orig/src/Makefile 2006-01-20 13:59:38.000000000
+0100
+++ holotz-castle-1.3.8.new/src/Makefile 2006-09-23 15:58:27.000000000
+0200
Modified: packages/trunk/holotz-castle/debian/patches/03_manpage.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/03_manpage.patch
2008-04-07 23:28:30 UTC (rev 6494)
+++ packages/trunk/holotz-castle/debian/patches/03_manpage.patch
2008-04-08 10:40:41 UTC (rev 6495)
@@ -1,3 +1,6 @@
+# Copyright (C) 2006, by Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
diff -ruN holotz-castle-1.3.8.orig/doc/holotz-castle.6
holotz-castle-1.3.8.new/doc/holotz-castle.6
--- holotz-castle-1.3.8.orig/doc/holotz-castle.6 2006-01-20
13:59:37.000000000 +0100
+++ holotz-castle-1.3.8.new/doc/holotz-castle.6 2006-09-23
15:58:27.000000000 +0200
Modified: packages/trunk/holotz-castle/debian/patches/04_editor_manpage.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/04_editor_manpage.patch
2008-04-07 23:28:30 UTC (rev 6494)
+++ packages/trunk/holotz-castle/debian/patches/04_editor_manpage.patch
2008-04-08 10:40:41 UTC (rev 6495)
@@ -1,3 +1,6 @@
+# Copyright (C) 2006, by Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
diff -ruN holotz-castle-1.3.8.orig/doc/holotz-castle-editor.6
holotz-castle-1.3.8.new/doc/holotz-castle-editor.6
--- holotz-castle-1.3.8.orig/doc/holotz-castle-editor.6 2006-01-20
13:59:37.000000000 +0100
+++ holotz-castle-1.3.8.new/doc/holotz-castle-editor.6 2006-09-23
15:58:27.000000000 +0200
Modified: packages/trunk/holotz-castle/debian/patches/05_jlib.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/05_jlib.patch 2008-04-07
23:28:30 UTC (rev 6494)
+++ packages/trunk/holotz-castle/debian/patches/05_jlib.patch 2008-04-08
10:40:41 UTC (rev 6495)
@@ -1,3 +1,6 @@
+# Copyright (C) 2006, by Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
diff -ruN holotz-castle-1.3.8.orig/JLib/JLib/Util/JFS.cpp
holotz-castle-1.3.8.new/JLib/JLib/Util/JFS.cpp
--- holotz-castle-1.3.8.orig/JLib/JLib/Util/JFS.cpp 2006-01-20
13:59:37.000000000 +0100
+++ holotz-castle-1.3.8.new/JLib/JLib/Util/JFS.cpp 2006-09-23
15:58:26.000000000 +0200
Modified: packages/trunk/holotz-castle/debian/patches/06_casts.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/06_casts.patch 2008-04-07
23:28:30 UTC (rev 6494)
+++ packages/trunk/holotz-castle/debian/patches/06_casts.patch 2008-04-08
10:40:41 UTC (rev 6495)
@@ -1,3 +1,6 @@
+# Copyright (C) 2006, by Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
diff -ruN holotz-castle-1.3.8.orig/src/HCCharacter.cpp
holotz-castle-1.3.8.new/src/HCCharacter.cpp
--- holotz-castle-1.3.8.orig/src/HCCharacter.cpp 2006-01-20
13:59:38.000000000 +0100
+++ holotz-castle-1.3.8.new/src/HCCharacter.cpp 2006-09-23
15:58:27.000000000 +0200
Modified: packages/trunk/holotz-castle/debian/patches/07_hcenemy.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/07_hcenemy.patch
2008-04-07 23:28:30 UTC (rev 6494)
+++ packages/trunk/holotz-castle/debian/patches/07_hcenemy.patch
2008-04-08 10:40:41 UTC (rev 6495)
@@ -1,3 +1,6 @@
+# Copyright (C) 2006, by Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
diff -ruN holotz-castle-1.3.8.orig/src/HCEnemy.cpp
holotz-castle-1.3.8.new/src/HCEnemy.cpp
--- holotz-castle-1.3.8.orig/src/HCEnemy.cpp 2006-01-20 13:59:38.000000000
+0100
+++ holotz-castle-1.3.8.new/src/HCEnemy.cpp 2006-09-23 15:58:27.000000000
+0200
Modified: packages/trunk/holotz-castle/debian/patches/08_jlib_jtree.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/08_jlib_jtree.patch
2008-04-07 23:28:30 UTC (rev 6494)
+++ packages/trunk/holotz-castle/debian/patches/08_jlib_jtree.patch
2008-04-08 10:40:41 UTC (rev 6495)
@@ -1,3 +1,6 @@
+# Copyright (C) 2006, by Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
--- holotz-castle-1.3.8.orig/JLib/JLib/Util/JTree.h 2006-01-20
13:59:37.000000000 +0100
+++ holotz-castle-1.3.8/JLib/JLib/Util/JTree.h 2006-10-12 19:28:31.000000000
+0200
@@ -115,7 +115,7 @@
Added: packages/trunk/holotz-castle/debian/patches/09_gcc-4.3.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/09_gcc-4.3.patch
(rev 0)
+++ packages/trunk/holotz-castle/debian/patches/09_gcc-4.3.patch
2008-04-08 10:40:41 UTC (rev 6495)
@@ -0,0 +1,71 @@
+# Copyright (C) 2008, by Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: holotz-castle-1.3.10/JLib/JLib/Graphics/JFont.h
+===================================================================
+--- holotz-castle-1.3.10.orig/JLib/JLib/Graphics/JFont.h 2008-04-08
10:34:56.000000000 +0000
++++ holotz-castle-1.3.10/JLib/JLib/Graphics/JFont.h 2008-04-08
10:34:59.000000000 +0000
+@@ -36,7 +36,7 @@
+
+ /** Alineaci�n del texto a renderizar.
+ */
+-typedef enum JFontAlign
++enum JFontAlign
+ {
+ JFONTALIGN_LEFT = 0, /**< Alineado a la izquierda. */
+ JFONTALIGN_RIGHT, /**< Alineado a la derecha. */
+@@ -50,7 +50,7 @@
+ {
+ /** Tipo de renderizado a usar
+ */
+- typedef enum JFontRenderType
++ enum JFontRenderType
+ {
+ JFONTRENDERTYPE_SOLID = 0, /**< S�lido con colorkey. */
+ JFONTRENDERTYPE_SHADED, /**< Con antialiasing en
fondo s�lido. */
+Index: holotz-castle-1.3.10/src/HCText.h
+===================================================================
+--- holotz-castle-1.3.10.orig/src/HCText.h 2008-04-08 10:34:56.000000000
+0000
++++ holotz-castle-1.3.10/src/HCText.h 2008-04-08 10:34:59.000000000 +0000
+@@ -35,7 +35,7 @@
+ #include <JLib/Graphics/JFont.h>
+ #include <HCTheme.h>
+
+-typedef enum HCTextType
++enum HCTextType
+ {
+ HCTEXTTYPE_DIALOG, /**< Dialog balloon. */
+ HCTEXTTYPE_NARRATIVE, /**< Narrative frame. */
+Index: holotz-castle-1.3.10/src/HCCharacter.cpp
+===================================================================
+--- holotz-castle-1.3.10.orig/src/HCCharacter.cpp 2008-04-08
10:34:59.000000000 +0000
++++ holotz-castle-1.3.10/src/HCCharacter.cpp 2008-04-08 10:34:59.000000000
+0000
+@@ -739,12 +739,12 @@
+ if (actions & HCCA_UP && state != HCCS_HANG)
+ {
+ // Up requested
+- if (map->Cell(row, col)->Actions() & HCACTION_UP != 0)
++ if ((map->Cell(row, col)->Actions() & HCACTION_UP) != 0)
+ {
+ State(HCCS_UP);
+ // Can go up in the current cell
+- if (map->Cell(row - 1, col)->Actions() & HCACTION_UP ||
+- map->Cell(row - 1, col)->Actions() &
HCACTION_FALL)
++ if ((map->Cell(row - 1, col)->Actions() & HCACTION_UP)
||
++ (map->Cell(row - 1, col)->Actions() &
HCACTION_FALL))
+ {
+ // Can go up in the upper cell or cell above
empty, continue
+ a.y = -map->Gravity() - aMax.y;
+Index: holotz-castle-1.3.10/src/HCEnemyChaser.cpp
+===================================================================
+--- holotz-castle-1.3.10.orig/src/HCEnemyChaser.cpp 2008-04-08
10:35:23.000000000 +0000
++++ holotz-castle-1.3.10/src/HCEnemyChaser.cpp 2008-04-08 10:36:11.000000000
+0000
+@@ -561,7 +561,7 @@
+ chased->State() == HCCS_HANG ||
+ (abs(curRow - r) + abs(curCol - c) <= searchDepth && 0
== GoTo(r, c)))
+ {
+- if (chasePath[chaseIndex].col != curCol ||
chasePath[chaseIndex].row != curRow && chaseIndex < searchDepth - 1)
++ if ((chasePath[chaseIndex].col != curCol ||
chasePath[chaseIndex].row != curRow) && chaseIndex < searchDepth - 1)
+ {
+ // Updates the chase index within the path when the row
or column changes
+ ++chaseIndex;
Modified: packages/trunk/holotz-castle/debian/patches/series
===================================================================
--- packages/trunk/holotz-castle/debian/patches/series 2008-04-07 23:28:30 UTC
(rev 6494)
+++ packages/trunk/holotz-castle/debian/patches/series 2008-04-08 10:40:41 UTC
(rev 6495)
@@ -6,3 +6,4 @@
06_casts.patch -p1
07_hcenemy.patch -p1
08_jlib_jtree.patch -p1
+09_gcc-4.3.patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
