3 files changed, 48 insertions, 15 deletions
diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD
index c4b881eaf..82c29ffd7 100644
--- a/user/firefox-esr/APKBUILD
+++ b/user/firefox-esr/APKBUILD
@@ -2,10 +2,11 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=firefox-esr
 pkgver=91.13.0
-pkgrel=3
+_llvmver=14
+pkgrel=4
 pkgdesc="Firefox web browser (extended support release)"
 url="https://www.mozilla.org/firefox/"
-arch="all !ppc !armv7"  # #837, #1015
+arch="all !ppc"  # #837
 options="!check"  # Tests disabled
 license="MPL-2.0"
 depends=""
@@ -14,7 +15,7 @@ depends=""
 # system-libs
 # actual deps
 makedepends="
-	autoconf2.13 cargo cbindgen clang llvm14-dev node ncurses-dev 
+	autoconf2.13 cargo cbindgen clang llvm${_llvmver}-dev node ncurses-dev
 	perl python3 rust rust-std cmd:which
 
 	ncurses-dev openssl-dev
@@ -33,6 +34,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f
 
 	bad-google-code.patch
 	BTS-1074.patch
+	disable-arm-flac.patch
 	fix-mutex-build.patch
 	fix-seccomp-bpf.patch
 	gcc89074.patch
@@ -49,6 +51,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f
 	stackwalk-x86-ppc.patch
 	triplet-vendor-support.patch
 	webrender.patch
+	gcc13.patch
 
 	firefox.desktop
 	firefox-safe.desktop
@@ -64,13 +67,13 @@ ldpath="$_mozappdir"
 prepare() {
 	default_prepare
 	cp "$srcdir"/mozconfig "$builddir"/mozconfig
-	echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig
 	echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig
 	echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig
 	echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig
 
+	# arch-specific configuration
 	case "$CARCH" in
-		pmmx|x86*)
+		pmmx|x86*|arm*)
 			echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig
 			;;
 		ppc)
@@ -80,23 +83,26 @@ prepare() {
 			echo "ac_add_options --disable-startupcache" >> "$builddir"/mozconfig
 			;;
 	esac
+
+	# 32-bit memory ceiling, #1012, #1057
+	case "${CARCH}" in
+		pmmx|x86|ppc|i528|m68k|mips32*|arm*)
+			echo "ac_add_options --disable-debug-symbols" >> "$builddir"/mozconfig
+			echo "ac_add_options --enable-strip" >> "$builddir"/mozconfig
+			CFLAGS="${CFLAGS} -g0";
+			;;
+	esac
+
+	echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig
 }
 
 build() {
+	export PATH="/usr/lib/llvm${_llvmver}/bin:${PATH}" #1230
 	export SHELL=/bin/sh
 	export BUILD_OFFICIAL=1
 	export MOZILLA_OFFICIAL=1
 	export USE_SHORT_LIBNAME=1
 	export MACH_USE_SYSTEM_PYTHON=1
-	# gcc 6
-	export CXXFLAGS="-fno-delete-null-pointer-checks -fno-schedule-insns2"
-
-	case "${CARCH}" in
-		armv7)
-			# 32-bit memory ceiling, #1012
-			LDFLAGS="${LDFLAGS} -Wl,--strip-debug";
-			;;
-	esac
 
 	# set rpath so linker finds the libs
 	export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}"
