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

[Mark Hung]

 external/nss/UnpackedTarball_nss.mk |    2 ++
 external/nss/nss.utf8bom.patch.1    |   30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

New commits:
commit 7605d173988e8df19830bfe4e0d00e745f09d9a0
Author: Mark Hung <marklh9 at gmail.com>
Date:   Thu Mar 31 21:46:48 2016 +0800

    Allow NSS to build under cp950 in windows.
    
    Change-Id: I4a5ef736ad714dd3b1beb4054e2347973db70e39
    Reviewed-on: https://gerrit.libreoffice.org/23704
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index a553fcf..8e5e00b 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 		external/nss/nss.vs2015.pdb.patch) \
     $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
         external/nss/nss-winXP-sdk.patch.1) \
+	$(if $(filter WNTMSC,$(OS)$(COM)), \
+    	external/nss/nss.utf8bom.patch.1) \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/nss/nss.utf8bom.patch.1 b/external/nss/nss.utf8bom.patch.1
new file mode 100644
index 0000000..bc37f18
--- /dev/null
+++ b/external/nss/nss.utf8bom.patch.1
@@ -0,0 +1,30 @@
+diff -ur nss.org/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h nss/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h
+--- nss.org/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h	2016-03-31 18:26:06.763009800 +0800
++++ nss/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h	2016-03-31 19:17:11.724452000 +0800
+@@ -1,4 +1,4 @@
+-// Copyright 2005, Google Inc.
++// Copyright 2005, Google Inc.
+ // All rights reserved.
+ //
+ // Redistribution and use in source and binary forms, with or without
+diff -ur nss.org/nss/lib/ckfw/builtins/certdata.perl nss/nss/lib/ckfw/builtins/certdata.perl
+--- nss.org/nss/lib/ckfw/builtins/certdata.perl	2016-03-31 18:26:07.890190900 +0800
++++ nss/nss/lib/ckfw/builtins/certdata.perl	2016-03-31 19:16:16.727269600 +0800
+@@ -110,6 +110,9 @@
+ sub doprint {
+ my $i;
+ 
++print chr(0xEF);
++print chr(0xBB);
++print chr(0xBF);
+ print <<EOD
+ /* THIS IS A GENERATED FILE */
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+@@ -119,6 +122,7 @@
+ #ifndef BUILTINS_H
+ #include "builtins.h"
+ #endif /* BUILTINS_H */
++#pragma execution_character_set("utf-8")
+ 
+ EOD
+     ;