rediffed patches

diff --git a/firefox-prefs.patch b/firefox-prefs.patch
index 60115b680d42b97d6f1745d2898b2d423fb4a5c2..ff5f13f6277e511e88d3bf0ce5062ef1cd2b516c 100644 (file)
--- 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 4276fe9db2a1ca6ff814d5f0ea197154969f14fd..680536a641dfe8428da6ebcf1e8d9fe2f5a6d733 100644 (file)
--- 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):