simplified the no z-types patch

a single define!

diff --git a/debian/patches/no-ztypes.patch b/debian/patches/no-ztypes.patch
index a0b2aff3da6baf2b36136fe591d7f7bbb7fd752f..e64067cc2843cb5187efa0f90d83697cb55d7572 100644 (file)
--- a/debian/patches/no-ztypes.patch
+++ b/debian/patches/no-ztypes.patch
@@ -5,38 +5,13 @@ Author: IOhannes m zmölnig
 Last-Update: 2015-01-21
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
-+++ juce/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
-@@ -87,8 +87,8 @@
-         {\r
-             stream.next_in   = const_cast<uint8*> (data);\r
-             stream.next_out  = buffer;\r
--            stream.avail_in  = (z_uInt) dataSize;\r
--            stream.avail_out = (z_uInt) sizeof (buffer);\r
-+            stream.avail_in  = (uInt) dataSize;\r
-+            stream.avail_out = (uInt) sizeof (buffer);\r
- \r
-             const int result = isFirstDeflate ? deflateParams (&stream, compLevel, strategy)\r
-                                               : deflate (&stream, flushMode);\r
 --- juce.orig/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
 +++ juce/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
-@@ -126,8 +126,8 @@
-         {\r
-             stream.next_in  = data;\r
-             stream.next_out = dest;\r
--            stream.avail_in  = (z_uInt) dataSize;\r
--            stream.avail_out = (z_uInt) destSize;\r
-+            stream.avail_in  = (uInt) dataSize;\r
-+            stream.avail_out = (uInt) destSize;\r
- \r
-             switch (inflate (&stream, Z_PARTIAL_FLUSH))\r
-             {\r
-@@ -136,7 +136,7 @@
-                 // deliberate fall-through\r
-             case Z_OK:\r
-                 data += dataSize - stream.avail_in;\r
--                dataSize = (z_uInt) stream.avail_in;\r
-+                dataSize = (uInt) stream.avail_in;\r
-                 return (int) (destSize - stream.avail_out);\r
+@@ -77,6 +77,7 @@
+   #endif\r
+  #else\r
+   #include JUCE_ZLIB_INCLUDE_PATH\r
++  #define z_uInt uInt\r
+  #endif\r
+ }\r
  \r
-             case Z_NEED_DICT:\r