| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-07-12 17:48:11 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-07-12 22:44:05 UTC |
| parent | 29fbbfdf9834a144a3d33250593d13f370e93198 |
| PKGBUILD | +5 | -5 |
| PKGBUILD.old | +316 | -0 |
| custom-build.sh | +1 | -1 |
diff --git a/PKGBUILD b/PKGBUILD index 287d04d..3f25caf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ highmem=1 pkgname=firefox -pkgver=126.0.1 +pkgver=127.0.2 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" url="https://www.mozilla.org/firefox/" @@ -50,7 +50,7 @@ makedepends=( xorg-server-xvfb # yasm zip - patchelf +# patchelf ) optdepends=( 'hunspell-en_US: Spell checking, American English' @@ -147,9 +147,9 @@ ac_add_options --disable-tests ac_add_options --host=aarch64-unknown-linux-gnu ac_add_options --target=armv7l-unknown-linux-gnueabihf -ac_add_options --with-arch=armv7-a +ac_add_options --with-arch=armv7ve ac_add_options --with-float-abi=hard -ac_add_options --with-fpu=neon +ac_add_options --with-fpu=neon-vfpv4 ac_add_options --enable-optimize="-O2 -g1" ac_add_options --disable-elf-hack #ac_add_options --disable-jemalloc @@ -309,7 +309,7 @@ END } # vim:set sw=2 sts=-1 et: -sha256sums=('f63026359f678a5d45cea4c7744fcef512abbb58a5b016bbbb1c6ace723a263b' +sha256sums=('0b7b2a8c3def52fcab13c48769645d0e963902ee916e4f3d2a0098796e73e3e8' 'SKIP' '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' diff --git a/PKGBUILD.old b/PKGBUILD.old new file mode 100644 index 0000000..b105626 --- /dev/null +++ b/PKGBUILD.old @@ -0,0 +1,316 @@ +# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Jakub Schmidtke <sjakub@gmail.com> + +# ALARM: Kevin Mihelich <kevin@archlinuxarm.org> +# - mozconfig changes for ARM +# - revert change for clang that breaks gcc build on ARM +# - disable rust lto for v7 + +# ARMLFS: Disable jack, nasm, xvfb, mozilla sponsored tiles (inspired by +# alpine) We're otherwise acting like we're _exactly_ Arch-ARM +# (I don't want to ask for permission for the keys while this is +# personal-ish-only) + +highmem=1 + +pkgname=firefox +pkgver=126.0.1 +pkgrel=1 +pkgdesc="Standalone web browser from mozilla.org" +url="https://www.mozilla.org/firefox/" +arch=(armv7h) +license=(MPL-2.0) +depends=( + dbus + ffmpeg + gtk3 + libpulse + libxss + libxt + mime-types + nss + ttf-font +) +makedepends=( + cbindgen + clang + diffutils + imake + inetutils +# jack + lld + llvm + mesa +# nasm + nodejs + python + rust + unzip + xorg-server-xvfb +# yasm + zip +# patchelf +) +optdepends=( + 'hunspell-en_US: Spell checking, American English' + 'libnotify: Notification integration' + 'networkmanager: Location detection via available WiFi networks' + 'pulseaudio: Audio support' + 'speech-dispatcher: Text-to-Speech' + 'xdg-desktop-portal: Screensharing with Wayland' +) +options=( + !emptydirs + !lto + !makeflags +) +source=( + https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} + $pkgname.desktop + identity-icons-brand.svg + jemalloc-tls-init-always-pthread.patch +) + + +validpgpkeys=( + # Mozilla Software Releases <release@mozilla.com> + # https://blog.mozilla.org/security/2023/05/11/updated-gpg-key-for-signing-firefox-releases/ + 14F26682D0916CDD81E37B6D61B7B526D98F0353 +) + + +# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) +# Note: These are for Arch Linux use ONLY. For your own distribution, please +# get your own set of keys. Feel free to contact foutrelis@archlinux.org for +# more information. +# - Arch Linux ARM has obtained permission to use the Arch Linux keys. +_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM + +# Mozilla API keys (see https://location.services.mozilla.com/api) +# Note: These are for Arch Linux use ONLY. For your own distribution, please +# get your own set of keys. Feel free to contact heftig@archlinux.org for +# more information. +_mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a + +prepare() { + + mkdir mozbuild + cd firefox-$pkgver + patch -Np1 -i ../jemalloc-tls-init-always-pthread.patch + + echo -n "$_google_api_key" >google-api-key + echo -n "$_mozilla_api_key" >mozilla-api-key + + cat >.mozconfig <<END +ac_add_options --enable-application=browser +mk_add_options MOZ_OBJDIR=${PWD@Q}/obj + +ac_add_options --prefix=/usr +ac_add_options --enable-release +#ac_add_options --enable-debug + +ac_add_options --enable-hardening +#ac_add_options --enable-optimize="-O2" +#ac_add_options --enable-rust-simd +ac_add_options --enable-linker=lld +ac_add_options --disable-install-strip +ac_add_options --disable-bootstrap +ac_add_options --without-wasm-sandboxed-libraries + +# Branding +ac_add_options --enable-official-branding +ac_add_options --enable-update-channel=release +ac_add_options --with-distribution-id=org.archlinux +ac_add_options --with-unsigned-addon-scopes=app,system +ac_add_options --allow-addon-sideload +export MOZILLA_OFFICIAL=1 +export MOZ_APP_REMOTINGNAME=${pkgname//-/} + +# Keys +ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-key +ac_add_options --with-google-safebrowsing-api-keyfile=${PWD@Q}/google-api-key +ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss + +# Features +ac_add_options --enable-alsa +#ac_add_options --enable-jack +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests + +# We're cross-compiling +ac_add_options --host=aarch64-unknown-linux-gnu +ac_add_options --target=armv7l-unknown-linux-gnueabihf + +ac_add_options --with-arch=armv7ve +ac_add_options --with-float-abi=hard +ac_add_options --with-fpu=neon-vfpv4 +ac_add_options --enable-optimize="-O2 -g1" +ac_add_options --disable-elf-hack +#ac_add_options --disable-jemalloc +END + # Debug info? Yes pls. 2GB of it? NO PLZ. + export MOZ_DEBUG_FLAGS=" " + export CFLAGS+=" -g1" + export CXXFLAGS+=" -g1" + export RUSTFLAGS="-Cdebuginfo=1" + + export MAKEFLAGS="-j3" + echo "mk_add_options MOZ_MAKE_FLAGS=\"${MAKEFLAGS}\"" >> .mozconfig + # cross-compiling, lets not touch the rest + return 0 + + if [[ $CARCH == "armv7h" ]]; then + echo "ac_add_options --disable-elf-hack" >> .mozconfig + # https://bugzilla.redhat.com/show_bug.cgi?id=1641623 + # we do have AV1... lets try it out... + #echo "ac_add_options --disable-av1" >> .mozconfig + # reduce jobs due to RAM constraints (was 1) + MAKEFLAGS="-j2" + # disable hard-coded LTO + sed -i '/cargo_rustc_flags += -Clto/d' config/makefiles/rust.mk + sed -i '/RUSTFLAGS += -Cembed-bitcode=yes/d' config/makefiles/rust.mk + # increase codegen-units due to RAM constraints + sed -i 's/codegen-units=1/codegen-units=4/' config/makefiles/rust.mk + #sed -i 's/codegen-units=1/codegen-units=16/' config/makefiles/rust.mk + # webrtc on ARMv7 implies android, so disable it + echo "ac_add_options --disable-webrtc" >> .mozconfig + elif [[ $CARCH == "aarch64" ]]; then + echo 'ac_add_options --enable-rust-simd' >> .mozconfig + fi + +# echo 'ac_add_options --enable-optimize="-g0 -O2"' >> .mozconfig + echo 'ac_add_options --enable-optimize="-g -Og"' >> .mozconfig + echo "mk_add_options MOZ_MAKE_FLAGS=\"${MAKEFLAGS}\"" >> .mozconfig + + export MOZ_DEBUG_FLAGS=" " + #export CFLAGS+=" -g1" + #export CXXFLAGS+=" -g1" + export LDFLAGS+=" -Wl,--no-keep-memory" +# export RUSTFLAGS="-Cdebuginfo=1" +} + +build() { + cd firefox-$pkgver + + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip + export MOZBUILD_STATE_PATH="$srcdir/mozbuild" + export MOZ_BUILD_DATE="$(date -u${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH} +%Y%m%d%H%M%S)" + export MOZ_NOSPAM=1 + + # malloc_usable_size is used in various parts of the codebase + CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + + # LTO needs more open files + ulimit -n 4096 + + # Enable cross-compilers, and start with /bin so things are not found in "sbin" lol + export PATH="/usr/a32:/usr/cross-a64/bin:/usr/bin/:$PATH" + echo "Building optimized browser..." + ./mach build +} + +package() { + cd firefox-$pkgver + DESTDIR="$pkgdir" ./mach install + + local vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" + install -Dvm644 /dev/stdin "$vendorjs" <<END +// Use LANG environment variable to choose locale +pref("intl.locale.requested", ""); + +// Use system-provided dictionaries +pref("spellchecker.dictionary_path", "/usr/share/hunspell"); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); + +// Don't disable extensions in the application directory +pref("extensions.autoDisableScopes", 11); + +// Enable GNOME Shell search provider +pref("browser.gnome-search-provider.enabled", true); + +// Disable sponsored tiles from "Mozilla Tiles Service" +pref("browser.topsites.contile.enabled", false); +END + + local distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" + install -Dvm644 /dev/stdin "$distini" <<END +[Global] +id=archlinux +version=1.0 +about=Mozilla Firefox for Arch Linux + +[Preferences] +app.distributor=archlinux +app.distributor.channel=$pkgname +app.partner.archlinux=archlinux +END + + local i theme=official + for i in 16 22 24 32 48 64 128 256; do + install -Dvm644 browser/branding/$theme/default$i.png \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" + done + install -Dvm644 browser/branding/$theme/content/about-logo.png \ + "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png" + install -Dvm644 browser/branding/$theme/content/about-logo@2x.png \ + "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png" + install -Dvm644 browser/branding/$theme/content/about-logo.svg \ + "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg" + install -Dvm644 ../identity-icons-brand.svg \ + "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg" + + install -Dvm644 ../$pkgname.desktop \ + "$pkgdir/usr/share/applications/${pkgname//-/}.desktop" + + # Install a wrapper to avoid confusion about binary path + install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END +#!/bin/sh +exec /usr/lib/$pkgname/firefox "\$@" +END + + # Replace duplicate binary with wrapper + # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -srfv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/lib/$pkgname/firefox-bin" + + # Use system certificates + local nssckbi="$pkgdir/usr/lib/$pkgname/libnssckbi.so" + if [[ -e $nssckbi ]]; then + ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi" + fi + + local sprovider="$pkgdir/usr/share/gnome-shell/search-providers/$pkgname.search-provider.ini" + install -Dvm644 /dev/stdin "$sprovider" <<END +[Shell Search Provider] +DesktopId=${pkgname//-/}.desktop +BusName=org.mozilla.${pkgname//-/}.SearchProvider +ObjectPath=/org/mozilla/${pkgname//-/}/SearchProvider +Version=2 +END + + # Thread-local-storage issue workaround +# patchelf --add-rpath /usr/lib/firefox \ +# --add-needed libxul.so \ +# --add-needed libmozsandbox.so \ +# --add-needed libgkcodecs.so \ +# --add-needed liblgpllibs.so \ +# --add-needed libmozsqlite3.so \ +# --add-needed libmozgtk.so \ +# --add-needed libmozwayland.so \ +# "$pkgdir"/usr/lib/firefox/firefox +} + +# vim:set sw=2 sts=-1 et: +sha256sums=('f63026359f678a5d45cea4c7744fcef512abbb58a5b016bbbb1c6ace723a263b' + 'SKIP' + '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044' + 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' + 'f940f4508de18113bba6c3a8644a05c7b8bf011a0dd991f9bc5be15ec55af07b') diff --git a/custom-build.sh b/custom-build.sh index 9d72318..ee1fa40 100755 --- a/custom-build.sh +++ b/custom-build.sh @@ -8,5 +8,5 @@ systemd-nspawn -M pkg-builder64-$$ --volatile=overlay --bind=/sources \ --bind=/buildcore64/var/cache/pacman/pkg:/var/cache/pacman/pkg \ -D /buildcore64 $(pwd)/build-in64.sh $(pwd) ../pkg-repo.sh -echo firefox >> ../built-order +echo firefox >> ../$CARCH-built-order