From 9dc024d6f55699f3fa71b018466462313d5e353f Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 22 Oct 2019 15:58:01 -0700
Subject: Sync with upstream

---
 PKGBUILD  | 6 +++---
 vendor.js | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 48d7da3..1733d12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 _pkgname=firefox
 pkgname=${_pkgname}-preferences-basic
-pkgver=20190918
-pkgrel=2
+pkgver=20191022
+pkgrel=1
 pkgdesc="Vendor.js for Firefox (Basic)"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -17,7 +17,7 @@ makedepends=()
 conflicts=(firefox-preferences)
 provides=(firefox-preferences)
 source=(vendor.js)
-sha512sums=('591de9790941b8697deafeb52694e675692d8a072345576740b9262fa399bc6be4d63bf9bb1b10c37547bbce924bb3e44a83060db32756d5d1b1254255217ca6')
+sha512sums=('a76da2c6d95ed31d241f457d868eb2c853bac94fab84beee3280bf88cb2fc6722044d4944ec30e4245355c434afd9354d3839b5f1b3d397a7e707d68bc11a9b2')
 
 package() {
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
diff --git a/vendor.js b/vendor.js
index 20a6fcd..4f8a534 100644
--- a/vendor.js
+++ b/vendor.js
@@ -152,8 +152,6 @@ pref("browser.search.update", false);
 pref("browser.send_pings", false);
 //pref("browser.send_pings.require_same_host", false);
 pref("browser.send_pings.require_same_host", true);  //Conflict
-//pref("browser.sessionhistory.max_entries", 50);
-//pref("browser.sessionhistory.max_entries", 10);  //Conflict
 //pref("browser.sessionstore.privacy_level", 2);
 //pref("browser.sessionstore.resume_from_crash", true);
 //pref("browser.sessionstore.resume_from_crash", false);  //Conflict
@@ -334,6 +332,7 @@ pref("geo.wifi.uri", "");
 pref("gfx.downloadable_fonts.fallback_delay", -1);
 pref("gfx.font_rendering.graphite.enabled", false);
 pref("gfx.font_rendering.opentype_svg.enabled", false);
+pref("gfx.downloadable_fonts.woff2.enabled", false); //Removed in 69
 
 pref("identity.fxaccounts.enabled", false);
 //pref("identity.fxaccounts.auth.uri", "identity.fxaccounts.auth.uri");
@@ -351,8 +350,7 @@ pref("identity.sync.tokenserver.uri", "");  //Conflict
 
 pref("intl.accept_languages", "en-US, en");
 pref("intl.charset.default", "windows-1252");
-pref("intl.locale.requested", "en-US");
-pref("intl.regional_prefs.use_os_locales", false);
+pref("intl.charset.fallback.override", "windows-1252");
 
 pref("javascript.options.asmjs", false);
 pref("javascript.options.baselinejit", false);
@@ -375,6 +373,7 @@ pref("lightweightThemes.recommendedThemes", "");  //Conflict
 pref("mathml.disabled", true);
 
 pref("media.audio_data.enabled", false);
+pref("media.autoplay.allow-muted", false);  //Removed in 69
 //pref("media.autoplay.default", 0);
 pref("media.autoplay.default", 5);  //Conflict
 pref("media.autoplay.enabled", false);
@@ -519,6 +518,8 @@ pref("plugin.expose_full_path", false);
 //pref("plugin.state.flash", 1);
 pref("plugin.state.flash", 0);  //Conflict
 
+pref("plugins.click_to_play", true);  //Removed in 69
+
 //pref("privacy.clearOnShutdown.cache", true);
 //pref("privacy.clearOnShutdown.cookies", true);
 //pref("privacy.clearOnShutdown.cookies", false); //Conflict
-- 
cgit v1.2.1