commit bee5c819340d1e630c6d36a616f7063dcc1e3f83 Author: Sukhbir Singh sukhbir@torproject.org Date: Mon Sep 28 03:31:40 2015 -0400
Remove patches merged upstream for Windows and OS X --- projects/instantbird/824009fbc42f.mozpatch | 20 ----- ...ckport-Make-D3DVsyncDisplay-destructor.mozpatch | 45 ---------- ...refox-app-menu-sometimes-contains-only.mozpatch | 20 ----- .../instantbird/f2e7cea9bc6a-bug-1150967.patch | 86 -------------------- 4 files changed, 171 deletions(-)
diff --git a/projects/instantbird/824009fbc42f.mozpatch b/projects/instantbird/824009fbc42f.mozpatch deleted file mode 100644 index bc2a61c..0000000 --- a/projects/instantbird/824009fbc42f.mozpatch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Trevor Saunders tbsaunde@tbsaunde.org -# Date 1426879106 14400 -# Fri Mar 20 15:18:26 2015 -0400 -# Node ID 824009fbc42fed138b9ff0b9d1ee44e8502773dd -# Parent 6ef7ca8f1db3f984dfa255ff6222edca6dc890d6 -bug 1183967 - fixup correct case of mfidl.h - -diff -r 6ef7ca8f1db3 -r 824009fbc42f gfx/layers/IMFYCbCrImage.h ---- a/gfx/layers/IMFYCbCrImage.h Mon Mar 16 14:30:41 2015 -0400 -+++ b/gfx/layers/IMFYCbCrImage.h Fri Mar 20 15:18:26 2015 -0400 -@@ -8,7 +8,7 @@ - - #include "mozilla/RefPtr.h" - #include "ImageContainer.h" --#include "Mfidl.h" -+#include "mfidl.h" - - namespace mozilla { - namespace layers { diff --git a/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch b/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch deleted file mode 100644 index 7e891c1..0000000 --- a/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch +++ /dev/null @@ -1,45 +0,0 @@ -From 6f443d4c93cee1df3ad645b06d1441df8c3706a3 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier boklm@torproject.org -Date: Fri, 22 May 2015 12:27:53 +0200 -Subject: [PATCH] Bug 1133689 (backport) - Make D3DVsyncDisplay destructor - private. - ---- - gfx/thebes/gfxWindowsPlatform.cpp | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp -index 37e6907fb3cb..5a7b18cc97da 100644 ---- a/gfx/thebes/gfxWindowsPlatform.cpp -+++ b/gfx/thebes/gfxWindowsPlatform.cpp -@@ -2001,13 +2001,6 @@ public: - mSoftwareVsyncRate = TimeDuration::FromMilliseconds(rate); - } - -- virtual ~D3DVsyncDisplay() -- { -- MOZ_ASSERT(NS_IsMainThread()); -- DisableVsync(); -- delete mVsyncThread; -- } -- - virtual void EnableVsync() override - { - MOZ_ASSERT(NS_IsMainThread()); -@@ -2110,6 +2103,13 @@ public: - } - - private: -+ virtual ~D3DVsyncDisplay() -+ { -+ MOZ_ASSERT(NS_IsMainThread()); -+ DisableVsync(); -+ delete mVsyncThread; -+ } -+ - bool IsInVsyncThread() - { - return mVsyncThread->thread_id() == PlatformThread::CurrentId(); --- -2.1.0 - diff --git a/projects/instantbird/Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch b/projects/instantbird/Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch deleted file mode 100644 index b8b798f..0000000 --- a/projects/instantbird/Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/widget/cocoa/nsAppShell.mm b/widget/cocoa/nsAppShell.mm -index 10e0f0e..c89cee9 100644 ---- a/widget/cocoa/nsAppShell.mm -+++ b/widget/cocoa/nsAppShell.mm -@@ -28,6 +28,7 @@ - #include "nsCocoaFeatures.h" - #include "nsCocoaUtils.h" - #include "nsChildView.h" -+#include "nsMenuBarX.h" - #include "nsToolkit.h" - #include "TextInputHandler.h" - #include "mozilla/HangMonitor.h" -@@ -647,6 +648,7 @@ nsAppShell::Run(void) - mStarted = true; - - AddScreenWakeLockListener(); -+ nsMenuBarX::ResetNativeApplicationMenu(); - - NS_OBJC_TRY_ABORT([NSApp run]); - diff --git a/projects/instantbird/f2e7cea9bc6a-bug-1150967.patch b/projects/instantbird/f2e7cea9bc6a-bug-1150967.patch deleted file mode 100644 index 223019c..0000000 --- a/projects/instantbird/f2e7cea9bc6a-bug-1150967.patch +++ /dev/null @@ -1,86 +0,0 @@ -# HG changeset patch -# User Sebastian Hengst archaeopteryx@coole-files.de -# Date 1428083489 -7200 -# Fri Apr 03 19:51:29 2015 +0200 -# Node ID f2e7cea9bc6aca3140fb49512d4cc16f85988540 -# Parent 1cc7a71a04355c949421c3789386c48af37f5f3b -Bug 1150967 - Port Bug 1147839 - Fix building installer on mingw by only including helper.exe if mknsisu is used. r=clokep,mkmelin,Neil a=Ratty for SeaMonkey CLOSED TREE - -diff -r 1cc7a71a0435 -r f2e7cea9bc6a im/installer/Makefile.in ---- a/im/installer/Makefile.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/im/installer/Makefile.in Fri Apr 03 19:51:29 2015 +0200 -@@ -93,6 +93,10 @@ - DEFINES += -DMOZ_PURPLE - endif - -+ifdef MAKENSISU -+DEFINES += -DHAVE_MAKENSISU=1 -+endif -+ - ifdef MOZ_PKG_MANIFEST_P - MOZ_PKG_MANIFEST = package-manifest - -diff -r 1cc7a71a0435 -r f2e7cea9bc6a im/installer/package-manifest.in ---- a/im/installer/package-manifest.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/im/installer/package-manifest.in Fri Apr 03 19:51:29 2015 +0200 -@@ -52,7 +52,7 @@ - @RESPATH@/searchplugins/* - @RESPATH@/dictionaries/* - @RESPATH@/hyphenation/* --#ifdef XP_WIN32 -+#ifdef HAVE_MAKENSISU - @BINPATH@/uninstall/helper.exe - #endif - #ifdef MOZ_UPDATER -diff -r 1cc7a71a0435 -r f2e7cea9bc6a mail/installer/Makefile.in ---- a/mail/installer/Makefile.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/mail/installer/Makefile.in Fri Apr 03 19:51:29 2015 +0200 -@@ -87,6 +87,10 @@ - DEFINES += -DMOZ_SHARED_MOZGLUE=1 - endif - -+ifdef MAKENSISU -+DEFINES += -DHAVE_MAKENSISU=1 -+endif -+ - ifdef MOZ_PKG_MANIFEST_P - MOZ_PKG_MANIFEST = package-manifest - -diff -r 1cc7a71a0435 -r f2e7cea9bc6a mail/installer/package-manifest.in ---- a/mail/installer/package-manifest.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/mail/installer/package-manifest.in Fri Apr 03 19:51:29 2015 +0200 -@@ -53,7 +53,7 @@ - @RESPATH@/searchplugins/* - @RESPATH@/dictionaries/* - @RESPATH@/hyphenation/* --#ifdef XP_WIN32 -+#ifdef HAVE_MAKENSISU - @BINPATH@/uninstall/helper.exe - #endif - #ifdef MOZ_UPDATER -diff -r 1cc7a71a0435 -r f2e7cea9bc6a suite/installer/Makefile.in ---- a/suite/installer/Makefile.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/suite/installer/Makefile.in Fri Apr 03 19:51:29 2015 +0200 -@@ -121,6 +121,10 @@ - - DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) - -+ifdef MAKENSISU -+DEFINES += -DHAVE_MAKENSISU=1 -+endif -+ - ifdef MOZ_PKG_MANIFEST_P - MOZ_PKG_MANIFEST = package-manifest - -diff -r 1cc7a71a0435 -r f2e7cea9bc6a suite/installer/package-manifest.in ---- a/suite/installer/package-manifest.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/suite/installer/package-manifest.in Fri Apr 03 19:51:29 2015 +0200 -@@ -54,7 +54,7 @@ - @RESPATH@/hyphenation/* - @RESPATH@/@PREF_DIR@/suite-l10n.js - @RESPATH@/searchplugins/* --#ifdef XP_WIN32 -+#ifdef HAVE_MAKENSISU - @BINPATH@/uninstall/helper.exe - #endif - #ifdef MOZ_UPDATER