[SCM] juce/master: Patch to not use z_uInt
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Thu Jan 21 16:34:05 UTC 2016
The following commit has been merged in the master branch:
commit 4119285df8564ce6cbec6c42b90a76b1a6f8ad00
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Thu Jan 21 16:08:49 2016 +0100
Patch to not use z_uInt
diff --git a/debian/patches/no-ztypes.patch b/debian/patches/no-ztypes.patch
new file mode 100644
index 0000000..a0b2aff
--- /dev/null
+++ b/debian/patches/no-ztypes.patch
@@ -0,0 +1,42 @@
+Description: do not use z_uInt
+ the zlib/gzip consumers use a type z_uInt, which is nowhere actually defined.
+ use (uInt) instead
+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 @@
+ {
+ stream.next_in = const_cast<uint8*> (data);
+ stream.next_out = buffer;
+- stream.avail_in = (z_uInt) dataSize;
+- stream.avail_out = (z_uInt) sizeof (buffer);
++ stream.avail_in = (uInt) dataSize;
++ stream.avail_out = (uInt) sizeof (buffer);
+
+ const int result = isFirstDeflate ? deflateParams (&stream, compLevel, strategy)
+ : deflate (&stream, flushMode);
+--- juce.orig/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
++++ juce/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
+@@ -126,8 +126,8 @@
+ {
+ stream.next_in = data;
+ stream.next_out = dest;
+- stream.avail_in = (z_uInt) dataSize;
+- stream.avail_out = (z_uInt) destSize;
++ stream.avail_in = (uInt) dataSize;
++ stream.avail_out = (uInt) destSize;
+
+ switch (inflate (&stream, Z_PARTIAL_FLUSH))
+ {
+@@ -136,7 +136,7 @@
+ // deliberate fall-through
+ case Z_OK:
+ data += dataSize - stream.avail_in;
+- dataSize = (z_uInt) stream.avail_in;
++ dataSize = (uInt) stream.avail_in;
+ return (int) (destSize - stream.avail_out);
+
+ case Z_NEED_DICT:
diff --git a/debian/patches/series b/debian/patches/series
index 0ca28ba..1c93582 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+no-ztypes.patch
do-not-track.patch
--
juce packaging
More information about the pkg-multimedia-commits
mailing list