From 223056b0bfef0f51aece2dc93af494686c9fc768 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Feb 25 2021 10:41:17 +0000
Subject: Add Mozilla patch #1692706


---

diff --git a/icecat.spec b/icecat.spec
index 8199de1..ae7063a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -49,7 +49,7 @@
 ####################
 
 # Temporarily disabled, filed as rhbz#1932204
-ExcludeArch: ppc64le
+#ExcludeArch: ppc64le
 
 # Active/Deactive language files handling
 %global build_langpacks 1
@@ -113,7 +113,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.8.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -197,6 +197,8 @@ Patch422: mozilla-1580174-webrtc-popup.patch
 Patch423: mozilla-1512162.patch
 Patch424: %{name}-mozilla-1669471.patch
 
+Patch425: mozilla-1692706.patch
+
 # PGO/LTO patches
 Patch600: %{name}-pgo.patch
 Patch602: mozilla-1516803.patch
@@ -409,15 +411,16 @@ tar -xf %{SOURCE5}
 
 %patch402 -p1 -b .1196777
 %patch403 -p1 -b .1640567
-%patch423 -p1 -b .mozilla-1596503
-%patch424 -p1 -b .mozilla-1669471
+%patch423 -p1 -b .1596503
+%patch424 -p1 -b .1669471
+%patch425 -p1 -b .1692706
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
 
 %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 %patch585 -p1 -b .firefox-vaapi-extra-frames
-%patch589 -p1 -b .mozilla-1634213
+%patch589 -p1 -b .1634213
 
 %patch54 -p1 -b .1669639
 %patch55 -p1 -b .1669442
@@ -874,6 +877,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Feb 25 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-3.rh1
+- Add Mozilla patch #1692706
+
 * Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-2.rh1
 - Exclude Power64 (rhbz#1932204)
 - Fix build option for s390x
diff --git a/mozilla-1692706.patch b/mozilla-1692706.patch
new file mode 100644
index 0000000..6defdea
--- /dev/null
+++ b/mozilla-1692706.patch
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Ian Neal <iann_cvs@blueyonder.co.uk>
+# Date 1614236439 0
+# Node ID cc45c336687916a6d1bfed79a80dc8a292b139a5
+# Parent  8024f219bda91c98fcbba16f2bfc6b4833014bfc
+Bug 1692706 - Update ccache stats parser for ccache 4.x. r=glandium
+
+Differential Revision: https://phabricator.services.mozilla.com/D105863
+
+diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
+--- a/python/mozbuild/mozbuild/controller/building.py
++++ b/python/mozbuild/mozbuild/controller/building.py
+@@ -842,7 +842,7 @@
+ 
+     DIRECTORY_DESCRIPTION = "cache directory"
+     PRIMARY_CONFIG_DESCRIPTION = "primary config"
+-    SECONDARY_CONFIG_DESCRIPTION = "secondary config      (readonly)"
++    SECONDARY_CONFIG_DESCRIPTION = "secondary config"
+     ABSOLUTE_KEYS = {'cache_files', 'cache_size', 'cache_max_size'}
+     FORMAT_KEYS = {'cache_size', 'cache_max_size'}
+ 
+@@ -874,7 +874,8 @@
+                 line, self.PRIMARY_CONFIG_DESCRIPTION)
+         elif line.startswith(self.SECONDARY_CONFIG_DESCRIPTION):
+             self.secondary_config = self._strip_prefix(
+-                line, self.SECONDARY_CONFIG_DESCRIPTION)
++                self._strip_prefix(line, self.SECONDARY_CONFIG_DESCRIPTION),
++                "(readonly)",
+         else:
+             for stat_key, stat_description in self.STATS_KEYS:
+                 if line.startswith(stat_description):