# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1465315137 -7200
# Node ID 20bd16d68ed2f918e3bf9b19271da2d2c5465822
# Parent  9f3ecc7dc9e35717228d6f485de9e95ddd477df4
46.0.1

diff -r 9f3ecc7dc9e3 -r 20bd16d68ed2 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Wed May 04 12:21:34 2016 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue Jun 07 17:58:57 2016 +0200
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+Wed May  4 10:27:43 UTC 2016 - wr@rosenauer.org
+
+- update to Firefox 46.0.1
+  Fixed:
+  * Search plugin issue for various locales
+  * Add-on signing certificate expiration
+  * Service worker update issue
+  * Build issue when jit is disabled
+  * Limit Sync registration updates
+- removed now obsolete mozilla-jit_branch64.patch
+
+-------------------------------------------------------------------
 Tue May  3 15:47:18 UTC 2016 - normand@linux.vnet.ibm.com
 
 - add mozilla-jit_branch64.patch to avoid PowerPC build failure
diff -r 9f3ecc7dc9e3 -r 20bd16d68ed2 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed May 04 12:21:34 2016 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Jun 07 17:58:57 2016 +0200
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 46
-%define mainver %major.0
+%define mainver %major.0.1
 %define update_channel release
-%define releasedate 2016042500
+%define releasedate 2016050300
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
@@ -169,7 +169,6 @@
 Patch12:        mozilla-reduce-files-per-UnifiedBindings.patch
 Patch13:        mozilla-gtk3_20.patch
 Patch14:        mozilla-check_return.patch
-Patch15:        mozilla-jit_branch64.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-no-default-ualocale.patch
@@ -284,7 +283,6 @@
 %patch13 -p1
 %endif
 %patch14 -p1
-%patch15 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
diff -r 9f3ecc7dc9e3 -r 20bd16d68ed2 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Wed May 04 12:21:34 2016 +0200
+++ b/MozillaFirefox/create-tar.sh	Tue Jun 07 17:58:57 2016 +0200
@@ -7,8 +7,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="078baf501b55eaa47f3b189fda4dd28dae1fa257"
-VERSION="46.0"
+RELEASE_TAG="FIREFOX_46_0_1_RELEASE"
+VERSION="46.0.1"
 
 # mozilla
 if [ -d mozilla ]; then
diff -r 9f3ecc7dc9e3 -r 20bd16d68ed2 MozillaFirefox/l10n_changesets.txt
--- a/MozillaFirefox/l10n_changesets.txt	Wed May 04 12:21:34 2016 +0200
+++ b/MozillaFirefox/l10n_changesets.txt	Tue Jun 07 17:58:57 2016 +0200
@@ -46,8 +46,8 @@
 id cb8f841d30d2
 is 46c99105eb3b
 it 6063a6d94e13
-ja 590a31fbf396
-ja-JP-mac 260664b702c5
+ja 5ff86cadfe9a
+ja-JP-mac ab760b3dcdd1
 kk 5a7bd05bf942
 km 339790840ac1
 kn b23d8fbcf41a
diff -r 9f3ecc7dc9e3 -r 20bd16d68ed2 MozillaFirefox/mozilla-jit_branch64.patch
--- a/MozillaFirefox/mozilla-jit_branch64.patch	Wed May 04 12:21:34 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-jit_branch64.patch
\ No newline at end of file
diff -r 9f3ecc7dc9e3 -r 20bd16d68ed2 mozilla-jit_branch64.patch
--- a/mozilla-jit_branch64.patch	Wed May 04 12:21:34 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-From: Michel Normand <normand@linux.vnet.ibm.com>
-Subject: mozilla add branch64
-Date: Tue, 03 May 2016 17:42:54 +0200
-References:
-https://bugzilla.mozilla.org/show_bug.cgi?id=1266366
-
-mozilla add branch64 in MacroAssembler-none.h
-already upstream as tracked by
-https://www.mail-archive.com/freebsd-gecko@freebsd.org/msg05462.html
-
-Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
----
- js/src/jit/none/MacroAssembler-none.h |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: mozilla/js/src/jit/none/MacroAssembler-none.h
-===================================================================
---- mozilla.orig/js/src/jit/none/MacroAssembler-none.h
-+++ mozilla/js/src/jit/none/MacroAssembler-none.h
-@@ -255,6 +255,8 @@ class MacroAssemblerNone : public Assemb
-     template <typename T, typename S> void branchPrivatePtr(Condition, T, S, Label*) { MOZ_CRASH(); }
-     template <typename T, typename S> void decBranchPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
-     template <typename T, typename S> void branchTest64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
-+    template <typename T, typename S> void branch64(Condition, T, S, Label*) { MOZ_CRASH(); }
-+    template <typename T, typename S> void branch64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
-     template <typename T, typename S> void mov(T, S) { MOZ_CRASH(); }
-     template <typename T, typename S> void movq(T, S) { MOZ_CRASH(); }
-     template <typename T, typename S> void movePtr(T, S) { MOZ_CRASH(); }
diff -r 9f3ecc7dc9e3 -r 20bd16d68ed2 series
--- a/series	Wed May 04 12:21:34 2016 +0200
+++ b/series	Tue Jun 07 17:58:57 2016 +0200
@@ -14,7 +14,6 @@
 mozilla-reduce-files-per-UnifiedBindings.patch
 mozilla-gtk3_20.patch
 mozilla-check_return.patch
-mozilla-jit_branch64.patch
 
 # Firefox patches
 firefox-kde.patch