[tor-commits] [tor-messenger-build/master] Rebase instantbird/fix-mingw-build.patch

[boklm at torproject.org]

commit e92d953488f30fb5c22572750aac3c7f46a66303
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Nov 27 23:51:31 2014 +0100

    Rebase instantbird/fix-mingw-build.patch
---
 projects/instantbird/fix-mingw-build.patch |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch
index 683a3fb..7317ba1 100644
--- a/projects/instantbird/fix-mingw-build.patch
+++ b/projects/instantbird/fix-mingw-build.patch
@@ -30,7 +30,7 @@ index 2a7af7daf20f..6e3855d87f4d 100644
  ifdef MOZ_UPDATER
  DEFINES += -DMOZ_UPDATER=1
 diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
-index 12397ff741fc..27d581f53c97 100644
+index 0376e05c74a5..70c1a6ada34c 100644
 --- a/im/installer/package-manifest.in
 +++ b/im/installer/package-manifest.in
 @@ -52,7 +52,7 @@
@@ -59,22 +59,6 @@ index 12397ff741fc..27d581f53c97 100644
  
  ; 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