repack-zlib

Gbp-Pq: Name repack-zlib.patch

diff --git a/configure.in b/configure.in
index 29d55c50714b4b4b7c346b4834e6ef51d822ee4d..d6f4baf2bf03b2f7a3979fcf5e7be4d696a759a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2676,7 +2676,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 3f61ce4850d97a0644f10a920748f645a17fa900..8242c0e15a2e3bb71e5d4cd7b42416691a7bf67b 100644 (file)
--- 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 b1eab12509732145f730fd86a8523149c7cd6086..dabefcfeecca6c1666076549403e387e95976660 100644 (file)
--- a/libsrc/Wi/bif_file.c
+++ b/libsrc/Wi/bif_file.c
@@ -4750,7 +4750,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)