external/nss/UnpackedTarball_nss.mk | 1 -
external/nss/nss-3.13.5-zlib-werror.patch | 13 -------------
2 files changed, 14 deletions(-)
New commits:
commit f2dc0bedeb7e32e1c78bf218a7277110cdb71ce5
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Jun 1 12:42:43 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Jun 1 19:51:39 2022 +0200
nss: remove nss-3.13.5-zlib-werror.patch
The zlib module should be used instead of NSS' bundled zlib since
commit 1c748fefc3c5b42e3548a1a7f5017a579982005a
Change-Id: I0d820cdd795712a7dbe27ef114f0efddd3f436ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135235
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 4f8499e8a835..32ba88f2bd5a 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -16,7 +16,6 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,nss,nspr/build/autoconf
$(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.patch \
external/nss/nss.aix.patch \
- external/nss/nss-3.13.5-zlib-werror.patch \
external/nss/nss_macosx.patch \
external/nss/nss-win32-make.patch.1 \
external/nss/ubsan.patch.0 \
diff --git a/external/nss/nss-3.13.5-zlib-werror.patch
b/external/nss/nss-3.13.5-zlib-werror.patch
deleted file mode 100644
index 0cdbf7808f81..000000000000
--- a/external/nss/nss-3.13.5-zlib-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/a/nss/lib/zlib/gzguts.h 2010-08-22 03:07:03.000000000 +0200
-+++ b/b/nss/lib/zlib/gzguts.h 2012-07-17 08:52:14.821552788 +0200
-@@ -26,6 +26,10 @@
- # define write _write
- # define close _close
- #endif
-+
-+#ifndef _WIN32
-+#include <unistd.h>
-+#endif
-
- #ifdef NO_DEFLATE /* for compatibility with old definition */
- # define NO_GZCOMPRESS
