Synced with upstream

2 files changed, 2 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 27d431a..6837699 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=firefox
 pkgname=${_pkgname}-preferences-basic
-pkgver=20190715
+pkgver=20190717
 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=('c7f746815ae0a47947a3247b124737e888d533eb300bf49151aaa17850a3a6d19cd080d191d62fa0bc2da8ebf765a29bee64ee218edd04a690e5e3c3bc6c84b6')
+sha512sums=('7d2c6cf38d9d61d79e82b034ae2a6df36c498835b5f5ff05514532ca69db1fe6e52b969794102b26d5127959fb4d7703a178ed03b38737fdbbd7827d988be73a')
 
 package() {
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
diff --git a/vendor.js b/vendor.js
index 27f9c1a..5c00134 100644
--- a/vendor.js
+++ b/vendor.js
@@ -31,8 +31,6 @@ pref("beacon.enabled", false);  //Conflict
 //pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/");
 pref("breakpad.reportURL", "");  //Conflict
 
-//pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
-pref("browser.aboutHomeSnippets.updateUrl", "");  //Conflict
 pref("browser.backspace_action", 2);
 //pref("browser.cache.disk.enable", false);
 //pref("browser.cache.disk_cache_ssl", true);
@@ -81,7 +79,6 @@ pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "");
 pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
 pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
 pref("browser.newtabpage.activity-stream.default.sites", "");
-pref("browser.newtabpage.activity-stream.disableSnippets", true);
 pref("browser.newtabpage.activity-stream.discoverystream.config", "");  //Conflict
 pref("browser.newtabpage.activity-stream.feeds.aboutpreferences", false);
 pref("browser.newtabpage.activity-stream.feeds.asrouterfeed", false);
@@ -381,8 +378,6 @@ pref("layout.css.visited_links_enabled", false);  //Conflict
 
 //pref("lightweightThemes.recommendedThemes", "[{"id":"recommended-1","homepageURL":"https://addons.mozilla.org/firefox/addon/a-web-browser-renaissance/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/1.header.jpg","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/1.footer.jpg","textcolor":"#000000","accentcolor":"#f2d9b1","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/1.icon.jpg","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/1.preview.jpg","author":"Sean.Martell","version":"0"},{"id":"recommended-2","homepageURL":"https://addons.mozilla.org/firefox/addon/space-fantasy/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/2.header.jpg","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/2.footer.jpg","textcolor":"#ffffff","accentcolor":"#d9d9d9","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/2.icon.jpg","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/2.preview.jpg","author":"fx5800p","version":"1.0"},{"id":"recommended-3","homepageURL":"https://addons.mozilla.org/firefox/addon/linen-light/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/3.header.png","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/3.footer.png","accentcolor":"#ada8a8","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/3.icon.png","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/3.preview.png","author":"DVemer","version":"1.0"},{"id":"recommended-4","homepageURL":"https://addons.mozilla.org/firefox/addon/pastel-gradient/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/4.header.png","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/4.footer.png","textcolor":"#000000","accentcolor":"#000000","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/4.icon.png","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/4.preview.png","author":"darrinhenein","version":"1.0"},{"id":"recommended-5","homepageURL":"https://addons.mozilla.org/firefox/addon/carbon-light/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/5.header.png","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/5.footer.png","textcolor":"#3b3b3b","accentcolor":"#2e2e2e","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/5.icon.jpg","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/5.preview.jpg","author":"Jaxivo","version":"1.0"}]");
 pref("lightweightThemes.recommendedThemes", "");  //Conflict
-//pref("lightweightThemes.update.enabled", true);
-pref("lightweightThemes.update.enabled", false);  //Conflict
 
 pref("mathml.disabled", true);
 
@@ -594,8 +589,6 @@ pref("reader.parse-on-load.enabled", false);  //Conflict
 pref("security.certerrors.recordEventTelemetry", false);
 pref("security.cert_pinning.enforcement_level", 2);
 pref("security.csp.enable", true);
-//pref("security.csp.experimentalEnabled", false);
-pref("security.csp.experimentalEnabled", true); //Conflict
 pref("security.dialog_enable_delay", 1000);
 pref("security.enterprise_roots.enabled", false);
 pref("security.family_safety.mode", 0);