[tor-commits] [tor-messenger-build/master] instantbird: remove fix-versionhelpers.h-include.mozpatch

[boklm at torproject.org]

commit 4d716d9c2e81bf386f2a1a95ab293d0517c1b206
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Apr 30 17:44:05 2015 +0200

    instantbird: remove fix-versionhelpers.h-include.mozpatch
    
    Patch applied upstream.
---
 projects/instantbird/config                        |    2 --
 .../fix-versionhelpers.h-include.mozpatch          |   36 --------------------
 2 files changed, 38 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index c9593c9..4fd4585 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -77,8 +77,6 @@ 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
deleted file mode 100644
index 860db81..0000000
--- a/projects/instantbird/fix-versionhelpers.h-include.mozpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-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>
-