From ca256f4a750c57dbf5b063e4b6df0d40ac9a989b Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Jun 08 2017 12:11:23 +0000
Subject: Fixed build patches


---

diff --git a/firefox-enable-addons.patch b/firefox-enable-addons.patch
index 3653db1..653f19e 100644
--- a/firefox-enable-addons.patch
+++ b/firefox-enable-addons.patch
@@ -1,7 +1,7 @@
-diff -up firefox-53.0/browser/app/profile/firefox.js.addons firefox-53.0/browser/app/profile/firefox.js
---- firefox-53.0/browser/app/profile/firefox.js.addons	2017-04-18 10:03:02.300234728 +0200
-+++ firefox-53.0/browser/app/profile/firefox.js	2017-04-18 10:05:38.170676613 +0200
-@@ -63,7 +63,8 @@ pref("extensions.systemAddon.update.url"
+diff -up firefox-54.0/browser/app/profile/firefox.js.addons firefox-54.0/browser/app/profile/firefox.js
+--- firefox-54.0/browser/app/profile/firefox.js.addons	2017-06-08 13:59:20.504220317 +0200
++++ firefox-54.0/browser/app/profile/firefox.js	2017-06-08 14:01:54.388653599 +0200
+@@ -66,7 +66,8 @@ pref("extensions.screenshots.system-disa
  
  // Disable add-ons that are not installed by the user in all scopes by default.
  // See the SCOPE constants in AddonManager.jsm for values to use here.
@@ -9,5 +9,5 @@ diff -up firefox-53.0/browser/app/profile/firefox.js.addons firefox-53.0/browser
 +pref("extensions.autoDisableScopes", 0);
 +pref("extensions.showMismatchUI", false);
  
- // Whether or not webextension themes are supported.
- pref("extensions.webextensions.themes.enabled", false);
+ // Add-on content security policies.
+ pref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;");
diff --git a/firefox.spec b/firefox.spec
index e836c8b..068c36c 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -13,7 +13,7 @@
 %endif
 
 # Use system sqlite?
-%if 0%{?fedora} > 25
+%if 0%{?fedora} > 27
 %define system_sqlite     1
 %else
 %define system_sqlite     0
@@ -141,7 +141,6 @@ Patch224:        mozilla-1170092.patch
 Patch225:        mozilla-1005640-accept-lang.patch
 #ARM run-time patch
 Patch226:        rhbz-1354671.patch
-Patch227:        rhbz-1400293-fix-mozilla-1324096.patch
 Patch229:        firefox-nss-version.patch
 Patch230:        mozilla-rust-config.patch
 
@@ -299,13 +298,12 @@ This package contains results of tests executed during build.
 
 
 %patch18 -p1 -b .jemalloc-ppc
-%patch19 -p2 -b .s390-inlines
+#%patch19 -p2 -b .s390-inlines
 %patch20 -p1 -b .prbool
 %ifarch s390
 %patch25 -p1 -b .rhbz-1219542-s390
 %endif
-%patch27 -p1 -b .1335250
-%patch28 -p2 -b .1360521-missing-cheddar
+#%patch28 -p2 -b .1360521-missing-cheddar
 %patch29 -p1 -b .big-endian
 
 %patch3  -p1 -b .arm
@@ -323,18 +321,13 @@ This package contains results of tests executed during build.
 %ifarch aarch64
 %patch226 -p1 -b .1354671
 %endif
-%patch227 -p1 -b .rh1400293
-%patch229 -p1 -b .nss-version
 %patch230 -p1 -b .rust
 
 %patch304 -p1 -b .1253216
 %patch402 -p1 -b .1196777
 %patch406 -p1 -b .256180
-%patch407 -p1 -b .1348576
 %patch408 -p1 -b .1158076-1
 %patch409 -p1 -b .1158076-2
-%patch410 -p1 -b .1321521
-%patch411 -p1 -b .1321521-2
 %ifarch %{arm}
 %if 0%{?fedora} < 26
 # Workaround for mozbz#1337988