diff --git a/srcpkgs/firefox/patches/fix-parsing-ccache-never.patch b/srcpkgs/firefox/patches/fix-parsing-ccache-never.patch new file mode 100644 index 00000000000..7a55fccc5de --- /dev/null +++ b/srcpkgs/firefox/patches/fix-parsing-ccache-never.patch @@ -0,0 +1,50 @@ +--- a/python/mozbuild/mozbuild/controller/building.py ++++ b/python/mozbuild/mozbuild/controller/building.py +@@ -1070,6 +1070,8 @@ class CCacheStats(object): + ts = time.strptime(raw_value, "%c") + return int(time.mktime(ts)) + except ValueError: ++ if raw_value == "never": ++ return 0 + pass + + value = raw_value.split() +--- a/python/mozbuild/mozbuild/test/controller/test_ccachestats.py ++++ b/python/mozbuild/mozbuild/test/controller/test_ccachestats.py +@@ -356,6 +356,26 @@ Primary storage: + timestamp=time.strftime("%c") + ) + ++ STAT12 = """ ++Summary: ++ Cache directory: /home/suer/.ccache ++ Primary config: /home/suer/.ccache/ccache.conf ++ Secondary config: /etc/ccache.conf ++ Stats updated: never ++ Hits: 0 / 0 ++ Direct: 0 / 0 ++ Preprocessed: 0 / 0 ++ Misses: 0 ++ Direct: 0 ++ Preprocessed: 0 ++Primary storage: ++ Hits: 0 / 0 ++ Misses: 0 ++ Cache size (GB): 0.00 / 5.00 (0.00 %) ++ Files: 0 ++ Cleanups: 16 ++ """ ++ + def test_parse_garbage_stats_message(self): + self.assertRaises(ValueError, CCacheStats, self.STAT_GARBAGE) + +@@ -438,6 +458,9 @@ Primary storage: + stat11 = CCacheStats(self.STAT11, True) + self.assertTrue(stat11) + ++ stat12 = CCacheStats(self.STAT12, True) ++ self.assertTrue(stat12) ++ + + if __name__ == "__main__": + main() diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 021bb6aee82..9c8a17a940b 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=100.0 +version=100.0.2 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=664c0cc4e0fb70886aa4e652d144996045d533a18eebc7d61093103cbb2d5e7f +checksum=dc109861204f6938fd8f147af89a694eb516f3d4bb64ce3f0116452d654a8417 lib32disabled=yes