[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-7-0+backports' - external/nss

[Michael Weghorn (via logerrit)]

 external/nss/nss-android.patch.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab1a1dd57489d10803e1bf87650a4e47cd402d5d
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Nov 26 15:14:47 2020 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu Nov 26 15:23:31 2020 +0100

    nss: Make Android patch apply cleanly
    
    Previously, manually applying the patch using the 'patch'
    utility resulted in
    
    > patching file manifest.mn
    > Hunk #1 succeeded at 5 with fuzz 1.
    
    and the LibreOffice build triggered by just running
    'make' failed since applying the patch failed.
    
    Change-Id: I105aa5b2f1b9b9f7cafa64865d6026596fdf8e47

diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index b77663c59eb3..64eba512e96d 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -70,7 +70,7 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
 +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