From e96738dd12e9611dff6a1d5aabd2060ce4273ded Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 26 Aug 2014 15:40:25 +0200
Subject: Update to Firefox 31 build 1

---
 .gitignore                  |  2 ++
 firefox-enable-addons.patch | 26 +++++++++++++-------------
 firefox.spec                | 11 +++++++----
 sources                     |  4 ++--
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b7c568..f769464 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,3 +104,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-30.0-20140604.tar.xz
 /firefox-31.0.source.tar.bz2
 /firefox-langpacks-31.0-20140717.tar.xz
+/firefox-32.0.source.tar.bz2
+/firefox-langpacks-32.0-20140826.tar.xz
diff --git a/firefox-enable-addons.patch b/firefox-enable-addons.patch
index e97b5ca..228201a 100644
--- a/firefox-enable-addons.patch
+++ b/firefox-enable-addons.patch
@@ -1,6 +1,6 @@
-diff -up firefox-29.0/mozilla-release/browser/app/profile/firefox.js.addons firefox-29.0/mozilla-release/browser/app/profile/firefox.js
---- firefox-29.0/mozilla-release/browser/app/profile/firefox.js.addons	2014-04-22 07:27:34.000000000 +0200
-+++ firefox-29.0/mozilla-release/browser/app/profile/firefox.js	2014-04-22 15:49:04.953173027 +0200
+diff -up mozilla-release/browser/app/profile/firefox.js.addons mozilla-release/browser/app/profile/firefox.js
+--- mozilla-release/browser/app/profile/firefox.js.addons	2014-08-26 05:37:44.000000000 +0200
++++ mozilla-release/browser/app/profile/firefox.js	2014-08-26 15:20:52.114149955 +0200
 @@ -65,7 +65,8 @@ pref("extensions.hotfix.certs.1.sha1Fing
  
  // Disable add-ons that are not installed by the user in all scopes by default.
@@ -11,17 +11,17 @@ diff -up firefox-29.0/mozilla-release/browser/app/profile/firefox.js.addons fire
  
  // Dictionary download preference
  pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-diff -up firefox-29.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-29.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm
---- firefox-29.0/mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons	2014-04-22 15:49:04.955173021 +0200
-+++ firefox-29.0/mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2014-04-22 15:50:34.711891888 +0200
-@@ -2051,8 +2051,8 @@ var XPIProvider = {
-         this.showUpgradeUI();
-         flushCaches = true;
-       }
--      else if (aAppChanged === undefined) {
+diff -up mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+--- mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons	2014-08-26 15:20:52.115149958 +0200
++++ mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2014-08-26 15:29:16.229670636 +0200
+@@ -1888,8 +1888,8 @@ this.XPIProvider = {
+       // Changes to installed extensions may have changed which theme is selected
+       this.applyThemeChange();
+ 
+-      if (aAppChanged === undefined) {
 -        // For new profiles we will never need to show the add-on selection UI
-+      else {
++      if (true) {
 +        // For all profiles we will never need to show the add-on selection UI
          Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
        }
- 
+       else if (aAppChanged && !this.allAppGlobal &&
diff --git a/firefox.spec b/firefox.spec
index f5c2f71..4750b41 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -86,14 +86,14 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        31.0
-Release:        4%{?pre_tag}%{?dist}
+Version:        32.0
+Release:        1%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20140717.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20140826.tar.xz
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -226,7 +226,7 @@ cd %{tarballdir}
 
 # Fedora patches
 %patch204 -p1 -b .966424
-%patch215 -p2 -b .addons
+%patch215 -p1 -b .addons
 %patch216 -p1 -b .duckduckgo
 
 # Upstream patches
@@ -634,6 +634,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Aug 26 2014 Martin Stransky <stransky@redhat.com> - 32.0-1
+- Update to 32.0 build 1
+
 * Tue Aug 26 2014 David Tardon <dtardon@redhat.com> - 31.0-4
 - rebuild for ICU 53.1
 
diff --git a/sources b/sources
index bea202f..936479d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-499b70a9f08a2291d528e87eaf8804a3  firefox-31.0.source.tar.bz2
-7f3f262bfcc71340fcec6c6f63834309  firefox-langpacks-31.0-20140717.tar.xz
+859d0b6fe2d36b6959cf08cee4c783cc  firefox-32.0.source.tar.bz2
+1e88e089eba26ddd53026479e686c45b  firefox-langpacks-32.0-20140826.tar.xz
-- 
cgit