[tor-commits] [tor-messenger-build/master] Add patch for bug 1240589

[arlo@xxxxxxxxxxxxxx]

commit bc375d734f8395e7e4d842a26a5e0d57b2a0a98c
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Thu Mar 24 15:50:16 2016 -0700

    Add patch for bug 1240589
---
 projects/instantbird/bug-1240589.mozpatch | 22 ++++++++++++++++++++++
 projects/instantbird/config               |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/projects/instantbird/bug-1240589.mozpatch b/projects/instantbird/bug-1240589.mozpatch
new file mode 100644
index 0000000..0c52b02
--- /dev/null
+++ b/projects/instantbird/bug-1240589.mozpatch
@@ -0,0 +1,22 @@
+From 9e4a3887ed69bccc6186ef8765dfab690239f5fa Mon Sep 17 00:00:00 2001
+From: Jacek Caban <jacek@xxxxxxxxxxxxxxx>
+Date: Sat, 30 Jan 2016 17:31:37 +0100
+Subject: [PATCH] Bug 1240589 - Cross compilation fixup.
+
+---
+ ipc/chromium/src/base/rand_util_win.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ipc/chromium/src/base/rand_util_win.cc b/ipc/chromium/src/base/rand_util_win.cc
+index 2a4fb29..d998cb6 100644
+--- a/ipc/chromium/src/base/rand_util_win.cc
++++ b/ipc/chromium/src/base/rand_util_win.cc
+@@ -11,7 +11,7 @@
+ // "Community Additions" comment on MSDN here:
+ // http://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx
+ #define SystemFunction036 NTAPI SystemFunction036
+-#include <NTSecAPI.h>
++#include <ntsecapi.h>
+ #undef SystemFunction036
+ 
+ #include <algorithm>
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 547cebd..df73d5a 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -107,6 +107,8 @@ input_files:
     enable: '[% c("var/windows") %]'
   - filename: gmploader-sandbox.mozpatch
     enable: '[% c("var/windows") %]'
+  - filename: bug-1240589.mozpatch
+    enable: '[% c("var/windows") %]'
   - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
   - filename: trac-16475.mozpatch
   - filename: OSX-package-as-tar.bz2.mozpatch

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits