commit d3b44d658ba849773562e64d36870e2536dc14d2 Author: Nicolas Vigier boklm@torproject.org Date: Sat Nov 22 15:02:21 2014 +0100

instantbird: remove fix-mingw-build.mozpatch

The mingw build issues have now been fixed upstream. --- projects/instantbird/config | 2 -- projects/instantbird/fix-mingw-build.mozpatch | 39 ------------------------- 2 files changed, 41 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config index c188103..075b115 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -63,8 +63,6 @@ input_files: - filename: picture.patch - filename: branding.patch - filename: prepare-messages-for-displaying.patch - - filename: fix-mingw-build.mozpatch - enable: '[% c("var/windows") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python diff --git a/projects/instantbird/fix-mingw-build.mozpatch b/projects/instantbird/fix-mingw-build.mozpatch deleted file mode 100644 index b44b1ff..0000000 --- a/projects/instantbird/fix-mingw-build.mozpatch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp -index 560ab8c2dae5..bd9718ef9582 100644 ---- a/dom/media/gmp/GMPChild.cpp -+++ b/dom/media/gmp/GMPChild.cpp -@@ -356,7 +356,7 @@ GMPChild::PreLoadLibraries(const std::string& aPluginPath) - infoFile->GetPath(path); - - std::ifstream stream; -- stream.open(path.get()); -+ stream.open(NS_ConvertUTF16toUTF8(path).get()); - if (!stream.good()) { - NS_WARNING("Failure opening info file for required DLLs"); - return false; -diff --git a/dom/media/gmp/rlz/base/memory/scoped_ptr.h b/dom/media/gmp/rlz/base/memory/scoped_ptr.h -index 47204742c0a3..c837e04b34f6 100644 ---- a/dom/media/gmp/rlz/base/memory/scoped_ptr.h -+++ b/dom/media/gmp/rlz/base/memory/scoped_ptr.h -@@ -18,7 +18,7 @@ public: - scoped_array(T* t) : nsAutoArrayPtr<T>(t) {} - void reset(T* t) { - scoped_array<T> other(t); -- operator=(other); -+ this->operator=(other); - } - }; - -diff --git a/dom/media/gmp/rlz/win/lib/machine_id_win.cc b/dom/media/gmp/rlz/win/lib/machine_id_win.cc -index 668910e5cd8c..fb5454274ec4 100644 ---- a/dom/media/gmp/rlz/win/lib/machine_id_win.cc -+++ b/dom/media/gmp/rlz/win/lib/machine_id_win.cc -@@ -3,7 +3,7 @@ - // found in the COPYING file. - - #include <windows.h> --#include <Sddl.h> // For ConvertSidToStringSidW. -+#include <sddl.h> // For ConvertSidToStringSidW. - #include <string> - - #include "base/memory/scoped_ptr.h"