@@ -111,7 +117,7 @@ run() {
 	export LD_LIBRARY_PATH=.
 	export PROFILE_DIR="$builddir"/obj-$CHOST/tmp/profile-default
 	[ -d $PROFILE_DIR ] || ./firefox -no-remote -CreateProfile "Test $PROFILE_DIR"
-	./firefox -no-remote -profile "$builddir"/obj-$CHOST/tmp/profile-default
+	./firefox -no-remote -profile "$PROFILE_DIR" about:buildconfig
 }
 
 package() {
@@ -155,6 +161,7 @@ sha512sums="38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f25
 86168a5e5b8aa3ea7cc0d40174baa97595c82b8e599937155fbd7761e7df7220980c74f75e96c34e5f660423e42ad67761f57b2923389be363253868bac033a9  mozconfig
 ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613  bad-google-code.patch
 57410e4b9199f3c7db1cd4a0cf3e67cd962b585730c073edb1cadc3bcac5b0aec4e6f7efe24f3eadd1020aefef475e08e97f13dc6b6534e639f33cc6fb1abe04  BTS-1074.patch
+33c6c9d845981137e41e396463c09a55c4effe56628f9f7a4e13b7328e4591b97bc607df484393994a9da07d701f2eaee4e30b463284159e4206e1c42a1a4cdc  disable-arm-flac.patch
 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880  fix-mutex-build.patch
 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
 6eb7fb134760f5d232710c56f18f14de4f533e41e269531edd01f5650f6d641513e34a8d2294af5ad6fd184736f674c734efb4cc003636a75e14a8fdba2fe3b0  gcc89074.patch
@@ -171,5 +178,6 @@ c9c5610b99e73a1eedd3510e73921cba84f8c6d0c58fc7fe5b4a7ec261bd5fe530560856fba46d6b
 452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448  stackwalk-x86-ppc.patch
 60ffc4b95ba72aa19fb4f4aaf91393e8c730dae536a19248e2dd21c38cc32891bff69a6b51ea903f185ecc680dae4b21ec11d8cac67b3b038b3f0e757639ad94  triplet-vendor-support.patch
 b7c1ac21cd03b7cdc887e005ed970cf13ff95643c7651decf1e6d42094cda6a0464dc2ba3cded3827f6d0f3682c2c9b081a7667f386133aa6e3072d0464e72e8  webrender.patch
+bb57b3ed998543f9a2edcc379a0c5e2d7e855a0d6f538547f18cdfce56f6c91a3c26a8b1505824628fdd394f0f75a8e98c7fb559ef79eac803d4028e5e9827e5  gcc13.patch
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
diff --git a/user/firefox-esr/disable-arm-flac.patch b/user/firefox-esr/disable-arm-flac.patch
new file mode 100644
index 000000000..fa1ba8753
--- /dev/null
+++ b/user/firefox-esr/disable-arm-flac.patch
@@ -0,0 +1,15 @@
+32-bit ARM assembler is mostly for Android32 accel anyway.
+
+It doesn't link properly on musl (TEXTRELs).
+
+--- firefox-91.13.0/toolkit/moz.configure.old	2023-10-09 10:40:18.231733637 +0000
++++ firefox-91.13.0/toolkit/moz.configure	2023-10-10 02:22:34.743712070 +0000
+@@ -1894,7 +1894,7 @@
+                 flac_only = True
+         elif target.cpu == "x86_64":
+             flags = ["-D__x86_64__", "-DPIC", "-DELF", "-Pconfig_unix64.asm"]
+-        elif target.cpu in ("x86", "arm", "aarch64"):
++        elif target.cpu in ("x86", "aarch64"):
+             flac_only = True
+         else:
+             enable = False
diff --git a/user/firefox-esr/gcc13.patch b/user/firefox-esr/gcc13.patch
new file mode 100644
index 000000000..1c4f085e0
--- /dev/null
+++ b/user/firefox-esr/gcc13.patch
@@ -0,0 +1,10 @@
+--- firefox-91.13.0/gfx/2d/Rect.h.old	2022-08-15 13:04:38.000000000 -0500
++++ firefox-91.13.0/gfx/2d/Rect.h	2024-05-28 20:50:50.230975904 -0500
+@@ -15,6 +15,7 @@
+ #include "mozilla/Maybe.h"
+ 
+ #include <cmath>
++#include <cstdint>
+ 
+ namespace mozilla {
+