r13544 - in packages/trunk/supertux/debian: . patches

Sun May 6 00:07:29 UTC 2012

Author: vincentc-guest
Date: 2012-05-06 00:07:28 +0000 (Sun, 06 May 2012)
New Revision: 13544

Added:
   packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch
   packages/trunk/supertux/debian/patches/fix_curl_ftbfs.patch
   packages/trunk/supertux/debian/patches/fix_desktop_file.patch
   packages/trunk/supertux/debian/patches/fix_gcc4.6_ftbfs.patch
   packages/trunk/supertux/debian/patches/fix_gcc4.7_ftbfs.patch
   packages/trunk/supertux/debian/patches/fix_man_page.patch
   packages/trunk/supertux/debian/patches/fix_spelling_errors.patch
Modified:
   packages/trunk/supertux/debian/changelog
   packages/trunk/supertux/debian/patches/series
Log:
supertux: Update to release 0.3.3-5 (and add all patches to svn, which I've
somehow neglected to do previously...)


Modified: packages/trunk/supertux/debian/changelog
===================================================================

--- packages/trunk/supertux/debian/changelog	2012-05-05 15:46:59 UTC (rev 13543)
+++ packages/trunk/supertux/debian/changelog	2012-05-06 00:07:28 UTC (rev 13544)
@@ -1,3 +1,10 @@
+supertux (0.3.3-5) experimental; urgency=low
+
+  * Add debian/patches/fix_gcc4.7_ftbfs.patch to fix FTBFS with gcc 4.7.
+   (Closes: #671538)
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com>  Fri, 04 May 2012 14:23:56 -0700
+
 supertux (0.3.3-4) experimental; urgency=low
 
   * Add myself to Uploaders.

Added: packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch
===================================================================
--- packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch	                        (rev 0)
+++ packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch	2012-05-06 00:07:28 UTC (rev 13544)
@@ -0,0 +1,15 @@
+Description: Do not add path to embedded libsquirrel to linker path
+Author: Christoph Egger <christoph at debian.org>
+Bug: https://supertux.lethargik.org/bugs/view.php?id=640
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -153,7 +153,7 @@
+ 
+ ## Add squirrel lib dir to search path
+ 
+-LINK_DIRECTORIES(external/squirrel)
++#LINK_DIRECTORIES(external/squirrel)
+ 
+ ## Some additional include paths
+ 

Added: packages/trunk/supertux/debian/patches/fix_curl_ftbfs.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_curl_ftbfs.patch	                        (rev 0)
+++ packages/trunk/supertux/debian/patches/fix_curl_ftbfs.patch	2012-05-06 00:07:28 UTC (rev 13544)
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with curl >= 7.21.7
+Author: Christoph Egger <christoph at debian.org>
+Bug: https://supertux.lethargik.org/bugs/view.php?id=855
+Last-Update: 2012-03-04
+
+--- a/src/addon/addon_manager.cpp
++++ b/src/addon/addon_manager.cpp
+@@ -29,7 +29,6 @@
+ #ifdef HAVE_LIBCURL
+ #  include <curl/curl.h>
+ #  include <curl/easy.h>
+-#  include <curl/types.h>
+ #endif
+ 
+ #include "addon/addon.hpp"

Added: packages/trunk/supertux/debian/patches/fix_desktop_file.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_desktop_file.patch	                        (rev 0)
+++ packages/trunk/supertux/debian/patches/fix_desktop_file.patch	2012-05-06 00:07:28 UTC (rev 13544)
@@ -0,0 +1,14 @@
+Description: Remove embedded Encoding key in supertux's menu entry file.
+Author: Vincent Cheng <Vincentc1208 at gmail.com>
+Forwarded: not-yet
+
+--- a/supertux2.desktop
++++ b/supertux2.desktop
+@@ -1,7 +1,6 @@
+ [Desktop Entry]
+ Type=Application
+ Version=1.0
+-Encoding=UTF-8
+ Name=SuperTux 2
+ Name[en]=SuperTux 2
+ GenericName=Platform Game

Added: packages/trunk/supertux/debian/patches/fix_gcc4.6_ftbfs.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_gcc4.6_ftbfs.patch	                        (rev 0)
+++ packages/trunk/supertux/debian/patches/fix_gcc4.6_ftbfs.patch	2012-05-06 00:07:28 UTC (rev 13544)
@@ -0,0 +1,15 @@
+Description: Add missing header. Fixes FTBFS with gcc 4.6.
+Author: Ilya Barygin <barygin at gmail.com>
+Bug-Ubuntu: https://launchpad.net/bugs/832874
+Bug-Debian: http://bugs.debian.org/640192
+
+--- a/src/supertux/screen_manager.hpp
++++ b/src/supertux/screen_manager.hpp
+@@ -18,6 +18,7 @@
+ #define HEADER_SUPERTUX_SUPERTUX_MAINLOOP_HPP
+ 
+ #include <memory>
++#include <cstring>
+ 
+ #include "scripting/thread_queue.hpp"
+ 

Added: packages/trunk/supertux/debian/patches/fix_gcc4.7_ftbfs.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_gcc4.7_ftbfs.patch	                        (rev 0)
+++ packages/trunk/supertux/debian/patches/fix_gcc4.7_ftbfs.patch	2012-05-06 00:07:28 UTC (rev 13544)
@@ -0,0 +1,38 @@
+Description: Fix FTBFS with gcc 4.7 caused by libsquirrel
+Forwarded: yes
+Origin: upstream, https://supertux.lethargik.org/bugs/view.php?id=933
+Bug-Debian: http://bugs.debian.org/671538
+
+--- /dev/null
++++ b/external/squirrel/squirrel/sqmem.h
+@@ -0,0 +1,8 @@
++/*	see copyright notice in squirrel.h */
++#ifndef _SQMEM_H_
++#define _SQMEM_H_
++
++void *sq_vm_malloc(SQUnsignedInteger size);
++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
++void sq_vm_free(void *p,SQUnsignedInteger size);
++#endif //_SQMEM_H_
+--- a/external/squirrel/squirrel/sqstate.h
++++ b/external/squirrel/squirrel/sqstate.h
+@@ -136,8 +136,4 @@
+ extern SQObjectPtr _minusone_;
+ 
+ bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+-
+-void *sq_vm_malloc(SQUnsignedInteger size);
+-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+-void sq_vm_free(void *p,SQUnsignedInteger size);
+ #endif //_SQSTATE_H_
+--- a/external/squirrel/squirrel/squtils.h
++++ b/external/squirrel/squirrel/squtils.h
+@@ -2,6 +2,8 @@
+ #ifndef _SQUTILS_H_
+ #define _SQUTILS_H_
+ 
++#include "sqmem.h"
++
+ #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
+ #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
+ #define SQ_MALLOC(__size) sq_vm_malloc((__size));

Added: packages/trunk/supertux/debian/patches/fix_man_page.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_man_page.patch	                        (rev 0)
+++ packages/trunk/supertux/debian/patches/fix_man_page.patch	2012-05-06 00:07:28 UTC (rev 13544)
@@ -0,0 +1,17 @@
+Description: Fix manpage related error
+ W: supertux: manpage-has-errors-from-man usr/share/man/man6/supertux2.6.gz
+ 126: warning: macro `..' not defined
+Author: Christoph Egger <christoph at debian.org>
+Forwarded: not-yet
+
+--- a/man/man6/supertux2.6
++++ b/man/man6/supertux2.6
+@@ -123,7 +123,7 @@
+ .nf
+ levels/sample_collection/info
+ levels/sample_collection/level01.stl
+-...
++ ...
+ .fi
+ .SH BUGS
+ This is a development version, so expect plenty of bugs.

Added: packages/trunk/supertux/debian/patches/fix_spelling_errors.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_spelling_errors.patch	                        (rev 0)
+++ packages/trunk/supertux/debian/patches/fix_spelling_errors.patch	2012-05-06 00:07:28 UTC (rev 13544)
@@ -0,0 +1,26 @@
+Description: Fix various spelling errors caught by lintian
+Author: Vincent Cheng <Vincentc1208 at gmail.com>
+Forwarded: not-yet
+
+--- a/external/squirrel/sqstdlib/sqstdstring.cpp
++++ b/external/squirrel/sqstdlib/sqstdstring.cpp
+@@ -88,7 +88,7 @@
+ 		else {
+ 			n++;
+ 			if( nparam > sq_gettop(v) )
+-				return sq_throwerror(v,_SC("not enough paramters for the given format string"));
++				return sq_throwerror(v,_SC("not enough parameters for the given format string"));
+ 			n = validate_format(v,fmt,format,n,w);
+ 			if(n < 0) return -1;
+ 			SQInteger addlen = 0;
+--- a/external/tinygettext/tinygettext/po_parser.cpp
++++ b/external/tinygettext/tinygettext/po_parser.cpp
+@@ -173,7 +173,7 @@
+   else
+   {
+     if (pedantic)
+-      warning("keyword and string must be seperated by a single space");
++      warning("keyword and string must be separated by a single space");
+ 
+     for(;;)
+     {

Modified: packages/trunk/supertux/debian/patches/series
===================================================================
--- packages/trunk/supertux/debian/patches/series	2012-05-05 15:46:59 UTC (rev 13543)
+++ packages/trunk/supertux/debian/patches/series	2012-05-06 00:07:28 UTC (rev 13544)
@@ -1,4 +1,5 @@
 fix_gcc4.6_ftbfs.patch
+fix_gcc4.7_ftbfs.patch
 fix_curl_ftbfs.patch
 embedded_libsquirrel.patch
 fix_desktop_file.patch


