Use $pkgname more | vendor.js updates for 65 | Remove some warning notices from builds

2 files changed, 23 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9972d72..888bfec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,15 +32,15 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'speech-dispatcher: Text-to-Speech'
             'hunspell-en_CA: Spell checking, Canadian English')
 options=(!emptydirs !makeflags)
-source=(firefox-$pkgver.tar.bz2::https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${bz2ver}_RELEASE.tar.bz2
-        $pkgname.desktop firefox-symbolic.svg
+source=($pkgname-$pkgver.tar.bz2::https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${bz2ver}_RELEASE.tar.bz2
+        $pkgname.desktop $pkgname-symbolic.svg
         vendor.js
         moz.configure.diff
         package-manifest.diff)
 sha256sums=('5f1f27aa004d94504993e18e2a96edebd0178c7da9f9c00474dda468bb876759'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
-            '5cc920b4f229af826a75b3234563174f2477be9b2aee585fd30a7389ef7be35d'
+            '1db31c55df4e45d9f0d2fafaa0a6ea8bc29bf9fb709d3937b1bb6c48b707e756'
             'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e'
             '927e400d6920b98d2fe7db2b6498f195135909a76e0da49441223956364d8227')
 
@@ -130,6 +130,13 @@ END
   # Remove @RESPATH@/browser/features/* to prevent system addons from being part of the output package.
   patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/installer/package-manifest.in $srcdir/package-manifest.diff
 
+  # Hide mobile promo
+  echo ".fxaMobilePromo {  display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css
+  # Hide plugindeprecation-notice
+  echo "#plugindeprecation-notice {  display: none !important; }" >> toolkit/mozapps/extensions/content/extensions.css
+  # Hide warnings on unsigned extensions
+  echo ".warning{display: none!important; } .addon[notification=warning]{background-image: none!important;}" >> toolkit/mozapps/extensions/content/extensions.css
+
 
 }
 
@@ -178,7 +185,7 @@ END
     "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png"
   install -Dm644 browser/branding/official/content/about-logo@2x.png \
     "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png"
-  install -Dm644 ../firefox-symbolic.svg \
+  install -Dm644 ../$pkgname-symbolic.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
 
   install -Dm644 ../$pkgname.desktop \
diff --git a/vendor.js b/vendor.js
index bec7fd0..dc62ce9 100644
--- a/vendor.js
+++ b/vendor.js
@@ -51,11 +51,13 @@ pref("browser.chrome.errorReporter.enabled", false);
 //pref("browser.chrome.errorReporter.submitUrl", "https://sentry.prod.mozaws.net/api/339/store/");
 pref("browser.chrome.errorReporter.submitUrl", "");  //Conflict
 //pref("browser.chrome.site_icons", false);  //Breaks favicons
-pref("browser.contentblocking.enabled", true);
+//pref("browser.contentblocking.category", "custom");  //Setting this will set the value to default for some reason
+pref("browser.contentblocking.introCount", 20);
 pref("browser.crashReports.unsubmittedCheck.autoSubmit2", false);
 pref("browser.crashReports.unsubmittedCheck.enabled", false);
 pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
 pref("browser.disableResetPrompt", true);
+pref("browser.discovery.enabled", false);
 //pref("browser.display.use_document_fonts", 1);
 pref("browser.display.use_document_fonts", 0);  //Conflict
 pref("browser.download.folderList", 1);
@@ -212,24 +214,21 @@ pref("browser.taskbar.previews.enable", false);
 pref("browser.uitour.enabled", false);  //Conflict
 pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
 //pref("browser.urlbar.autoFill", true);
-pref("browser.urlbar.autoFill", false);  //Conflict
-//pref("browser.urlbar.autocomplete.enabled", true);
-pref("browser.urlbar.autocomplete.enabled", false);  //Conflict
+//pref("browser.urlbar.autoFill", false);  //Conflict
 //pref("browser.urlbar.decodeURLsOnCopy", false);
 pref("browser.urlbar.decodeURLsOnCopy", true);  //Conflict
 pref("browser.urlbar.filter.javascript", true);
