[tor-commits] [tor-messenger-build/master] Remove unnecessary windows fixes

[arlo@xxxxxxxxxxxxxx]

commit fe0cbe5e8f436701fa8aa20d0817ccd61d7ba434
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Mon Mar 28 12:24:22 2016 -0700

    Remove unnecessary windows fixes
---
 projects/instantbird/config                     |  4 ----
 projects/instantbird/fix-mingw-build.patch      | 20 --------------------
 projects/instantbird/gmploader-sandbox.mozpatch | 12 ------------
 3 files changed, 36 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index a38dd2c..eaa334c 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -103,12 +103,8 @@ input_files:
     enable: '[% c("var/osx") %]'
   - filename: cert_override.txt
     enable: '[% c("var/osx") %]'
-  - filename: fix-mingw-build.patch
-    enable: '[% c("var/windows") %]'
   - filename: trac-18290.mozpatch
     enable: '[% c("var/windows") %]'
-  - filename: gmploader-sandbox.mozpatch
-    enable: '[% c("var/windows") %]'
   - filename: bug-1240589.mozpatch
     enable: '[% c("var/windows") %]'
   - filename: bug-1167248.mozpatch
diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch
deleted file mode 100644
index 3f03c5b..0000000
--- a/projects/instantbird/fix-mingw-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
---- a/im/installer/package-manifest.in
-+++ b/im/installer/package-manifest.in
-@@ -104,6 +104,8 @@
- #endif
- 
- #endif # MOZ_ANGLE_RENDERER
-+
-+#ifdef USE_ICU
- #ifndef MOZ_NATIVE_ICU
- #ifdef MOZ_SHARED_ICU
- #ifdef XP_WIN
-@@ -121,6 +123,7 @@
- #endif
- #endif
- #endif
-+#endif
- 
- @RESPATH@/components/PACGenerator.js
- @RESPATH@/components/PACGenerator.manifest
diff --git a/projects/instantbird/gmploader-sandbox.mozpatch b/projects/instantbird/gmploader-sandbox.mozpatch
deleted file mode 100644
index 5940a6f..0000000
--- a/projects/instantbird/gmploader-sandbox.mozpatch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/dom/media/gmp/GMPLoader.cpp b/dom/media/gmp/GMPLoader.cpp
---- a/dom/media/gmp/GMPLoader.cpp
-+++ b/dom/media/gmp/GMPLoader.cpp
-@@ -242,7 +242,7 @@
- 
-   // Load the GMP.
-   PRLibSpec libSpec;
--#ifdef XP_WIN
-+#if defined(XP_WIN) && defined(MOZ_SANDBOX)
-   int pathLen = MultiByteToWideChar(CP_UTF8, 0, aUTF8LibPath, -1, nullptr, 0);
-   if (pathLen == 0) {
-     return false;

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