[tor-commits] [tor-messenger-build/master] Patch for adding MOZ_SANDBOX flag to GMPLoader.h

[sukhbir at torproject.org]

commit c7bf42c58ff28204eed1418dc670c2249976da2b
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sun Oct 11 19:17:25 2015 -0400

    Patch for adding MOZ_SANDBOX flag to GMPLoader.h
    
    From https://github.com/Alexpux/MINGW-packages (patch by Ray Donnelly)
---
 projects/instantbird/config                     |    2 ++
 projects/instantbird/gmploader-sandbox.mozpatch |   12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 8a45142..7eae10e 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -114,6 +114,8 @@ input_files:
     enable: '[% c("var/windows") %]'
   - filename: bug-1176731-do-not-mark-static-inline-functions.mozpatch
     enable: '[% c("var/windows") %]'
+  - filename: gmploader-sandbox.mozpatch
+    enable: '[% c("var/windows") %]'
   - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch
     enable: '[% c("var/windows") %]'
   - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch
diff --git a/projects/instantbird/gmploader-sandbox.mozpatch b/projects/instantbird/gmploader-sandbox.mozpatch
new file mode 100644
index 0000000..a9d167c
--- /dev/null
+++ b/projects/instantbird/gmploader-sandbox.mozpatch
@@ -0,0 +1,12 @@
+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
+@@ -227,7 +227,7 @@
+ 
+   // Load the GMP.
+   PRLibSpec libSpec;
+-#ifdef XP_WIN
++#if defined(XP_WIN) && defined(MOZ_SANDBOX)
+   libSpec.value.pathname_u = widePath;
+   libSpec.type = PR_LibSpec_PathnameU;
+ #else