| 1 |
commit: fcb9929d3ef6dea97679b0468592155142d970c1 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 28 21:40:28 2018 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 28 21:41:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb9929d |
| 7 |
|
| 8 |
www-client/firefox: Fix bug #656182, remove ffmpeg4 patch already landed |
| 9 |
on esr branch |
| 10 |
|
| 11 |
www-client/firefox/files/bug_1461221.patch | 36 ++++++++++++++++++++++++++++++ |
| 12 |
www-client/firefox/firefox-60.1.0.ebuild | 3 +++ |
| 13 |
www-client/firefox/firefox-61.0.ebuild | 2 ++ |
| 14 |
3 files changed, 41 insertions(+) |
| 15 |
|
| 16 |
diff --git a/www-client/firefox/files/bug_1461221.patch b/www-client/firefox/files/bug_1461221.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..8ffa42c3eaf |
| 19 |
--- /dev/null |
| 20 |
+++ b/www-client/firefox/files/bug_1461221.patch |
| 21 |
@@ -0,0 +1,36 @@ |
| 22 |
+ |
| 23 |
+# HG changeset patch |
| 24 |
+# User Gregory Szorc <gps@×××××××.com> |
| 25 |
+# Date 1526410966 25200 |
| 26 |
+# Node ID e4ce7b97291627f2186dc23be0dadd3c56dfe938 |
| 27 |
+# Parent f288a2c9c4390898a17ad9f964218b52b87d8028 |
| 28 |
+Bug 1461221 - Account for psutil.disk_io_counters() returning None; r=mshal |
| 29 |
+ |
| 30 |
+Apparently it can do this. |
| 31 |
+ |
| 32 |
+MozReview-Commit-ID: 6gMTGtcRAw6 |
| 33 |
+ |
| 34 |
+diff --git a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py |
| 35 |
+--- a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py |
| 36 |
++++ b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py |
| 37 |
+@@ -60,16 +60,19 @@ except Exception: |
| 38 |
+ psutil = None |
| 39 |
+ |
| 40 |
+ have_psutil = False |
| 41 |
+ |
| 42 |
+ |
| 43 |
+ def get_disk_io_counters(): |
| 44 |
+ try: |
| 45 |
+ io_counters = psutil.disk_io_counters() |
| 46 |
++ |
| 47 |
++ if io_counters is None: |
| 48 |
++ return PsutilStub().disk_io_counters() |
| 49 |
+ except RuntimeError: |
| 50 |
+ io_counters = PsutilStub().disk_io_counters() |
| 51 |
+ |
| 52 |
+ return io_counters |
| 53 |
+ |
| 54 |
+ |
| 55 |
+ def _collect(pipe, poll_interval): |
| 56 |
+ """Collects system metrics. |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/www-client/firefox/firefox-60.1.0.ebuild b/www-client/firefox/firefox-60.1.0.ebuild |
| 60 |
index e6ad0fecb10..92566c51b7d 100644 |
| 61 |
--- a/www-client/firefox/firefox-60.1.0.ebuild |
| 62 |
+++ b/www-client/firefox/firefox-60.1.0.ebuild |
| 63 |
@@ -122,8 +122,11 @@ src_unpack() { |
| 64 |
} |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
+ rm "${WORKDIR}/firefox/2005_ffmpeg4.patch" |
| 68 |
eapply "${WORKDIR}/firefox" |
| 69 |
|
| 70 |
+ eapply "${FILESDIR}/bug_1461221.patch" |
| 71 |
+ |
| 72 |
# Enable gnomebreakpad |
| 73 |
if use debug ; then |
| 74 |
sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ |
| 75 |
|
| 76 |
diff --git a/www-client/firefox/firefox-61.0.ebuild b/www-client/firefox/firefox-61.0.ebuild |
| 77 |
index df0c369af98..e3945abf8ec 100644 |
| 78 |
--- a/www-client/firefox/firefox-61.0.ebuild |
| 79 |
+++ b/www-client/firefox/firefox-61.0.ebuild |
| 80 |
@@ -124,6 +124,8 @@ src_unpack() { |
| 81 |
src_prepare() { |
| 82 |
eapply "${WORKDIR}/firefox" |
| 83 |
|
| 84 |
+ eapply "${FILESDIR}/bug_1461221.patch" |
| 85 |
+ |
| 86 |
# Enable gnomebreakpad |
| 87 |
if use debug ; then |
| 88 |
sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ |
Archives