[tor-commits] [tor-messenger-build/master] Add a patch to fix Windows cross compilation

[boklm at torproject.org]

commit 26dc4ebbf58948ba96b652838a9953a854043810
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Sep 30 12:47:06 2015 +0200

    Add a patch to fix Windows cross compilation
---
 ...xed-WinIMEHandler.cpp-cross-compilatio.mozpatch |   27 ++++++++++++++++++++
 projects/instantbird/config                        |    2 ++
 2 files changed, 29 insertions(+)

diff --git a/projects/instantbird/0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch b/projects/instantbird/0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch
new file mode 100644
index 0000000..bbdd3da
--- /dev/null
+++ b/projects/instantbird/0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch
@@ -0,0 +1,27 @@
+From 1ee7581cb435262227c66290c3269a064db1d33c Mon Sep 17 00:00:00 2001
+From: Jacek Caban <jacek at codeweavers.com>
+Date: Thu, 13 Aug 2015 17:37:57 +0200
+Subject: [PATCH] Bug 1192248 - Fixed WinIMEHandler.cpp cross compilation.
+ r=masayuki
+
+---
+ widget/windows/WinIMEHandler.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/widget/windows/WinIMEHandler.cpp b/widget/windows/WinIMEHandler.cpp
+index 28b4f5a704f7..365146fb175a 100644
+--- a/widget/windows/WinIMEHandler.cpp
++++ b/widget/windows/WinIMEHandler.cpp
+@@ -18,9 +18,9 @@
+ #include "WinUtils.h"
+ 
+ #include "shellapi.h"
+-#include "Shlobj.h"
+-#include "PowrProf.h"
+-#include "Setupapi.h"
++#include "shlobj.h"
++#include "powrprof.h"
++#include "setupapi.h"
+ #include "cfgmgr32.h"
+ 
+ const char* kOskPathPrefName = "ui.osk.on_screen_keyboard_path";
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 6467620..cf4274f 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -118,6 +118,8 @@ input_files:
     enable: '[% c("var/windows") %]'
   - filename: 0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch
     enable: '[% c("var/windows") %]'
+  - filename: 0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch
+    enable: '[% c("var/windows") %]'
   - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
   - filename: block-plugins.mozpatch
   - filename: OSX-package-as-tar.bz2.mozpatch