From 1e891ebe4379fe836f2a92c7ecddbc5b1184e531 Mon Sep 17 00:00:00 2001 From: PktSurf Date: Sat, 15 Apr 2023 11:40:39 +0530 Subject: [PATCH] Fix stuff inside prepbuilddir function in base/boost Upgraded base/file to 5.44 Upgraded heavybuilds/firefox to 102.9.0 --- base/boost/boost.SMBuild | 2 ++ base/file/file.SMBuild | 11 ++++---- base/file/file.etc.file.diff | 11 -------- base/file/file.short.diff | 12 --------- heavybuilds/firefox/firefox.SMBuild | 41 +++++++++++++++-------------- 5 files changed, 28 insertions(+), 49 deletions(-) delete mode 100644 base/file/file.etc.file.diff delete mode 100644 base/file/file.short.diff diff --git a/base/boost/boost.SMBuild b/base/boost/boost.SMBuild index 79025d8..4958424 100755 --- a/base/boost/boost.SMBuild +++ b/base/boost/boost.SMBuild @@ -13,7 +13,9 @@ prepbuilddir() { tar xf $srcdir/"$app"_"$sversion".tar.?z* cd "$app"_"$sversion" + # Our fixbuilddirpermissions is disliked by a couple of files in here chown -R root.root . + touch ."$app-$version.extraction.complete" } build() { diff --git a/base/file/file.SMBuild b/base/file/file.SMBuild index 4b014c5..8dc6937 100755 --- a/base/file/file.SMBuild +++ b/base/file/file.SMBuild @@ -1,5 +1,5 @@ app=file -version=5.39 +version=5.44 build=4sml homepage="https://www.darwinsys.com/file/" download="http://astron.com/pub/file/file-$version.tar.gz" @@ -14,8 +14,8 @@ prepbuilddir() { cd $app-$version fixbuilddirpermissions - applypatch $srcdir/file.etc.file.diff - applypatch $srcdir/file.short.diff + #applypatch $srcdir/file.etc.file.diff + #applypatch $srcdir/file.short.diff } build() { @@ -48,6 +48,5 @@ build() { sha512sums=" 706f52abe8a4140983c03bc9403987153e3996a8bfbfd20d94f82fc7781c710a54e57b8967c8885e0ceec83f86ff0acca14b6d051b854f79df7aaa626d7068b8 file-5.39.tar.lz -3d5549ee9ec1357cd016b120c519c36b3f9fc1cd5f56a34ae5437ff0a9a536a0fa678dd151604e1d0b43c995fe766df5caf950e025c1ca1471f7bcc8715eca73 file.etc.file.diff -66c7ba2a0d963c12df85408cd07d26cc55ba8cefb117ea322091e63af5aabd6df6ca389139a8f8338ea0edd244dbe43e385799381de1b8c0d33137374b3d5734 file.short.diff -" +26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63 file-5.44.tar.gz +" \ No newline at end of file diff --git a/base/file/file.etc.file.diff b/base/file/file.etc.file.diff deleted file mode 100644 index 98e0754..0000000 --- a/base/file/file.etc.file.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure.ac.orig 2009-05-06 15:32:25.000000000 -0500 -+++ ./configure.ac 2009-06-12 17:40:25.000000000 -0500 -@@ -47,7 +47,7 @@ - fsect=4 - ]) - --AC_SUBST([pkgdatadir], ['$(datadir)/misc']) -+AC_SUBST([pkgdatadir], ['$(datadir)/file']) - AC_SUBST(fsect) - AM_CONDITIONAL(FSECT5, test x$fsect = x5) - diff --git a/base/file/file.short.diff b/base/file/file.short.diff deleted file mode 100644 index 0f6a0e7..0000000 --- a/base/file/file.short.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur file-5.08.orig//src/readelf.h file-5.08/src/readelf.h ---- file-5.08.orig//src/readelf.h 2011-08-03 09:45:16.000000000 -0500 -+++ file-5.08/src/readelf.h 2011-08-23 21:10:04.228054614 -0500 -@@ -239,7 +239,7 @@ - * word[2]: minor version - * word[3]: tiny version - */ --#define NT_GNU_VERSION 1 -+#define NT_GNU_VERSION 0 - - /* GNU OS tags */ - #define GNU_OS_LINUX 0 diff --git a/heavybuilds/firefox/firefox.SMBuild b/heavybuilds/firefox/firefox.SMBuild index 1f100e7..6e435ac 100755 --- a/heavybuilds/firefox/firefox.SMBuild +++ b/heavybuilds/firefox/firefox.SMBuild @@ -1,8 +1,8 @@ app=firefox -version=102.8.0 +version=102.9.0 build=1sml homepage="http://www.mozilla.org/projects/firefox/" -download="https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/source/firefox-102.8.0esr.source.tar.xz" +download="https://archive.mozilla.org/pub/firefox/releases/$versionesr/source/firefox-102.9.0esr.source.tar.xz" desc="Web browser from mozilla.org based on Gecko engine" requires="zip unzip yasm libevent alsa-lib libpng icu hunspell python3 diffutils llvm imake libxt gtk3 dbus-glib ffmpeg clang nodejs mozilla-nss lld" @@ -41,6 +41,16 @@ prepbuilddir() { applypatch $srcdir/sandbox-largefile.patch applypatch $srcdir/sandbox-sched_setscheduler.patch applypatch $srcdir/symboltable.patch + + cp $srcdir/stab.h toolkit/crashreporter/google-breakpad/src/ + + clear_vendor_checksums() { + sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json + } + + clear_vendor_checksums audio_thread_priority + clear_vendor_checksums target-lexicon-0.9.0 + } build() { @@ -53,26 +63,17 @@ build() { # Thanks slackware. This reduces memory consumption issues when rust objects are compiled export RUSTFLAGS="-Cdebuginfo=0" - - cp $srcdir/stab.h toolkit/crashreporter/google-breakpad/src/ - - clear_vendor_checksums() { - sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json - } - - clear_vendor_checksums audio_thread_priority - clear_vendor_checksums target-lexicon-0.9.0 - - unset MAKEFLAGS + + # Point bindgen to the right toolchain export BINDGEN_CFLAGS="--sysroot="/" --target="$arch-linux-musl"" - - # Go easy on the pi - if [ "$arch" = "aarch64" ] ; then - MAKEFLAGS="-j2" - fi - + + # Cause cargo to respect MAKEFLAGS + export CARGO_BUILD_JOBS="${MAKEFLAGS/-j/}" + cd build + export CC CXX + ../mach configure \ --prefix="" \ --libdir=/lib \ @@ -140,7 +141,7 @@ build() { sha512sums=" 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad autoconf-2.13.tar.gz -93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275 firefox-102.8.0esr.source.tar.xz +3923212ce4b7d1f589129025961ff1b380b8aaf1dd074674f3bd63cf14e9a44ff051bda556b7796c25634e153de00ce62243ece15a520f63dd0791a19b2a6685 firefox-102.9.0esr.source.tar.xz 4e584621145cf8add069c6dac18e805b3274a1ee402d84e924df2341f7d3c5be261a93ef51283bacbd606f47fbdc628c4323ecc31efc5b403b8d224b18dc278f allow-custom-rust-vendor.patch b1cb2db3122634f66d2bae7066e76f2dcd455c464e021db4de3b0a08314df95cb667846081682db549dd2af8a00831cabe44a2420c66cdfb5e3b5fa7e6bd21d3 avoid-redefinition.patch 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch