download.lst | 4 ++-- external/nss/nss_macosx.patch | 29 +++++++++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-)
New commits: commit a40ea776fe34d01682b4716d609e5b61d70226ae Author: Xisco Fauli <[email protected]> AuthorDate: Thu Dec 11 10:22:14 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Dec 19 16:39:49 2025 +0100 nss: upgrade to 3.119.1 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_119_1_RTM/src/nss-3_119_1-with-nspr-4.38.2.tar.gz Change-Id: I281e1a7f7bb212e1e721deba6238f3bcc17795e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195436 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index 78d63ffe1eac..73a1458a8bb4 100644 --- a/download.lst +++ b/download.lst @@ -523,8 +523,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 8f12f61ef814662bf991a289bc6724d078cd79f135e09e260adbc35dfa9acaf3 -NSS_TARBALL := nss-3.119-with-nspr-4.38.2.tar.gz +NSS_SHA256SUM := 1e86aacdce66c3bdd38bb011e617a3c93013ed6f802102365a589d6f686efe4b +NSS_TARBALL := nss-3.119.1-with-nspr-4.38.2.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 eaa025f1c205..e553cfda7042 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -23,33 +23,38 @@ diff -ru a/nspr/configure b/nspr/configure diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk --- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100 +++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100 -@@ -19,34 +19,39 @@ - endif +@@ -20,35 +20,37 @@ - ifeq (x86_64,$(CPU_ARCH)) + ifeq (,$(filter-out i%86,$(CPU_ARCH))) + ifdef USE_64 +ifeq (,$(findstring -arch ,$(CC))) CC += -arch x86_64 CCC += -arch x86_64 +endif override CPU_ARCH = x86_64 - else ifeq (i386,$(CPU_ARCH)) + else OS_REL_CFLAGS = -Di386 +ifeq (,$(findstring -arch ,$(CC))) CC += -arch i386 CCC += -arch i386 +endif override CPU_ARCH = x86 - else ifeq (,$(filter-out aarch64 arm,$(CPU_ARCH))) - CC += -arch arm64 - CCC += -arch arm64 - override CPU_ARCH = aarch64 - else ifeq (powerpc,$(CPU_ARCH)) + endif +-else ifeq (,$(filter-out aarch64 arm,$(CPU_ARCH))) +-CC += -arch arm64 +-CCC += -arch arm64 +-override CPU_ARCH = aarch64 +-else ifeq (powerpc,$(CPU_ARCH)) -OS_REL_CFLAGS = -Dppc -CC += -arch ppc -CCC += -arch ppc - override CPU_ARCH = ppc +-override CPU_ARCH = ppc else - $(error Unknown CPU architecture) +- $(error Unknown CPU architecture) ++ifeq (arm,$(CPU_ARCH)) ++# Nothing set for arm currently. ++else ++endif endif ifneq (,$(MACOS_SDK_DIR)) @@ -67,7 +72,7 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk # GCC <= 3 DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0)) -@@ -108,7 +113,7 @@ +@@ -111,7 +113,7 @@ # May override this with different compatibility and current version numbers. DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1 # May override this with -bundle to create a loadable module.
