[vcmi] 06/10: add patch minizip_maxu32

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch master
in repository vcmi.

commit 09b0954db03591f9d18e7975ca3469d0638ea6d1
Author: Johannes Schauer <josch at debian.org>
Date:   Tue Nov 8 08:09:26 2016 -0200

    add patch minizip_maxu32
---
 debian/changelog              |  1 +
 debian/patches/minizip_maxu32 | 20 ++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 296beb8..bdbcbd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ vcmi (0.99+dfsg-1) UNRELEASED; urgency=medium
   * remove patches boost1.60.diff, build_with_boost_1.58 and ffmpeg_2.9.patch
     as they all have been included by upstream
   * add Build-Depends on libboost-test-dev
+  * add patch minizip_maxu32
 
  -- Johannes Schauer <josch at debian.org>  Tue, 08 Nov 2016 06:33:04 -0200
 
diff --git a/debian/patches/minizip_maxu32 b/debian/patches/minizip_maxu32
new file mode 100644
index 0000000..a99c95d
--- /dev/null
+++ b/debian/patches/minizip_maxu32
@@ -0,0 +1,20 @@
+Author: Johannes Schauer <josch at debian.org>
+Description: define MAXU32 if it's not defined yet
+ If system's copy of minizip is used, then an old copy from
+ www.winimage.com/zLibDll/minizip.html might be installed. That copy is no
+ longer maintained as development of minizip moved to zlib. But that old copy
+ does not define UINT32_MAX, so we have to do that manually.
+ Also see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=843617
+
+--- a/lib/filesystem/FileStream.cpp
++++ b/lib/filesystem/FileStream.cpp
+@@ -3,6 +3,9 @@
+ 
+ #ifdef USE_SYSTEM_MINIZIP
+ #include <minizip/unzip.h>
++#ifndef MAXU32
++#define MAXU32 UINT32_MAX
++#endif
+ #else
+ #include "../minizip/unzip.h"
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 31acd96..4ab4eca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable-privacy-breach
+minizip_maxu32

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git