Remove various font options

2 files changed, 7 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e4d5368..02b472e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -44,7 +44,7 @@ sha256sums=('1fe4cfe4f4afce8d5532da8f36a48c333750c90a6ee67167309357edf514c22a'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
             '821f858bac2e13ce02b8c20d5387d4ecc8ab2d0e4ebe0a517cbf935da6aeb31b'
-            '497bfc4acb29e000f4e1d580823c8e8dfaf3a9113473d7aa212238d86d59fbfb'
+            'd42f95c21466da1725ed035bf3addc9830fdeef8d2f71770256da1cc4b7f7ff2'
             'a8c15c9d54ef8b360c0932f4ccf5e74954f14e9a9c2a1ae924b6c392075b2b8c'
             'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e'
             '927e400d6920b98d2fe7db2b6498f195135909a76e0da49441223956364d8227')
diff --git a/vendor.js b/vendor.js
index be96c65..d46c587 100644
--- a/vendor.js
+++ b/vendor.js
@@ -33,8 +33,6 @@ 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.bookmarks.max_backups", 15);
-pref("browser.bookmarks.max_backups", 0);  //Conflict
 pref("browser.cache.disk.enable", false);
 //pref("browser.cache.disk_cache_ssl", true);
 pref("browser.cache.disk_cache_ssl", false);  //Conflict
@@ -50,8 +48,6 @@ 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);
 //pref("browser.download.forbid_open_with", false);
 pref("browser.download.forbid_open_with", true);  //Conflict
@@ -208,8 +204,6 @@ pref("browser.taskbar.previews.enable", false);
 //pref("browser.uitour.enabled", true);
 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.decodeURLsOnCopy", false);
 pref("browser.urlbar.decodeURLsOnCopy", true);  //Conflict
 pref("browser.urlbar.filter.javascript", true);
@@ -218,12 +212,6 @@ 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.history", true);
-//pref("browser.urlbar.suggest.history", false);  //Conflict
-//pref("browser.urlbar.suggest.openpage", true);
-//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);
@@ -235,9 +223,6 @@ pref("browser.urlbar.usepreloadedtopurls.enabled", false);
 pref("browser.xul.error_pages.expert_bad_cert", true);  //Conflict
 pref("browser.zoom.siteSpecific", false);
 
-//pref("canvas.capturestream.enabled", true);
-//pref("canvas.capturestream.enabled", false);  //Conflict
-
 //pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/success.txt");
 pref("captivedetect.canonicalURL", "");  //Conflict
 
@@ -298,7 +283,7 @@ pref("dom.ipc.plugins.reportCrashURL", false);  //Conflict
 pref("dom.mozTCPSocket.enabled", false);
 pref("dom.performance.enable_timing_logging", false);
 //pref("dom.popup_allowed_events", "change click dblclick mouseup pointerup notificationclick reset submit touchend");
-pref("dom.popup_allowed_events", "change click dblclick mouseup notificationclick reset submit touchend");  //Conflict
+pref("dom.popup_allowed_events", "click dblclick");  //Conflict
 //pref("dom.popup_maximum", 20);
 pref("dom.popup_maximum", 3);  //Conflict
 //pref("dom.push.connection.enabled", true);
@@ -406,9 +391,7 @@ pref("geo.wifi.uri", "");
 //pref("geo.wifi.xhr.timeout", 60000);
 pref("geo.wifi.xhr.timeout", 1);  //Conflict
 
-pref("gfx.downloadable_fonts.enabled", true);  //Use uBlock Origin to set per-site
 pref("gfx.downloadable_fonts.fallback_delay", -1);
-pref("gfx.downloadable_fonts.woff2.enabled", true);  //Use uBlock Origin to set per-site
 pref("gfx.font_rendering.graphite.enabled", false);
 pref("gfx.font_rendering.opentype_svg.enabled", false);
 pref("gfx.layerscope.enabled", false);
@@ -451,6 +434,7 @@ pref("keyword.enabled", false);  //Conflict
 
 //pref("layers.acceleration.disabled", false);
 //pref("layers.acceleration.disabled", true);  //Conflict
+//pref("layers.acceleration.force-enabled", true);
 
 pref("layout.css.font-loading-api.enabled", true);
 //pref("layout.css.visited_links_enabled", true);
@@ -470,8 +454,8 @@ pref("media.autoplay.default", 1);  //Conflict
 pref("media.autoplay.enabled.user-gestures-needed", false);
 pref("media.benchmark.vp9.threshold", 0);
 pref("media.block-autoplay-until-in-foreground", true);
-//pref("media.cache_size", 0);
-pref("media.cache_size", 512000);  //Conflict
+pref("media.cache_size", 0);
+//pref("media.cache_size", 512000);  //Conflict
 //pref("media.decoder-doctor.new-issue-endpoint", "https://webcompat.com/issues/new");
 pref("media.decoder-doctor.new-issue-endpoint", "");  //Conflict
 pref("media.eme.enabled", false);
@@ -704,8 +688,8 @@ pref("security.insecure_connection_text.enabled", true);  //Conflict
 pref("security.insecure_field_warning.contextual.enabled", true);
 pref("security.insecure_password.ui.enabled", true);
 pref("security.mixed_content.block_active_content", true);
-pref("security.mixed_content.block_display_content", false);
-//pref("security.mixed_content.block_display_content", true);  //Conflict
+//pref("security.mixed_content.block_display_content", false);
+pref("security.mixed_content.block_display_content", true);  //Conflict
 pref("security.mixed_content.block_object_subrequest", true);
 pref("security.nocertdb", true);
 //pref("security.OCSP.enabled", 1);