packages: supertuxkart/supertuxkart-duplicate_files.patch, supertuxkart/sup...

[lisu]

Author: lisu                         Date: Tue Dec 21 09:03:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.7

---- Files affected:
packages/supertuxkart:
   supertuxkart-duplicate_files.patch (1.1 -> 1.2) , supertuxkart-gettext.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/supertuxkart/supertuxkart-duplicate_files.patch
diff -u packages/supertuxkart/supertuxkart-duplicate_files.patch:1.1 packages/supertuxkart/supertuxkart-duplicate_files.patch:1.2
--- packages/supertuxkart/supertuxkart-duplicate_files.patch:1.1	Wed Aug 19 12:18:00 2009
+++ packages/supertuxkart/supertuxkart-duplicate_files.patch	Tue Dec 21 10:03:21 2010
@@ -1,10 +1,10 @@
---- supertuxkart-0.6.1a/data/Makefile.am~	2009-08-19 11:46:35.000000000 +0200
-+++ supertuxkart-0.6.1a/data/Makefile.am	2009-08-19 12:01:16.000000000 +0200
-@@ -10,7 +10,6 @@
-  $(shell find $(srcdir) -name "*.cup") \
+--- supertuxkart-0.7alpha2/data/Makefile.am~	2010-06-07 13:50:17.795655705 +0200
++++ supertuxkart-0.7alpha2/data/Makefile.am	2010-06-07 13:51:07.825651246 +0200
+@@ -6,7 +6,6 @@
+ dist_pkgdata_DATA = \
+  $(shell find $(srcdir) -name "*.data")                  \
+  $(shell find $(srcdir) -name "*.items")                 \
+- $(shell find $(srcdir) -name "*.projectile")            \
+  $(shell find $(srcdir) -name "*.cup")                   \
   $(shell find $(srcdir) -maxdepth 1 -name "*.challenge") \
-  $(shell find $(srcdir) -name "*.collectable") \
-- $(shell find $(srcdir) -name "*.projectile") \
-  CREDITS
- 
- desktopdir = $(prefix)/share/applications
+  $(shell find $(srcdir) -name "*.collectable")           \

================================================================
Index: packages/supertuxkart/supertuxkart-gettext.patch
diff -u packages/supertuxkart/supertuxkart-gettext.patch:1.1 packages/supertuxkart/supertuxkart-gettext.patch:1.2
--- packages/supertuxkart/supertuxkart-gettext.patch:1.1	Fri Jan 23 10:18:28 2009
+++ packages/supertuxkart/supertuxkart-gettext.patch	Tue Dec 21 10:03:21 2010
@@ -1,11 +1,34 @@
---- supertuxkart-0.6/configure.ac~	2009-01-20 01:16:32.000000000 +0100
-+++ supertuxkart-0.6/configure.ac	2009-01-23 09:25:42.000000000 +0100
-@@ -360,7 +360,7 @@
- ENETTREE="src/enet"
- 
+--- supertuxkart-0.7alpha3/configure.ac~	2010-09-24 03:21:15.000000000 +0200
++++ supertuxkart-0.7alpha3/configure.ac	2010-09-29 13:23:49.776109670 +0200
+@@ -404,7 +404,7 @@
+ # =================
  # Check for gettext
+ # =================
 -CHECK_GETTEXT(external)
-+# CHECK_GETTEXT(external)
++#CHECK_GETTEXT(external)
+ #disable/enable addons support
+ AC_ARG_WITH(addons,[AS_HELP_STRING([--with-addons],
+               [This option is used to enable/disable addons support])])
+--- supertuxkart-0.7alpha3/src/utils/translation.cpp~	2010-09-24 01:27:23.000000000 +0200
++++ supertuxkart-0.7alpha3/src/utils/translation.cpp	2010-09-29 13:24:44.236109680 +0200
+@@ -33,6 +33,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <iostream>
++#include <libintl.h>
+ 
+ #include "irrlicht.h"
+ 
+@@ -113,12 +114,7 @@
+     #endif
+ #endif
+     
+-#if ENABLE_NLS
+     const char* original_t = gettext(original);
+-#else
+-    m_converted_string = core::stringw(original);
+-    return m_converted_string.c_str();
+-#endif
  
- dnl =======================================================
- dnl Add special compiler flags for SDL on certain platforms
+     /*
+     std::cout << "--> original_t==original ? " << (original_t==original) << std::endl;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/supertuxkart/supertuxkart-duplicate_files.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/supertuxkart/supertuxkart-gettext.patch?r1=1.1&r2=1.2&f=u