commit d37d8649d323fa62335b8e8451ce5c1c6996ebd8
Author: Jan Rękorajski <[email protected]>
Date: Sun May 26 20:24:31 2019 +0200
- don't fail build in case build stats writing fails
firefox60-esr.spec | 2 ++
ignore-stats-errors.patch | 10 ++++++++++
2 files changed, 12 insertions(+)
---
diff --git a/firefox60-esr.spec b/firefox60-esr.spec
index bd7c59c..51b1860 100644
--- a/firefox60-esr.spec
+++ b/firefox60-esr.spec
@@ -262,6 +262,7 @@ Patch7: %{origname}-middle_click_paste.patch
Patch8: %{origname}-system-virtualenv.patch
Patch9: %{origname}-Disable-Firefox-Health-Report.patch
Patch10: system-cairo.patch
+Patch11: ignore-stats-errors.patch
URL: https://www.mozilla.org/firefox/
BuildRequires: OpenGL-devel
BuildRequires: alsa-lib-devel
@@ -2078,6 +2079,7 @@ unpack() {
%patch8 -p2
%patch9 -p1
%{?with_system_cairo:%patch10 -p1}
+%patch11 -p1
%{__sed} -i -e '1s,/usr/bin/env python,%{__python},'
xpcom/typelib/xpt/tools/xpt.py xpcom/idl-parser/xpidl/xpidl.py
diff --git a/ignore-stats-errors.patch b/ignore-stats-errors.patch
new file mode 100644
index 0000000..afadc65
--- /dev/null
+++ b/ignore-stats-errors.patch
@@ -0,0 +1,10 @@
+--- firefox-60.7.0/python/mozbuild/mozbuild/controller/building.py~
2019-05-14 21:13:24.000000000 +0200
++++ firefox-60.7.0/python/mozbuild/mozbuild/controller/building.py
2019-05-26 20:22:50.485588101 +0200
+@@ -322,6 +322,7 @@
+ self.log(logging.WARNING, 'build_resources_error',
+ {'msg': str(e)},
+ 'Exception when writing resource usage file: {msg}')
++ pass
+
+ def _get_finder_cpu_usage(self):
+ """Obtain the CPU usage of the Finder app on OS X.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/firefox60-esr.git/commitdiff/d37d8649d323fa62335b8e8451ce5c1c6996ebd8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
