From: Debian Krap Maintainers <debian-qt-kde@lists.debian.org>
Date: Mon, 15 Sep 2014 17:48:35 +0000 (+0000)
Subject: repack-zlib
X-Git-Tag: archive/raspbian/6.1.6+dfsg2-4+rpi1~1^2^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5cc846cf29006a169568967a40a17d955d494b3e;p=virtuoso-opensource.git

repack-zlib


Gbp-Pq: Name repack-zlib.patch
---

diff --git a/configure.in b/configure.in
index 30395a91..bd01536a 100644
--- a/configure.in
+++ b/configure.in
@@ -2725,7 +2725,6 @@ AC_CONFIG_FILES([
 	libsrc/util/Makefile
 	libsrc/Wi/Makefile
 	libsrc/Xml.new/Makefile
-	libsrc/zlib/Makefile
 	appsrc/Makefile
 	appsrc/ODS-Framework/Makefile
 	appsrc/ODS-Addressbook/Makefile
diff --git a/libsrc/Makefile.am b/libsrc/Makefile.am
index 7f264aba..6aa34bab 100644
--- a/libsrc/Makefile.am
+++ b/libsrc/Makefile.am
@@ -19,7 +19,7 @@
 #  
 #  
 
-SUBDIRS = util zlib odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.new JDBCDriverType4
+SUBDIRS = util odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.new JDBCDriverType4
 
 noinst_HEADERS = Dk.h libutil.h
 
diff --git a/libsrc/Wi/bif_file.c b/libsrc/Wi/bif_file.c
index 0fc60df1..0bcaf05b 100644
--- a/libsrc/Wi/bif_file.c
+++ b/libsrc/Wi/bif_file.c
@@ -4784,7 +4784,11 @@ gz_init_ses (dk_session_t * ses_out)
   level = 6;
 
   err = deflateInit2 (&(s->stream), level,
-      Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
+      Z_DEFLATED, -MAX_WBITS, 9, strategy);
+      // Debian maintainer: was:
+      //Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
+      // DEX_MEM_LEVEL hardcoded at 9, which is the value that
+      // results from upstream shipped zlib build anyway
 
   s->stream.next_out = s->outbuf = (Byte *) dk_alloc (Z_BUFSIZE);
   if (err != Z_OK || s->outbuf == Z_NULL)