From 2472964dc174c8d187aa2ee20d8b272317556274 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 23 Feb 2021 22:10:56 +0100 Subject: [PATCH] rediffed patches --- firefox-prefs.patch | 12 ++++++------ firefox-system-virtualenv.patch | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firefox-prefs.patch b/firefox-prefs.patch index 60115b6..ff5f13f 100644 --- a/firefox-prefs.patch +++ b/firefox-prefs.patch @@ -17,7 +17,7 @@ + pref("app.update.auto", false); #endif - // If set to true, the Update Service will present no UI for any event. + // If set to true, the Update Service will apply updates in the background @@ -227,7 +227,7 @@ pref("browser.touchmode.auto", true); @@ -33,9 +33,9 @@ +pref("intl.locale.matchOS", true); + - // Scripts & Windows prefs - pref("dom.disable_open_during_load", true); - pref("javascript.options.showInConsole", true); + // Where new bookmarks go by default. + // Use PlacesUIUtils.defaultParentGuid to read this; do NOT read the pref + // directly. @@ -646,7 +648,7 @@ pref("mousewheel.with_control.action",3); pref("mousewheel.with_win.action", 1); @@ -54,5 +54,5 @@ -pref("layout.css.dpi", -1); +pref("layout.css.dpi", 0); - // Set the number of device pixels per CSS pixel. A value <= 0 means choose - // automatically based on user settings for the platform (e.g., "UI scale factor" + // pref for which side vertical scrollbars should be on + // 0 = end-side in UI direction diff --git a/firefox-system-virtualenv.patch b/firefox-system-virtualenv.patch index 4276fe9..680536a 100644 --- a/firefox-system-virtualenv.patch +++ b/firefox-system-virtualenv.patch @@ -8,6 +8,6 @@ - self.topsrcdir, "third_party", "python", "virtualenv", "virtualenv.py" - ) + return '/usr/bin/virtualenv-3' - - @property - def version_info(self): + + @property + def version_info(self): -- 2.43.0