summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/firefox/files')
-rw-r--r--www-client/firefox/files/bug_1461221.patch36
-rw-r--r--www-client/firefox/files/firefox-60.0-blessings-TERM.patch56
-rw-r--r--www-client/firefox/files/gentoo-default-prefs.js-217
-rw-r--r--www-client/firefox/files/gentoo-hwaccel-prefs.js-12
-rw-r--r--www-client/firefox/files/icon/firefox.desktop9
5 files changed, 0 insertions, 120 deletions
diff --git a/www-client/firefox/files/bug_1461221.patch b/www-client/firefox/files/bug_1461221.patch
deleted file mode 100644
index 8ffa42c3..00000000
--- a/www-client/firefox/files/bug_1461221.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# HG changeset patch
-# User Gregory Szorc <gps@mozilla.com>
-# Date 1526410966 25200
-# Node ID e4ce7b97291627f2186dc23be0dadd3c56dfe938
-# Parent f288a2c9c4390898a17ad9f964218b52b87d8028
-Bug 1461221 - Account for psutil.disk_io_counters() returning None; r=mshal
-
-Apparently it can do this.
-
-MozReview-Commit-ID: 6gMTGtcRAw6
-
-diff --git a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
---- a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
-+++ b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
-@@ -60,16 +60,19 @@ except Exception:
- psutil = None
-
- have_psutil = False
-
-
- def get_disk_io_counters():
- try:
- io_counters = psutil.disk_io_counters()
-+
-+ if io_counters is None:
-+ return PsutilStub().disk_io_counters()
- except RuntimeError:
- io_counters = PsutilStub().disk_io_counters()
-
- return io_counters
-
-
- def _collect(pipe, poll_interval):
- """Collects system metrics.
-
diff --git a/www-client/firefox/files/firefox-60.0-blessings-TERM.patch b/www-client/firefox/files/firefox-60.0-blessings-TERM.patch
deleted file mode 100644
index 3d024a47..00000000
--- a/www-client/firefox/files/firefox-60.0-blessings-TERM.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://github.com/erikrose/blessings/pull/137
-
-Fixes: https://bugs.gentoo.org/654316
-
-From 5fefc65c306cf9ec492e7b422d6bb4842385afbc Mon Sep 17 00:00:00 2001
-From: Jay Kamat <jaygkamat@gmail.com>
-Date: Fri, 24 Aug 2018 11:11:57 -0700
-Subject: [PATCH 1/2] Fix error when TERM is unset or improperly set
-
----
- blessings/__init__.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/blessings/__init__.py b/blessings/__init__.py
-index 98b75c3..3872b5f 100644
---- a/third_party/python/blessings/blessings/__init__.py
-+++ b/third_party/python/blessings/blessings/__init__.py
-@@ -94,8 +94,13 @@ def __init__(self, kind=None, stream=None, force_styling=False):
- # init sequences to the stream if it has a file descriptor, and
- # send them to stdout as a fallback, since they have to go
- # somewhere.
-- setupterm(kind or environ.get('TERM', 'unknown'),
-- self._init_descriptor)
-+ try:
-+ setupterm(kind or environ.get('TERM', 'dumb') or 'dumb',
-+ self._init_descriptor)
-+ except:
-+ # There was an error setting up the terminal, either curses is
-+ # not supported or TERM is incorrectly set. Fall back to dumb.
-+ self._does_styling = False
-
- self.stream = stream
-
-
-From d885df78c6f931abf3259343aaaa897e16c8cba1 Mon Sep 17 00:00:00 2001
-From: Jay Kamat <jaygkamat@gmail.com>
-Date: Sat, 1 Sep 2018 13:20:32 -0700
-Subject: [PATCH 2/2] Explicitly catch curses.error
-
----
- blessings/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/blessings/__init__.py b/blessings/__init__.py
-index 3872b5f..fdceb09 100644
---- a/third_party/python/blessings/blessings/__init__.py
-+++ b/third_party/python/blessings/blessings/__init__.py
-@@ -97,7 +97,7 @@ def __init__(self, kind=None, stream=None, force_styling=False):
- try:
- setupterm(kind or environ.get('TERM', 'dumb'),
- self._init_descriptor)
-- except:
-+ except curses.error:
- # There was an error setting up the terminal, either curses is
- # not supported or TERM is incorrectly set. Fall back to dumb.
- self._does_styling = False
diff --git a/www-client/firefox/files/gentoo-default-prefs.js-2 b/www-client/firefox/files/gentoo-default-prefs.js-2
deleted file mode 100644
index ffd0d7dc..00000000
--- a/www-client/firefox/files/gentoo-default-prefs.js-2
+++ /dev/null
@@ -1,17 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.display.use_system_colors", true);
-pref("browser.link.open_external", 3);
-pref("general.smoothScroll", true);
-pref("general.autoScroll", false);
-pref("browser.tabs.tabMinWidth", 15);
-pref("browser.backspace_action", 0);
-pref("browser.urlbar.hideGoButton", true);
-pref("accessibility.typeaheadfind", true);
-pref("browser.shell.checkDefaultBrowser", false);
-pref("browser.EULA.override", true);
-pref("general.useragent.vendor", "Gentoo");
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("intl.locale.requested", "");
-pref("extensions.autoDisableScopes", 0);
-pref("layout.css.dpi", 0);
diff --git a/www-client/firefox/files/gentoo-hwaccel-prefs.js-1 b/www-client/firefox/files/gentoo-hwaccel-prefs.js-1
deleted file mode 100644
index 0cb92b04..00000000
--- a/www-client/firefox/files/gentoo-hwaccel-prefs.js-1
+++ /dev/null
@@ -1,2 +0,0 @@
-pref("layers.acceleration.force-enabled", true);
-pref("webgl.force-enabled", true);
diff --git a/www-client/firefox/files/icon/firefox.desktop b/www-client/firefox/files/icon/firefox.desktop
deleted file mode 100644
index d772c2fe..00000000
--- a/www-client/firefox/files/icon/firefox.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=@NAME@
-Comment=Web Browser
-Exec=firefox %u
-Icon=@ICON@
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-Categories=Network;WebBrowser;