summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Horak <jhorak@redhat.com>2017-03-29 10:01:12 +0200
committerJan Horak <jhorak@redhat.com>2017-03-29 10:01:12 +0200
commit13f2d68eba6125726569a74cd64ad5e99d94d92a (patch)
tree1677d0704e87f92334acdcfa6cb2253c931c991c
parentMerge branch 'master' into f24 (diff)
parentUpdate to 52.0.2 (diff)
downloadlibrewolf-fedora-ff-13f2d68eba6125726569a74cd64ad5e99d94d92a.tar.gz
librewolf-fedora-ff-13f2d68eba6125726569a74cd64ad5e99d94d92a.tar.bz2
librewolf-fedora-ff-13f2d68eba6125726569a74cd64ad5e99d94d92a.zip
Merge branch 'master' into f24
-rw-r--r--.gitignore2
-rw-r--r--firefox.spec11
-rw-r--r--mozilla-1348168.patch88
-rw-r--r--sources4
4 files changed, 10 insertions, 95 deletions
diff --git a/.gitignore b/.gitignore
index df1803f..1b32ed8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -226,3 +226,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-51.0.1-20170126.tar.xz
/firefox-52.0.source.tar.xz
/firefox-langpacks-52.0-20170303.tar.xz
+/firefox-52.0.2.source.tar.xz
+/firefox-langpacks-52.0.2-20170329.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 38d5081..976a245 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -102,14 +102,14 @@
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 52.0
-Release: 7%{?pre_tag}%{?dist}
+Version: 52.0.2
+Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
-Source1: firefox-langpacks-%{version}%{?pre_version}-20170303.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20170329.tar.xz
%endif
Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js
@@ -153,7 +153,6 @@ Patch406: mozilla-256180.patch
# Rebase Gtk3 widget code to latest trunk to
# fix various rendering problems
Patch407: widget-rebase.patch
-Patch408: mozilla-1348168.patch
Patch409: mozilla-1158076.patch
# Debian patches
@@ -319,7 +318,6 @@ cd %{tarballdir}
# Rebase Gtk3 widget code to latest trunk to
# fix various rendering problems
%patch407 -p1 -b .widget-rebase
-%patch408 -p1 -b .1348168
# Disabled due to rhbz#1435964
#%patch409 -p1 -b .1158076
@@ -840,6 +838,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Mar 29 2017 Jan Horak <jhorak@redhat.com> - 52.0.2-1
+- Update to 52.0.2
+
* Mon Mar 27 2017 Martin Stransky <stransky@redhat.com> - 52.0-7
- Reverted mozbz#1158076 due to rhbz#1435964
diff --git a/mozilla-1348168.patch b/mozilla-1348168.patch
deleted file mode 100644
index e0627d2..0000000
--- a/mozilla-1348168.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-
-# HG changeset patch
-# User Ehsan Akhgari <ehsan@mozilla.com>
-# Date 1489719163 14400
-# Node ID 4af7cd795eeef3bce2dd40d5a6e92d21304eaea1
-# Parent dac467924a46c4bbff97c948bf4a7143dada2b19
-Bug 1348168 - Disable Mozilla custom ImageBitmap extensions that didn't go through proper API review; r=bzbarsky a=dveditz
-
-diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
---- a/dom/base/nsGlobalWindow.cpp
-+++ b/dom/base/nsGlobalWindow.cpp
-@@ -14993,16 +14993,20 @@ nsGlobalWindow::CreateImageBitmap(const
-
- already_AddRefed<mozilla::dom::Promise>
- nsGlobalWindow::CreateImageBitmap(const ImageBitmapSource& aImage,
- int32_t aOffset, int32_t aLength,
- ImageBitmapFormat aFormat,
- const Sequence<ChannelPixelLayout>& aLayout,
- ErrorResult& aRv)
- {
-+ if (!ImageBitmap::ExtensionsEnabled(nullptr, nullptr)) {
-+ aRv.Throw(NS_ERROR_TYPE_ERR);
-+ return nullptr;
-+ }
- if (aImage.IsArrayBuffer() || aImage.IsArrayBufferView()) {
- return ImageBitmap::Create(this, aImage, aOffset, aLength, aFormat, aLayout,
- aRv);
- } else {
- aRv.Throw(NS_ERROR_TYPE_ERR);
- return nullptr;
- }
- }
-diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
---- a/dom/workers/WorkerScope.cpp
-+++ b/dom/workers/WorkerScope.cpp
-@@ -471,16 +471,24 @@ WorkerGlobalScope::CreateImageBitmap(con
-
- already_AddRefed<mozilla::dom::Promise>
- WorkerGlobalScope::CreateImageBitmap(const ImageBitmapSource& aImage,
- int32_t aOffset, int32_t aLength,
- ImageBitmapFormat aFormat,
- const Sequence<ChannelPixelLayout>& aLayout,
- ErrorResult& aRv)
- {
-+ JSContext* cx = GetCurrentThreadJSContext();
-+ MOZ_ASSERT(cx);
-+
-+ if (!ImageBitmap::ExtensionsEnabled(cx, nullptr)) {
-+ aRv.Throw(NS_ERROR_TYPE_ERR);
-+ return nullptr;
-+ }
-+
- if (aImage.IsArrayBuffer() || aImage.IsArrayBufferView()) {
- return ImageBitmap::Create(this, aImage, aOffset, aLength, aFormat, aLayout,
- aRv);
- } else {
- aRv.Throw(NS_ERROR_TYPE_ERR);
- return nullptr;
- }
- }
-diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
---- a/modules/libpref/init/all.js
-+++ b/modules/libpref/init/all.js
-@@ -831,22 +831,18 @@ pref("ui.scrollToClick", 0);
- pref("canvas.focusring.enabled", true);
- pref("canvas.customfocusring.enabled", false);
- pref("canvas.hitregions.enabled", false);
- pref("canvas.filters.enabled", true);
- // Add support for canvas path objects
- pref("canvas.path.enabled", true);
- pref("canvas.capturestream.enabled", true);
-
--// Disable the ImageBitmap-extensions in the release build.
--#ifdef RELEASE_OR_BETA
-+// Disable the ImageBitmap-extensions for now.
- pref("canvas.imagebitmap_extensions.enabled", false);
--#else
--pref("canvas.imagebitmap_extensions.enabled", true);
--#endif
-
- // We want the ability to forcibly disable platform a11y, because
- // some non-a11y-related components attempt to bring it up. See bug
- // 538530 for details about Windows; we have a pref here that allows it
- // to be disabled for performance and testing resons.
- // See bug 761589 for the crossplatform aspect.
- //
- // This pref is checked only once, and the browser needs a restart to
-
diff --git a/sources b/sources
index 4e3de8e..0f2e0c2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (firefox-52.0.source.tar.xz) = bffe5fd9eee240f252bf8a882c46f04551d21f6f58b8da68779cd106ed012ea77ee16bc287c847f8a7b959203c79f1b1d3f50151111f9610e1ca7a57c7b811f7
-SHA512 (firefox-langpacks-52.0-20170303.tar.xz) = c542fae511f35ed837f4a556fe5fe6aba936af7b2f2ba3f59aee1efdf68f4c8c31e6a53fc6bb806e0256f6a2ae00a5b4f98935243edbee40928bc25d6057e681
+SHA512 (firefox-52.0.2.source.tar.xz) = 15668625d212acf874b560d0adf738faf3e0df532c549ab94e1d91944542e13bf16265f08fca1eded42820f9b7ad3f0ff70a8b5bc9adde0a79d11e022bb1158e
+SHA512 (firefox-langpacks-52.0.2-20170329.tar.xz) = 4c4b953e5f6aefa754a2a1d15273a46ab1028b14799e2adc949c7ecbd7041d80856221ed90ff179ceb1b39bc387765b1888ce614169ca482096eadf78d04e379
bgstack15