From d111a3ea77dc760ae008f964681b9b33503ec5b4 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 18 Sep 2019 17:23:28 -0700
Subject: Sync with upstream

---
 PKGBUILD  | 4 ++--
 vendor.js | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index ed1f857..5147edd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=firefox
 pkgname=${_pkgname}-preferences-basic
-pkgver=20190910
+pkgver=20190918
 pkgrel=1
 pkgdesc="Vendor.js for Firefox (Basic)"
 arch=(x86_64)
@@ -17,7 +17,7 @@ makedepends=()
 conflicts=(firefox-preferences)
 provides=(firefox-preferences)
 source=(vendor.js)
-sha512sums=('eecb5673c9cc6780f543848a1f4ff778a68bbd4563a0008627a613c323fa7f326685695e26ddecf3ca4b13c0917ee16e90bf5b26fda84ef11d103bdf4e65a42b')
+sha512sums=('4bdd46992836d778c360821371ee1855296a0c7e6772c888579928fe017c049b27acd1e20f7bc320781e39b6e986c2a3d25ba5260217a22e1de3fce61c08f30a')
 
 package() {
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
diff --git a/vendor.js b/vendor.js
index 1447e14..05bb21b 100644
--- a/vendor.js
+++ b/vendor.js
@@ -257,7 +257,6 @@ pref("dom.performance.enable_timing_logging", false);
 //pref("dom.popup_allowed_events", "change click dblclick auxclick mouseup pointerup notificationclick reset submit touchend contextmenu");
 //pref("dom.popup_allowed_events", "click dblclick");  //Conflict
 pref("dom.push.enabled", false);
-pref("dom.push.serverURL", "");
 pref("dom.push.userAgentID", "");
 pref("dom.securecontext.whitelist_onions", true);
 //pref("dom.serviceWorkers.enabled", false);
@@ -291,7 +290,6 @@ pref("extensions.formautofill.creditCards.enabled", false);  //Conflict
 //pref("extensions.formautofill.heuristics.enabled", true);
 pref("extensions.formautofill.heuristics.enabled", false);  //Conflict
 pref("extensions.getAddons.cache.enabled", false);
-pref("extensions.getAddons.discovery.api_url", "");  //Added in Firefox 68
 pref("extensions.getAddons.getWithPerformance.url", "");
 pref("extensions.getAddons.recommended.url", "");
 pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
@@ -299,7 +297,6 @@ pref("extensions.getAddons.showPane", false);
 //pref("extensions.getAddons.themes.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes/?src=firefox");
 pref("extensions.getAddons.themes.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");  //Conflict
 pref("extensions.hotfix.id", "");
-pref("extensions.htmlaboutaddons.discover.enabled", false);  //Added in Firefox 68
 pref("extensions.htmlaboutaddons.enabled", false);
 pref("extensions.htmlaboutaddons.inline-options.enabled", false);
 pref("extensions.htmlaboutaddons.recommendations.enabled", false);
@@ -322,8 +319,6 @@ pref("extensions.update.enabled", true);
 //pref("extensions.update.enabled", false);  //Conflict
 pref("extensions.webcompat-reporter.enabled", false);
 pref("extensions.webextensions.restrictedDomains", "");
-//pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-pref("extensions.webservice.discoverURL", "");  //Conflict
 
 //pref("full-screen-api.warning.timeout", 3000);
 pref("full-screen-api.warning.timeout", 0); //Conflict
-- 
cgit v1.2.1