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

[Vincent Cheng]

Author: vincentc-guest
Date: 2013-08-20 08:48:42 +0000 (Tue, 20 Aug 2013)
New Revision: 14512

Removed:
   packages/trunk/supertux/debian/patches/fix_gcc4.7_ftbfs.patch
Modified:
   packages/trunk/supertux/debian/changelog
   packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch
   packages/trunk/supertux/debian/patches/series
Log:
supertux: Refresh remaining patches


Modified: packages/trunk/supertux/debian/changelog
===================================================================
--- packages/trunk/supertux/debian/changelog	2013-08-20 08:22:25 UTC (rev 14511)
+++ packages/trunk/supertux/debian/changelog	2013-08-20 08:48:42 UTC (rev 14512)
@@ -2,7 +2,8 @@
 
   * New upstream release.
     - Remove patches applied upstream:
-      fix_{man_page,curl_ftbfs,gcc4.6_ftbfs,joystick_conf_loss}.patch
+      fix_{man_page,curl_ftbfs,gcc{4.6,4.7}_ftbfs,joystick_conf_loss}.patch
+    - Refresh remaining patches.
   * Remove unnecessary Build-Conflicts field.
   * Update watch file (thanks to Bart Martens).
 

Modified: packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch
===================================================================
--- packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch	2013-08-20 08:22:25 UTC (rev 14511)
+++ packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch	2013-08-20 08:48:42 UTC (rev 14512)
@@ -4,12 +4,12 @@
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -153,7 +153,7 @@
+@@ -154,7 +154,7 @@
  
  ## Add squirrel lib dir to search path
  
--LINK_DIRECTORIES(external/squirrel)
-+#LINK_DIRECTORIES(external/squirrel)
+-LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
++#LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
  
  ## Some additional include paths
  

Deleted: packages/trunk/supertux/debian/patches/fix_gcc4.7_ftbfs.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_gcc4.7_ftbfs.patch	2013-08-20 08:22:25 UTC (rev 14511)
+++ packages/trunk/supertux/debian/patches/fix_gcc4.7_ftbfs.patch	2013-08-20 08:48:42 UTC (rev 14512)
@@ -1,38 +0,0 @@
-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));

Modified: packages/trunk/supertux/debian/patches/series
===================================================================
--- packages/trunk/supertux/debian/patches/series	2013-08-20 08:22:25 UTC (rev 14511)
+++ packages/trunk/supertux/debian/patches/series	2013-08-20 08:48:42 UTC (rev 14512)
@@ -1,4 +1,3 @@
-fix_gcc4.7_ftbfs.patch
 embedded_libsquirrel.patch
 fix_desktop_file.patch
 fix_spelling_errors.patch