[SCM] Worms style game branch, master, updated. debian/0.9.19.2-1-2-g085f3d1

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 085f3d10f17f916c3008fd2e43800eb91502cd4e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jun 10 18:29:06 2013 +0200

    Added a patch addressing the i386 game launch failure (localization issue)

diff --git a/debian/changelog b/debian/changelog
index 7c027a3..54a6b77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+hedgewars (0.9.19.2-2) unstable; urgency=low
+
+  * debian/control
+    - Changed package description
+    - added fix-physfs.patch
+      this basically reverts the problem with i386 machines
+      see upstream issue 665.
+      Revert upstream commit 3883b5dc600c
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 10 Jun 2013 18:21:36 +0200
+
 hedgewars (0.9.19.2-1) unstable; urgency=low
 
   * New upstream tarball.
diff --git a/debian/patches/fix-physfs.patch b/debian/patches/fix-physfs.patch
new file mode 100644
index 0000000..90ebfb0
--- /dev/null
+++ b/debian/patches/fix-physfs.patch
@@ -0,0 +1,41 @@
+Origin: <upstream>
+Bug: https://code.google.com/p/hedgewars/issues/detail?id=665
+Forwarded: <not-needed>
+Reviewed-By: <costamagnagianfranco at yahoo.it>
+Last-Update: <2013-06-10>
+
+--- hedgewars-0.9.19.2.orig/misc/libphysfs/CMakeLists.txt
++++ hedgewars-0.9.19.2/misc/libphysfs/CMakeLists.txt
+@@ -35,14 +35,6 @@ include(CheckLibraryExists)
+ include(CheckCSourceCompiles)
+ 
+ 
+-# 32bit platforms won't link unless this is set
+-# although Windows doesn't like it
+-if(NOT WINDOWS)
+-    if(CMAKE_SIZEOF_VOID_P LESS 8)
+-        add_definitions(-DPHYSFS_NO_64BIT_SUPPORT=1)
+-    endif(CMAKE_SIZEOF_VOID_P LESS 8)
+-endif(NOT WINDOWS)
+-
+ 
+ if(MACOSX)
+     # Fallback to older OS X on PowerPC to support wider range of systems...
+#--- hedgewars-0.9.19.2.orig/misc/libphysfs/physfs_internal.h
+#+++ hedgewars-0.9.19.2/misc/libphysfs/physfs_internal.h
+#@@ -322,13 +322,8 @@ void __PHYSFS_sort(void *entries, size_t
+# #define __PHYSFS_ARRAYLEN(x) ( (sizeof (x)) / (sizeof (x[0])) )
+# 
+# #ifdef PHYSFS_NO_64BIT_SUPPORT
+#-/* if a 32bit compiler sees something with this many bits: 0xFFFFFFFFFFFFFFFF
+#- *  it doesn't know if it really means 64bit or if it's supposed to squeeze
+#- *  it into 32 bit, so without the ULL it squeezes the number to 32 bit,
+#- *  with it it forces it to be 64bits
+#- */
+#-#define __PHYSFS_SI64(x) ((PHYSFS_sint64) (x##LL))
+#-#define __PHYSFS_UI64(x) ((PHYSFS_uint64) (x##ULL))
+#+#define __PHYSFS_SI64(x) ((PHYSFS_sint64) (x))
+#+#define __PHYSFS_UI64(x) ((PHYSFS_uint64) (x))
+# #elif (defined __GNUC__)
+# #define __PHYSFS_SI64(x) x##LL
+# #define __PHYSFS_UI64(x) x##ULL
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..28bd1b4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-physfs.patch

-- 
Worms style game