Added Windows build patches from TorBrowser

3 files changed, 106 insertions, 0 deletions

diff --git a/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch b/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
new file mode 100644
index 0000000..e8cc3a6
--- /dev/null
+++ b/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
@@ -0,0 +1,42 @@
+From 3f33df4d9a338ae4af9ab438d050eb08a52eb029 Mon Sep 17 00:00:00 2001
+From: Jacek Caban <jacek@codeweavers.com>
+Date: Mon, 23 Feb 2015 12:14:49 +0100
+Subject: [PATCH 1/3] Bug 1133689 - Make D3DVsyncDisplay destructor private.
+ r=jmuizelaar
+
+
+diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
+index b52a188..23507ce 100644
+
+Index: gfx/thebes/gfxWindowsPlatform.cpp
+===================================================================
+--- a/gfx/thebes/gfxWindowsPlatform.cpp
++++ b/gfx/thebes/gfxWindowsPlatform.cpp
+@@ -1990,13 +1990,6 @@ public:
+         mSoftwareVsyncRate = TimeDuration::FromMilliseconds(rate);
+       }
+ 
+-      virtual ~D3DVsyncDisplay()
+-      {
+-        MOZ_ASSERT(NS_IsMainThread());
+-        DisableVsync();
+-        delete mVsyncThread;
+-      }
+-
+       virtual void EnableVsync() override
+       {
+         MOZ_ASSERT(NS_IsMainThread());
+@@ -2099,6 +2092,13 @@ public:
+       }
+ 
+     private:
++      virtual ~D3DVsyncDisplay()
++      {
++        MOZ_ASSERT(NS_IsMainThread());
++        DisableVsync();
++        delete mVsyncThread;
++      }
++
+       bool IsInVsyncThread()
+       {
+         return mVsyncThread->thread_id() == PlatformThread::CurrentId();
diff --git a/data/patches/0001-Don-t-package-things-we-don-t-build.patch b/data/patches/0001-Don-t-package-things-we-don-t-build.patch
new file mode 100644
index 0000000..3398a7d
--- /dev/null
+++ b/data/patches/0001-Don-t-package-things-we-don-t-build.patch
@@ -0,0 +1,42 @@
+From 486e4777f375f1ac036e06430059bcac5a45b5d6 Mon Sep 17 00:00:00 2001
+From: Georg Koppen <gk@torproject.org>
+Date: Wed, 27 May 2015 07:55:59 +0000
+Subject: [PATCH] Don't package things we don't build
+
+We are not building the uninstall helper.exe for Windows (#9387) and
+omit ICU on Windows as well (#13419). We avoid packaging the respective
+binaries then as not doing this breaks our builds.
+
+diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+index 6b15f02..1d9ab5b 100644
+
+Index: browser/installer/package-manifest.in
+===================================================================
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -54,9 +54,9 @@
+ @RESPATH@/hyphenation/*
+ @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
+ @RESPATH@/browser/searchplugins/*
+-#ifdef XP_WIN32
+-@BINPATH@/uninstall/helper.exe
+-#endif
++;#ifdef XP_WIN32
++;@BINPATH@/uninstall/helper.exe
++;#endif
+ #ifdef MOZ_UPDATER
+ @RESPATH@/update.locale
+ @RESPATH@/updater.ini
+@@ -111,9 +111,9 @@
+ #ifndef MOZ_NATIVE_ICU
+ #ifdef MOZ_SHARED_ICU
+ #ifdef XP_WIN
+-@BINPATH@/icudt@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
+-@BINPATH@/icuin@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
+-@BINPATH@/icuuc@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
++;@BINPATH@/icudt@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
++;@BINPATH@/icuin@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
++;@BINPATH@/icuuc@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
+ #elif defined(XP_MACOSX)
+ @BINPATH@/libicudata.@MOZ_ICU_VERSION@.dylib
+ @BINPATH@/libicui18n.@MOZ_ICU_VERSION@.dylib
diff --git a/data/patches/0002-bug-1183967-fixup-correct-case-of-mfidl.h.patch b/data/patches/0002-bug-1183967-fixup-correct-case-of-mfidl.h.patch
new file mode 100644
index 0000000..352c185
--- /dev/null
+++ b/data/patches/0002-bug-1183967-fixup-correct-case-of-mfidl.h.patch
@@ -0,0 +1,22 @@
+From 7b6be41fce3486aa5b0deee676bd9d2242692476 Mon Sep 17 00:00:00 2001
+From: Trevor Saunders <tbsaunde@tbsaunde.org>
+Date: Fri, 20 Mar 2015 15:18:26 -0400
+Subject: [PATCH 2/3] bug 1183967 - fixup correct case of mfidl.h
+
+
+diff --git a/gfx/layers/IMFYCbCrImage.h b/gfx/layers/IMFYCbCrImage.h
+index 5d863b4..6a5d392 100644
+
+Index: gfx/layers/IMFYCbCrImage.h
+===================================================================
+--- a/gfx/layers/IMFYCbCrImage.h
++++ b/gfx/layers/IMFYCbCrImage.h
+@@ -8,7 +8,7 @@
+ 
+ #include "mozilla/RefPtr.h"
+ #include "ImageContainer.h"
+-#include "Mfidl.h"
++#include "mfidl.h"
+ 
+ namespace mozilla {
+ namespace layers {