rpms/supertux/devel supertux-0.3.1-comments.patch, NONE, 1.1 supertux-0.3.1-cons_disable.patch, NONE, 1.1 supertux.spec, 1.19, 1.20

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/supertux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2143

Modified Files:
	supertux.spec 
Added Files:
	supertux-0.3.1-comments.patch 
	supertux-0.3.1-cons_disable.patch 
Log Message:
* Sun Jan 18 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3.1-4
- Fix parsing of translations (#477497)
- Disable debugging console


supertux-0.3.1-comments.patch:

--- NEW FILE supertux-0.3.1-comments.patch ---
From: Lubomir Rintel <lkundrak at v3.sk>
Subject: [PATCH] Fix useless warnings using most locales

This actually addresses two issues:

Consider blank lines to be comments, skip over them rather than
attempting to read keywords there.

Empty a token when the comment is enountered -- the comment
is not necessarily followed by a keyword, but it can be an EOF.

diff -up supertux-0.3.1/src/tinygettext/tinygettext.cpp.comments supertux-0.3.1/src/tinygettext/tinygettext.cpp
--- supertux-0.3.1/src/tinygettext/tinygettext.cpp.comments	2008-12-20 22:37:54.000000000 +0100
+++ supertux-0.3.1/src/tinygettext/tinygettext.cpp	2008-12-20 22:38:17.000000000 +0100
@@ -705,15 +705,16 @@ public:
         switch(state)
           {
           case READ_KEYWORD:
-            if (c == '#')
+            // Read a new token
+            token = Token();
+
+            if (c == '#' || c == '\n' || c == '\r')
               {
                 state = SKIP_COMMENT;
+                in.unget();
               }
             else
               {
-                // Read a new token
-                token = Token();
-
                 do { // Read keyword
                   token.keyword += c;
                 } while((c = getchar(in)) != EOF && !isspace(c));

supertux-0.3.1-cons_disable.patch:

--- NEW FILE supertux-0.3.1-cons_disable.patch ---
diff -up supertux-0.3.1/src/console.cpp.cons_disable supertux-0.3.1/src/console.cpp
--- supertux-0.3.1/src/console.cpp.cons_disable	2008-12-20 22:46:37.000000000 +0100
+++ supertux-0.3.1/src/console.cpp	2008-12-20 22:46:48.000000000 +0100
@@ -347,6 +347,7 @@ Console::addLine(std::string s)
   // output line to stderr
   std::cerr << s << std::endl;
 
+#if 0
   // wrap long lines
   std::string overflow;
   unsigned int line_count = 0;
@@ -373,6 +374,7 @@ Console::addLine(std::string s)
   // increase time that console stays open
   if(stayOpen < 6)
     stayOpen += 1.5;
+#endif
 }
 
 void


Index: supertux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- supertux.spec	10 Jul 2008 09:26:37 -0000	1.19
+++ supertux.spec	18 Jan 2009 19:36:28 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:           supertux
 Version:        0.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Jump'n run like game similar to Mario Bros
 Group:          Amusements/Games
 License:        GPLv2+
@@ -14,6 +14,8 @@
 #Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
 Source0:        http://download.berlios.de/supertux/supertux-%{version}d.tar.bz2
 Patch0:         supertux-0.3.1-gcc43.patch
+Patch1:         supertux-0.3.1-comments.patch
+Patch2:         supertux-0.3.1-cons_disable.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4
 BuildRequires:  SDL_image-devel
@@ -43,7 +45,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .comments
+%patch2 -p1 -b .cons_disable
 
 # We want to just call this release "supertux", not "supertux2".
 find . -depth -name 'supertux2*' \
@@ -88,6 +92,10 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Jan 18 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3.1-4
+- Fix parsing of translations (#477497)
+- Disable debugging console
+
 * Thu Jul 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
 - Fix building with gcc-4.3 (bz 434445)