download.lst | 4 ++-- external/zlib/UnpackedTarball_zlib.mk | 1 + external/zlib/missinginclude.patch | 2 +- external/zlib/werror-undef.patch | 16 ++++++++++++++++ 4 files changed, 20 insertions(+), 3 deletions(-)
New commits: commit 47edd83c63fee752404623553400a4754307bc30 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Feb 18 12:45:07 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Feb 18 15:31:22 2026 +0100 zlib: upgrade to 1.3.2 * werror-undef.patch partially reverts https://github.com/madler/zlib/commit/7108497fda9d4536a1afade7f42266e06dca4488 so the build doesn't fail with In file included from /mnt/4d311c06-5193-4f61-a3f6-53ca4d9ea1e1/libreoffice/workdir/UnpackedTarball/zlib/zlib.h:37, from /mnt/4d311c06-5193-4f61-a3f6-53ca4d9ea1e1/libreoffice/sal/rtl/crc.cxx:24: /mnt/4d311c06-5193-4f61-a3f6-53ca4d9ea1e1/libreoffice/workdir/UnpackedTarball/zlib/zconf.h:446:5: error: "HAVE_UNISTD_H" is not defined, evaluates to 0 [-Werror=undef] 446 | #if HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ | ^~~~~~~~~~~~~ /mnt/4d311c06-5193-4f61-a3f6-53ca4d9ea1e1/libreoffice/workdir/UnpackedTarball/zlib/zconf.h:450:5: error: "HAVE_STDARG_H" is not defined, evaluates to 0 [-Werror=undef] 450 | #if HAVE_STDARG_H /* may be set to #if 1 by ./configure */ | ^~~~~~~~~~~~~ cc1plus: all warnings being treated as errors Change-Id: I8f1dbaf627a573b9a5ff8c9f20061ec482b87c8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199616 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index 87b95c930f82..0ba9da7cfc4e 100644 --- a/download.lst +++ b/download.lst @@ -701,8 +701,8 @@ YRS_TARBALL := y-crdt-0.23.5.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -ZLIB_SHA256SUM := 38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32 -ZLIB_TARBALL := zlib-1.3.1.tar.xz +ZLIB_SHA256SUM := d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3 +ZLIB_TARBALL := zlib-1.3.2.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/zlib/UnpackedTarball_zlib.mk b/external/zlib/UnpackedTarball_zlib.mk index 5bad9e311233..90f815d20126 100644 --- a/external/zlib/UnpackedTarball_zlib.mk +++ b/external/zlib/UnpackedTarball_zlib.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0)) $(eval $(call gb_UnpackedTarball_add_patches,zlib, \ external/zlib/missinginclude.patch \ + external/zlib/werror-undef.patch \ )) # cannot use post_action since $(file ..) would be run when the recipe is parsed, i.e. would always diff --git a/external/zlib/missinginclude.patch b/external/zlib/missinginclude.patch index 91a63288bbf1..a9719d379870 100644 --- a/external/zlib/missinginclude.patch +++ b/external/zlib/missinginclude.patch @@ -9,7 +9,7 @@ +#endif #include "gzguts.h" - #if defined(_WIN32) && !defined(__BORLANDC__) + #if defined(__DJGPP__) --- gzread.c +++ gzread.c @@ -3,6 +3,9 @@ diff --git a/external/zlib/werror-undef.patch b/external/zlib/werror-undef.patch new file mode 100644 index 000000000000..7ca81cd60b66 --- /dev/null +++ b/external/zlib/werror-undef.patch @@ -0,0 +1,16 @@ +--- zconf.h 2026-02-18 12:26:44.923467968 +0100 ++++ zconf.h 2026-02-18 12:27:35.631302082 +0100 +@@ -443,11 +443,11 @@ + typedef unsigned long z_crc_t; + #endif + +-#if HAVE_UNISTD_H-0 /* may be set to #if 1 by ./configure */ ++#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ + # define Z_HAVE_UNISTD_H + #endif + +-#if HAVE_STDARG_H-0 /* may be set to #if 1 by ./configure */ ++#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ + # define Z_HAVE_STDARG_H + #endif +
