external/nss/UnpackedTarball_nss.mk | 2 ++
external/nss/nss-winXP-sdk.patch.1 | 9 +++++++++
2 files changed, 11 insertions(+)
New commits:
commit 74c4ae75c06068f8c208973636825603ca49a00e
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Tue Mar 15 15:09:45 2016 +0100
fix nss build when targeting windows XP (using 7.1A SDK)
otherwise build fails because of macro redefinitions warnings (that are
now fatal because of warnings=errors)
(cherry picked from commit 09e201fcf2813152335d50588dae0c38adc88d51)
Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7
Reviewed-on: https://gerrit.libreoffice.org/23272
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 803e809..f7409e1 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-ios.patch) \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
external/nss/nss.cygwin64.in32bit.patch) \
+ $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
+ external/nss/nss-winXP-sdk.patch.1) \
))
# nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss-winXP-sdk.patch.1
b/external/nss/nss-winXP-sdk.patch.1
new file mode 100644
index 0000000..2c81892
--- /dev/null
+++ b/external/nss/nss-winXP-sdk.patch.1
@@ -0,0 +1,9 @@
+diff -ur nss.org/nss/coreconf/config.mk nss/nss/coreconf/config.mk
+--- nss.org/nss/coreconf/config.mk 2016-03-15 14:52:19.706093300 +0100
++++ nss/nss/coreconf/config.mk 2016-03-15 14:56:51.549914800 +0100
+@@ -188,3 +188,5 @@
+
+ # Hide old, deprecated, TLS cipher suite names when building NSS
+ DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
++# build with 7.1A SDK for winXP compatibility
++DEFINES += -D_USING_V110_SDK71_
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
