[tor-commits] [tor-messenger-build/master] Add patch to fix gecko-dev build with mingw-w64

[boklm at torproject.org]

commit 26ce394f58ec33f1b488f6215cb6980f2d1b9a4c
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Apr 24 13:06:14 2015 +0200

    Add patch to fix gecko-dev build with mingw-w64
---
 projects/instantbird/config                        |    2 ++
 .../fix-versionhelpers.h-include.mozpatch          |   36 ++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 5e88e3f..e4e3816 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -74,6 +74,8 @@ input_files:
   - filename: branding/default48.png
   - filename: fix-mingw-build.patch
     enable: '[% c("var/windows") %]'
+  - filename: fix-versionhelpers.h-include.mozpatch
+    enable: '[% c("var/windows") %]'
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig
   - name: python
diff --git a/projects/instantbird/fix-versionhelpers.h-include.mozpatch b/projects/instantbird/fix-versionhelpers.h-include.mozpatch
new file mode 100644
index 0000000..860db81
--- /dev/null
+++ b/projects/instantbird/fix-versionhelpers.h-include.mozpatch
@@ -0,0 +1,36 @@
+From cba17f0febd0978adf15d4a6cf21b4fbcb979884 Mon Sep 17 00:00:00 2001
+From: Nicolas Vigier <boklm at mars-attacks.org>
+Date: Fri, 24 Apr 2015 12:20:57 +0200
+Subject: [PATCH] Fix versionhelpers.h include
+
+---
+ media/gmp-clearkey/0.1/ClearKeySessionManager.cpp | 2 +-
+ media/gmp-clearkey/0.1/WMFUtils.cpp               | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp b/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
+index 1a9b96bb26ae..1cf9f351a1d0 100644
+--- a/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
++++ b/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
+@@ -26,7 +26,7 @@
+ #include "gmp-task-utils.h"
+ #if defined(ENABLE_WMF)
+ #include "WMFUtils.h"
+-#include <VersionHelpers.h>
++#include <versionhelpers.h>
+ #endif
+ 
+ #include <assert.h>
+diff --git a/media/gmp-clearkey/0.1/WMFUtils.cpp b/media/gmp-clearkey/0.1/WMFUtils.cpp
+index 6f2204a99223..afa651973375 100644
+--- a/media/gmp-clearkey/0.1/WMFUtils.cpp
++++ b/media/gmp-clearkey/0.1/WMFUtils.cpp
+@@ -16,7 +16,7 @@
+ 
+ #include "WMFUtils.h"
+ #include "ClearKeyUtils.h"
+-#include <VersionHelpers.h>
++#include <versionhelpers.h>
+ 
+ #include <stdio.h>
+