From ca23ab1b44e0523a219226790ee7dbb51ecd98aa Mon Sep 17 00:00:00 2001 From: psykose Date: Mon, 16 Jan 2023 21:31:22 +0000 Subject: [PATCH] testing/firefox-developer-edition: upgrade to 110.0_beta1 --- testing/firefox-developer-edition/APKBUILD | 12 ++++-------- .../firefox-developer-edition/no-ccache-stats.patch | 8 +++++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/testing/firefox-developer-edition/APKBUILD b/testing/firefox-developer-edition/APKBUILD index b6d3c00ed61..2904c1219a1 100644 --- a/testing/firefox-developer-edition/APKBUILD +++ b/testing/firefox-developer-edition/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: psykose pkgname=firefox-developer-edition -pkgver=109.0_beta9 +pkgver=110.0_beta1 _pkgver=${pkgver/_beta/b} -_releasedate=2023-01-06 +_releasedate=2023-01-16 pkgrel=0 pkgdesc="Firefox web browser" url="https://www.firefox.com/" @@ -196,10 +196,6 @@ build() { # set rpath so linker finds the libs export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir" - # LLVM OOM dodge - # TODO: why does this fail with more than 4 threads and so much memory? - export LDFLAGS="$LDFLAGS -Wl,--thinlto-jobs=4" - # let firefox do this itself. unset CARGO_PROFILE_RELEASE_OPT_LEVEL unset CARGO_PROFILE_RELEASE_CODEGEN_UNITS @@ -252,14 +248,14 @@ package() { } sha512sums=" -3deb3382d394ca9187615fdec4a2acec1af488f2baf50f9ffbe7072d0835b869a9bbf1cc778943f3b27e9dffc4390b8e43707954ac5c711c219f9849431225a4 firefox-109.0b9.source.tar.xz +744f4f0b189c0208470d45027ee83dfcf1a934db471d9c5d46ac47f98cf1726ac232ca9494aa48383c3cacd3ecbca1f54553e627ef386ec98a48f21d37241591 firefox-110.0b1.source.tar.xz b1cb2db3122634f66d2bae7066e76f2dcd455c464e021db4de3b0a08314df95cb667846081682db549dd2af8a00831cabe44a2420c66cdfb5e3b5fa7e6bd21d3 avoid-redefinition.patch 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch 305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b fix-webrtc-glibcisms.patch ff471e5160e313a9657bcbb767a6a581bab9da053cced02bde38d1ef03349472ad3602dba026c10d676d55c1712af772dd2b7bdbfa72b5db498c9ce8a2133423 install-dir.patch -124b3fbfa672d3034840d864652d7ced91aa97d9741be2d349f378f92fef1e699b21bb40853d75301bfd2f938a0eb66bd63c816a7f49f508bc8ea5a8f22f12b5 no-ccache-stats.patch +64b6458099baa225b346b40e3080cea3a5c73a834e39fa4a438af77701e6ded84e2fb0d6fffff8c2533cc43b898fe9f411be023e875acebec452aa2379861f04 no-ccache-stats.patch b78c684b612cde3aec80d8de1e5782c5ccfefaf2466a52bd3d87fa291babb8f8278101a1c3d1c8037af5909637155dcf51f6ffae8e0dab54383d9d51bd24a4cb python-deps.patch 2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e sandbox-largefile.patch diff --git a/testing/firefox-developer-edition/no-ccache-stats.patch b/testing/firefox-developer-edition/no-ccache-stats.patch index 8ef804919cf..fa8dddd9840 100644 --- a/testing/firefox-developer-edition/no-ccache-stats.patch +++ b/testing/firefox-developer-edition/no-ccache-stats.patch @@ -1,11 +1,13 @@ prevents a call to ccache +diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py +index bf7009a083..011c012e20 100644 --- a/python/mozbuild/mozbuild/controller/building.py +++ b/python/mozbuild/mozbuild/controller/building.py -@@ -586,6 +586,7 @@ +@@ -570,6 +570,7 @@ class BuildMonitor(MozbuildObject): ) - def ccache_stats(self): + def ccache_stats(self, ccache=None): + return None ccache_stats = None - ccache = mozfile.which("ccache") + if ccache is None: