This is an automated email from the ASF dual-hosted git repository.

ardovm pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 210bcd3ae4e637a168851d39c231d8dc41f9fa50
Author: Don Lewis <[email protected]>
AuthorDate: Tue Sep 29 02:18:52 2020 -0700

    Fix nss build on Windows.
    
    (cherry picked from commit 71f9ed3af399651ba219cc7fdfd0a8b8178cb51f)
---
 main/nss/makefile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/nss/makefile.mk b/main/nss/makefile.mk
index 3c6353c..46d105a 100644
--- a/main/nss/makefile.mk
+++ b/main/nss/makefile.mk
@@ -117,7 +117,7 @@ OUT2LIB= \
 .ELSE                  # "$(COM)"=="GCC"
 MOZ_MSVCVERSION= 9
 .EXPORT : MOZ_MSVCVERSION
-PATCH_FILES+=nss_win.patch nss_bug_1437734.patch
+PATCH_FILES+=nss_win.patch
 moz_build:=$(shell cygpath -p $(MOZILLABUILD))
 
 #Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll 

Reply via email to