From 3386a6f438c7549e2ff5ca88498f27af40cf72e1 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Mon, 21 Nov 2016 15:05:02 -0500 Subject: Removed unnecesary upstreamed patches --- ...-Make-D3DVsyncDisplay-destructor-private..patch | 42 ---- .../0001-Don-t-package-things-we-don-t-build.patch | 42 ---- ...bug-1183967-fixup-correct-case-of-mfidl.h.patch | 22 -- ...-warn-of-preinstalled-unsigned-extensions.patch | 29 +++ data/patches/enable-js-options.patch | 268 --------------------- data/patches/gnuzilla-bug-1172632-1.patch | 43 ---- data/patches/gnuzilla-bug-1172632-2.patch | 223 ----------------- 7 files changed, 29 insertions(+), 640 deletions(-) delete mode 100644 data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch delete mode 100644 data/patches/0001-Don-t-package-things-we-don-t-build.patch delete mode 100644 data/patches/0002-bug-1183967-fixup-correct-case-of-mfidl.h.patch create mode 100644 data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch delete mode 100644 data/patches/enable-js-options.patch delete mode 100644 data/patches/gnuzilla-bug-1172632-1.patch delete mode 100644 data/patches/gnuzilla-bug-1172632-2.patch (limited to 'data') diff --git a/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch b/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch deleted file mode 100644 index e8cc3a6..0000000 --- a/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3f33df4d9a338ae4af9ab438d050eb08a52eb029 Mon Sep 17 00:00:00 2001 -From: Jacek Caban -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 deleted file mode 100644 index 3398a7d..0000000 --- a/data/patches/0001-Don-t-package-things-we-don-t-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 486e4777f375f1ac036e06430059bcac5a45b5d6 Mon Sep 17 00:00:00 2001 -From: Georg Koppen -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 deleted file mode 100644 index 352c185..0000000 --- a/data/patches/0002-bug-1183967-fixup-correct-case-of-mfidl.h.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7b6be41fce3486aa5b0deee676bd9d2242692476 Mon Sep 17 00:00:00 2001 -From: Trevor Saunders -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 { diff --git a/data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch b/data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch new file mode 100644 index 0000000..c4f5c77 --- /dev/null +++ b/data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch @@ -0,0 +1,29 @@ +Only in firefox-45.3.0esr: do-not-warn-of-preinstalled-unsigned-extensions.patch +diff -ru firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.js firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.js +--- firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.js 2016-05-12 13:10:05.000000000 -0400 ++++ firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.js 2016-08-28 18:24:46.897231960 -0400 +@@ -3204,7 +3204,9 @@ + [this._addon.name, gStrings.brandShortName, gStrings.appVersion], 3 + ); + document.getElementById("detail-warning-link").hidden = true; +- } else if (!isCorrectlySigned(this._addon)) { ++ } else if (!isCorrectlySigned(this._addon && ["abouticecat@gnu.org", ++ "html5-video-everywhere@lejenome.me", "https-everywhere-eff@eff.org", ++ "jid1-KtlZuoiikVfFew@jetpack", "spyblock@gnu.org"].indexOf(this._addon.id) < 0)) { + this.node.setAttribute("notification", "warning"); + document.getElementById("detail-warning").textContent = gStrings.ext.formatStringFromName( + "details.notification.unsigned", [this._addon.name, gStrings.brandShortName], 2 +diff -ru firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.xml firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.xml +--- firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.xml 2016-05-12 13:10:05.000000000 -0400 ++++ firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.xml 2016-08-28 18:28:09.241231936 -0400 +@@ -1255,7 +1255,9 @@ + ); + this._warningLink.hidden = true; + this._warningBtn.hidden = true; +- } else if (!isUpgrade && !isCorrectlySigned(this.mAddon)) { ++ } else if (!isUpgrade && !isCorrectlySigned(this.mAddon) && ["abouticecat@gnu.org", ++ "html5-video-everywhere@lejenome.me", "https-everywhere-eff@eff.org", ++ "jid1-KtlZuoiikVfFew@jetpack", "spyblock@gnu.org"].indexOf(this.mAddon.id) < 0) { + this.setAttribute("notification", "warning"); + this._warning.textContent = gStrings.ext.formatStringFromName( + "notification.unsigned", [this.mAddon.name, gStrings.brandShortName], 2 diff --git a/data/patches/enable-js-options.patch b/data/patches/enable-js-options.patch deleted file mode 100644 index aa2869e..0000000 --- a/data/patches/enable-js-options.patch +++ /dev/null @@ -1,268 +0,0 @@ -# revert https://bug851702.bugzilla.mozilla.org/attachment.cgi?id=733785 - -# HG changeset patch -# User Gijs Kruitbosch -# Date 1365155574 -7200 -# Node ID 444b9baa31d6065d37edbd61a2dcb892c989e0e2 -# Parent 99121d529b47ec285d61f64988335e60ac120cf7 -Bug 851702 - Remove JS load and advanced preferences from the UI - ---- b/browser/components/preferences/content.xul -+++ a/browser/components/preferences/content.xul -@@ -25,8 +25,13 @@ - - - -- -+ - -+ -+ -+ - - - - - -+ -+ -+ -+ -+ -+