download.lst | 4 ++-- external/nss/nss_macosx.patch | 6 +++--- external/zlib/StaticLibrary_zlib.mk | 1 + 3 files changed, 6 insertions(+), 5 deletions(-)
New commits: commit ca0bd3a66d468910ea1e70719b7f836b89ab4276 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Mar 18 15:27:20 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Mar 26 11:45:21 2025 +0100 nss: upgrade to 3.104 Add uncompr to the static zlib library, otherwise windows build will fail with tstclnt.obj : error LNK2019: unresolved external symbol _uncompress referenced in function _zlibCertificateDecode because it uses USE_SYSTEM_ZLIB=1 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_104_RTM/src/nss-3.104-with-nspr-4.35.tar.gz Change-Id: Ide3c6c641a0433f11c5b7ac1897e1bd46d85e51b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183092 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index a38b13b91201..88c3b9993a4c 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 1636c8c85794e779855183997805b6edfe2dfb43cdf5b6cf1934bf16b1b32520 -NSS_TARBALL := nss-3.103-with-nspr-4.35.tar.gz +NSS_SHA256SUM := 0ea8bab27345e4e0fc0ec0587d01bb54ba7eb46cb5b369c9ed59ee42baa78fa9 +NSS_TARBALL := nss-3.104-with-nspr-4.35.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index 456bd62d509b..cc433fdfb766 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -78,9 +78,9 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk diff -ru a/nss/Makefile b/nss/Makefile --- a/a/nss/Makefile 2014-09-29 16:50:22.990304789 +0100 +++ b/b/nss/Makefile 2014-09-29 16:51:59.207931908 +0100 -@@ -82,6 +82,9 @@ - ifeq ($(OS_TARGET),WIN95) - NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 +@@ -81,6 +81,9 @@ + ifdef USE_64 + NSPR_CONFIGURE_OPTS += --enable-64bit endif +ifdef MACOS_SDK_DIR +NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) diff --git a/external/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk index f5263bef7d91..6463ffc531fd 100644 --- a/external/zlib/StaticLibrary_zlib.mk +++ b/external/zlib/StaticLibrary_zlib.mk @@ -26,6 +26,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\ UnpackedTarball/zlib/inflate \ UnpackedTarball/zlib/inftrees \ UnpackedTarball/zlib/trees \ + UnpackedTarball/zlib/uncompr \ UnpackedTarball/zlib/zutil \ ))
