r8864 - in packages/trunk/btanks/debian: . patches

[Ansgar Burchardt]

Author: ansgar-guest
Date: 2009-02-16 23:17:37 +0000 (Mon, 16 Feb 2009)
New Revision: 8864

Added:
   packages/trunk/btanks/debian/patches/rename-currency-symbol.patch
Modified:
   packages/trunk/btanks/debian/changelog
   packages/trunk/btanks/debian/patches/series
Log:
* Do not use the CURRENCY_SYMBOL identifier in mrt/tclUniData.c.
  This should fix the build failure on alpha.
  + new patch rename-currency-symbol.patch

Modified: packages/trunk/btanks/debian/changelog
===================================================================
--- packages/trunk/btanks/debian/changelog	2009-02-16 20:56:06 UTC (rev 8863)
+++ packages/trunk/btanks/debian/changelog	2009-02-16 23:17:37 UTC (rev 8864)
@@ -1,3 +1,11 @@
+btanks (0.8.7686-2) unstable; urgency=low
+
+  * Do not use the CURRENCY_SYMBOL identifier in mrt/tclUniData.c.
+    This should fix the build failure on alpha.
+    + new patch rename-currency-symbol.patch
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Tue, 17 Feb 2009 00:16:17 +0100
+
 btanks (0.8.7686-1) unstable; urgency=low
 
   * New Upstream Version (Closes: #490792, #496997)

Added: packages/trunk/btanks/debian/patches/rename-currency-symbol.patch
===================================================================
--- packages/trunk/btanks/debian/patches/rename-currency-symbol.patch	                        (rev 0)
+++ packages/trunk/btanks/debian/patches/rename-currency-symbol.patch	2009-02-16 23:17:37 UTC (rev 8864)
@@ -0,0 +1,26 @@
+Subject: Don't use the CURRENCY_SYMBOL identifier
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Mon, 16 Feb 2009 23:55:40 +0100
+
+Do not use CURRENCY_SYMBOL because it is already defined in
+/usr/include/langinfo.h.
+
+This should fix the build failure on alpha:
+
+g++ -o build/release/mrt/utf8_utils.os -c -Wall -g -g -O2 -Wall -g -Wall -g -Wall -pedantic -Wno-long-long -pipe -pthread -fPIC -Wall -pedantic -Wno-long-long -pipe -pthread -DUSE_GLSDL -DV3_DISABLE_Z -D_REENTRANT -DRELEASE -DPREFIX="\"/usr\"" -DRESOURCES_DIR="\"/usr/share/games/btanks\"" -DPLUGINS_DIR="\"/usr/lib/btanks\"" -DMRTAPI=DLLEXPORT -I. -Ibuild/release/mrt -Imrt mrt/utf8_utils.cpp
+In file included from mrt/utf8_utils.cpp:21:
+mrt/tclUniData.c:883: error: conflicting declaration '__CURRENCY_SYMBOL'
+/usr/include/langinfo.h:360: error: '__CURRENCY_SYMBOL' has a previous declaration as '<anonymous enum> __CURRENCY_SYMBOL'
+scons: *** [build/release/mrt/utf8_utils.os] Error 1
+
+--- btanks-0.8.7686.orig/mrt/tclUniData.c
++++ btanks-0.8.7686/mrt/tclUniData.c
+@@ -880,7 +880,7 @@
+     FINAL_QUOTE_PUNCTUATION,
+     OTHER_PUNCTUATION,
+     MATH_SYMBOL,
+-    CURRENCY_SYMBOL,
++    MY_CURRENCY_SYMBOL,
+     MODIFIER_SYMBOL,
+     OTHER_SYMBOL
+ };

Modified: packages/trunk/btanks/debian/patches/series
===================================================================
--- packages/trunk/btanks/debian/patches/series	2009-02-16 20:56:06 UTC (rev 8863)
+++ packages/trunk/btanks/debian/patches/series	2009-02-16 23:17:37 UTC (rev 8864)
@@ -1 +1,2 @@
 remove_default_optimizations.patch
+rename-currency-symbol.patch