[Libreoffice-commits] core.git: external/nss

[Jan-Marek Glogowski (via logerrit)]

 external/nss/nss-android.patch.1 |    8 +++++---
 external/nss/nss-ios.patch       |    4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit d585cad3e63c894aba33993ad970ca5452fdfcc0
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Mon Jun 1 04:44:50 2020 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Mon Jun 1 04:55:52 2020 +0200

    NSS: update Android and iOS patches
    
    They now apply again without any fuzz hunks.
    
    Change-Id: I8200494b43b97ada66aeb4fa8f9737c3a720dbe2

diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index b77663c59eb3..7d3807f73589 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -62,15 +62,17 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
  	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
 --- nss/nss/lib/ckfw/builtins/manifest.mn.orig	2019-11-26 15:18:22.185985193 +0100
 +++ nss/nss/lib/ckfw/builtins/manifest.mn	2019-11-26 15:18:29.281982387 +0100
-@@ -5,7 +5,7 @@
+@@ -5,9 +5,7 @@
  
  CORE_DEPTH = ../../..
  
--DIRS = testlib
+-DIRS = . testlib
+-
+-testlib: .
 +DIRS =
  
  MODULE = nss
- MAPFILE = $(OBJDIR)/nssckbi.def
+ 
 diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk
 --- nss/nss/coreconf/arch.mk	2019-11-01 10:29:44.933245745 +0100
 +++ nss/nss/coreconf/arch.mk	2019-11-01 10:32:04.347181076 +0100
diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch
index 9d4af2c724e9..000d1685abf5 100644
--- a/external/nss/nss-ios.patch
+++ b/external/nss/nss-ios.patch
@@ -62,7 +62,7 @@
  	MKSHLIB += -exported_symbols_list $(MAPFILE)
 --- a/a/nss/coreconf/UNIX.mk
 +++ a/a/nss/coreconf/UNIX.mk
-@@ -21,10 +21,14 @@
+@@ -19,10 +19,14 @@
  
  ifdef BUILD_TREE
  NSINSTALL_DIR  = $(BUILD_TREE)/nss
@@ -76,7 +76,7 @@
 +endif
  endif
  
- MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
+ ####################################################################
 --- a/a/nspr/pr/include/md/_darwin.h
 +++ a/a/nspr/pr/include/md/_darwin.h
 @@ -26,6 +26,8 @@