[tor-commits] [tor-messenger-build/master] Add patch to fix instantbird build with mingw

[boklm at torproject.org]

commit 0d92193bbc30bd90d50777ad7b8e93ece5a8917f
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Nov 24 17:21:27 2014 +0100

    Add patch to fix instantbird build with mingw
---
 projects/instantbird/config                |    2 +
 projects/instantbird/fix-mingw-build.patch |   71 ++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index e7c8b61..41e2522 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -64,6 +64,8 @@ input_files:
   - filename: prepare-messages-for-displaying.patch
   - filename: fix-mingw-build.nsprpatch
     enable: '[% c("var/windows") %]'
+  - filename: fix-mingw-build.patch
+    enable: '[% c("var/windows") %]'
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig
   - name: python
diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch
new file mode 100644
index 0000000..7eefc39
--- /dev/null
+++ b/projects/instantbird/fix-mingw-build.patch
@@ -0,0 +1,71 @@
+diff --git a/im/Makefile.in b/im/Makefile.in
+index 048ef94facc1..71d1a3409c79 100644
+--- a/im/Makefile.in
++++ b/im/Makefile.in
+@@ -12,7 +12,7 @@ include $(topsrcdir)/config/config.mk
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-ifeq ($(OS_ARCH),WINNT)
++ifdef MAKENSISU
+ # For Windows build the uninstaller during the application build since the
+ # uninstaller is included with the application for mar file generation.
+ libs::
+diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
+index 12397ff741fc..27d581f53c97 100644
+--- a/im/installer/package-manifest.in
++++ b/im/installer/package-manifest.in
+@@ -52,7 +52,7 @@
+ @RESPATH@/searchplugins/*
+ @RESPATH@/dictionaries/*
+ @RESPATH@/hyphenation/*
+-#ifdef XP_WIN32
++#ifdef MAKENSISU
+ @BINPATH@/uninstall/helper.exe
+ #endif
+ #ifdef MOZ_UPDATER
+@@ -123,6 +123,8 @@
+ #endif
+ 
+ #endif # MOZ_ANGLE_RENDERER
++
++#ifdef USE_ICU
+ #ifndef MOZ_NATIVE_ICU
+ #ifdef MOZ_SHARED_ICU
+ #ifdef XP_WIN
+@@ -140,6 +142,7 @@
+ #endif
+ #endif
+ #endif
++#endif
+ 
+ ; Modules
+ @RESPATH@/modules/*
+@@ -585,6 +588,7 @@
+ @RESPATH@/components/pippki.xpt
+ 
+ ; For process sandboxing
++#if defined(MOZ_SANDBOX)
+ #if defined(XP_WIN)
+ @BINPATH@/@DLL_PREFIX at sandboxbroker@DLL_SUFFIX@
+ #elif defined(XP_LINUX)
+@@ -592,6 +596,7 @@
+ @BINPATH@/@DLL_PREFIX at mozsandbox@DLL_SUFFIX@
+ #endif
+ #endif
++#endif
+ 
+ ; for Solaris SPARC
+ #ifdef SOLARIS
+diff --git a/im/moz.build b/im/moz.build
+index 0778269ffe22..528fb6e371e6 100644
+--- a/im/moz.build
++++ b/im/moz.build
+@@ -16,6 +16,6 @@ DIRS += [
+ # app is always last as it packages up the built files on mac.
+ DIRS += ['app']
+ 
+-if CONFIG['OS_ARCH'] == 'WINNT':
++if CONFIG['MAKENSISU']:
+     DIRS += ['installer/windows']
+