-pref("browser.urlbar.maxHistoricalSearchSuggestions", 0);
 //pref("browser.urlbar.oneOffSearches", true);
 pref("browser.urlbar.oneOffSearches", false);  //Conflict
 pref("browser.urlbar.searchSuggestionsChoice", false);
 //pref("browser.urlbar.speculativeConnect.enabled", true);
 pref("browser.urlbar.speculativeConnect.enabled", false);  //Conflict
 //pref("browser.urlbar.suggest.bookmark", true);
-pref("browser.urlbar.suggest.bookmark", false);  //Conflict
+//pref("browser.urlbar.suggest.bookmark", false);  //Conflict
 //pref("browser.urlbar.suggest.history", true);
-pref("browser.urlbar.suggest.history", false);  //Conflict
+//pref("browser.urlbar.suggest.history", false);  //Conflict
 //pref("browser.urlbar.suggest.openpage", true);
-pref("browser.urlbar.suggest.openpage", false);  //Conflict
+//pref("browser.urlbar.suggest.openpage", false);  //Conflict
 //pref("browser.urlbar.suggest.searches", true);
 pref("browser.urlbar.suggest.searches", false);  //Conflict
 //pref("browser.urlbar.trimURLs", true);
@@ -315,7 +314,9 @@ pref("dom.push.userAgentID", "");
 pref("dom.securecontext.whitelist_onions", true);
 pref("dom.serviceWorkers.enabled", false);
 pref("dom.storage.enabled", true);
+//pref("dom.storage_access.enabled", false);  //Broken as of 65
 pref("dom.storageManager.enabled", true);
+pref("dom.targetBlankNoOpener.enabled", true);
 //pref("dom.vibrator.enabled", true);
 pref("dom.vibrator.enabled", false);  //Conflict
 pref("dom.vr.enabled", false);
@@ -327,8 +328,6 @@ pref("dom.vr.openvr.enabled", false);
 pref("dom.vr.osvr.enabled", false);
 //pref("dom.vr.poseprediction.enabled", true);
 pref("dom.vr.poseprediction.enabled", false);  //Conflict
-//pref("dom.w3c_pointer_events.enabled", true);
-pref("dom.w3c_pointer_events.enabled", false);  //Conflict
 pref("dom.webaudio.enabled", false);
 //pref("dom.webnotifications.enabled", true);
 pref("dom.webnotifications.enabled", false);  //Conflict
@@ -402,6 +401,7 @@ pref("full-screen-api.warning.timeout", 0); //Conflict
 pref("general.warnOnAboutConfig", false);  //Conflict
 
 pref("geo.enabled", false);
+pref("geo.provider.use_gpsd", false);
 pref("geo.wifi.logging.enabled", false);
 pref("geo.wifi.uri", "");
 //pref("geo.wifi.xhr.timeout", 60000);
@@ -505,6 +505,7 @@ pref("middlemouse.contentLoadURL", false);
 pref("network.allow-experiments", false);  //Conflict
 pref("network.auth.subresource-http-auth-allow", 1);
 pref("network.captive-portal-service.enabled", false);
+pref("network.connectivity-service.enabled", false);
 //pref("network.cookie.cookieBehavior", 1);
 pref("network.cookie.cookieBehavior", 2);  //Conflict
 pref("network.cookie.leave-secure-alone", true);
@@ -556,6 +557,7 @@ pref("network.http.spdy.enabled.deps", false);  //Conflict
 //pref("network.http.spdy.enabled.http2", true);
 pref("network.http.spdy.enabled.http2", false);  //Conflict
 //pref("network.http.speculative-parallel-limit", 6);
+pref("network.http.spdy.websockets", false);
 pref("network.http.speculative-parallel-limit", 0);  //Conflict
 //pref("network.IDN_show_punycode", false);
 pref("network.IDN_show_punycode", true);   //Conflict