From 3a30e5c8896a501bb3ff034d22e8e80ed61440fb Mon Sep 17 00:00:00 2001 From: Debian Krap Maintainers Date: Wed, 17 Apr 2013 19:30:26 +0000 Subject: [PATCH] repack-zlib Gbp-Pq: Name repack-zlib.patch --- configure.in | 1 - libsrc/Makefile.am | 2 +- libsrc/Wi/bif_file.c | 6 +++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 29d55c50..d6f4baf2 100644 --- 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 3f61ce48..8242c0e1 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 b1eab125..dabefcfe 100644 --- 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) -- 2.30.2