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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 23 13:22:27 UTC 2020


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

New commits:
commit 95747c630766c9e3287c2bfea7255ad23a24ce5d
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Thu Apr 23 14:05:26 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Apr 23 15:21:53 2020 +0200

    Use equal number of leading and trailing context lines in patch
    
    At least the patch program on macOS seems to require it.
    
    Change-Id: I9943134c7fb672226cbde52e35ef78f74f060ed0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92756
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index 368b7a23668b..b77663c59eb3 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -41,7 +41,8 @@ diff -ur nss.org/nspr/configure nss/nspr/configure
 diff -ur nss.org/nss/Makefile nss/nss/Makefile
 --- nss.org/nss/Makefile	2017-09-07 15:29:44.933245745 +0200
 +++ nss/nss/Makefile	2017-09-07 15:32:04.347181076 +0200
-@@ -62,6 +62,6 @@
+@@ -62,7 +62,7 @@
+ 
  ifeq ($(OS_TARGET),Android)
  NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \
 -                       --target=$(ANDROID_PREFIX) \


More information about the Libreoffice-commits mailing list