diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 142 |
1 files changed, 71 insertions, 71 deletions
@@ -1,40 +1,47 @@ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Jakub Schmidtke <sjakub@gmail.com> -# Additional patching: Nikita Tarasov <nikatar@disroot.org> + +### Appmenu patching ### +# PKGBUILD: Nikita Tarasov <nikatar@disroot.org> pkgname=firefox-appmenu _pkgname=firefox -pkgver=70.0 -pkgrel=1 +pkgver=112.0.2 +pkgrel=2 pkgdesc="Firefox from extra with appmenu patch" arch=(x86_64) license=(MPL GPL LGPL) url="https://www.mozilla.org/firefox/" -depends=(gtk3 libxt startup-notification mime-types dbus-glib ffmpeg nss - ttf-font libpulse) -makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils - xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 - python nodejs python2-psutil cbindgen nasm) +depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse libdbusmenu-gtk3) +makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb + rust clang llvm jack nodejs cbindgen nasm python + lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi + ) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' 'speech-dispatcher: Text-to-Speech' - 'hunspell-en_US: Spell checking, American English') + 'hunspell-en_US: Spell checking, American English' + 'xdg-desktop-portal: Screensharing with Wayland') provides=("firefox=$pkgver") -conflict=("firefox") -options=(!emptydirs !makeflags !strip) +conflicts=("firefox") +options=(!emptydirs !makeflags !strip !lto !debug) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - no-relinking.patch - 0001-Use-remoting-name-for-GDK-application-names.patch $_pkgname.desktop - unity-menubar.patch) -sha256sums=('cd9f2902753831c07c4b2ee64f7826f33ca1123add6440dc34abe3ff173a0cc6' + identity-icons-brand.svg + 0001-Bug-1803016-Wayland-Don-t-commit-wl_buffer-if-buffer.patch + fix-wayland-build.patch + unity-menubar.patch + fix_csd_window_buttons.patch) +sha256sums=('e6a4819a3b82b1ca6c45296e50e6c9ab653306eeb540e50ba8683e339565992e' 'SKIP' - '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014' - 'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894' - 'e466789015e15be9409b7a7044353674ca6aa0f392e882217f90c79821fe2630' - '73b9804393381f2c278eff63fecbd05035264dbb2aa68dd263a14db9f981a668') + '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c' + 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' + 'bfe15651a99ac6d0037867c9db00a0d4340353cdc0ac4a39e43ad61cc2589ed6' + '46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25' + '74440d292e76426ac5cba9058a6f86763c37a9aa61b7afc47771140f1f53870b' + 'e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com> # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -53,41 +60,44 @@ prepare() { mkdir mozbuild cd firefox-$pkgver - # Avoid relinking during buildsymbols - patch -Np1 -i ../no-relinking.patch + # https://bugzilla.mozilla.org/show_bug.cgi?id=1803016 + patch -Np1 -i ../0001-Bug-1803016-Wayland-Don-t-commit-wl_buffer-if-buffer.patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 - patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch + #https://aur.archlinux.org/packages/firefox-appmenu nicman32 comment 2021-08-16 + patch -Np1 -i ../fix-wayland-build.patch # actual appmenu patch from ubuntu repos + # http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_80.0+build2-0ubuntu0.16.04.1.debian.tar.xz patch -Np1 -i ../unity-menubar.patch + #fix csd window buttons patch + patch -Np1 -i ../fix_csd_window_buttons.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-hardening ac_add_options --enable-optimize ac_add_options --enable-rust-simd -export CC='clang --target=x86_64-unknown-linux-gnu' -export CXX='clang++ --target=x86_64-unknown-linux-gnu' -export AR=llvm-ar -export NM=llvm-nm -export RANLIB=llvm-ranlib +ac_add_options --enable-linker=lld +ac_add_options --disable-elf-hack +ac_add_options --disable-bootstrap +ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot # 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//-/} -export MOZ_TELEMETRY_REPORTING=1 -export MOZ_REQUIRE_SIGNING=1 # Keys ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-key @@ -101,9 +111,7 @@ ac_add_options --with-system-nss # Features ac_add_options --enable-alsa ac_add_options --enable-jack -ac_add_options --enable-startup-notification ac_add_options --enable-crashreporter -ac_add_options --disable-gconf ac_add_options --disable-updater ac_add_options --disable-tests END @@ -114,61 +122,53 @@ build() { export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="$srcdir/mozbuild" + export MOZ_ENABLE_FULL_SYMBOLS=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip # LTO needs more open files ulimit -n 4096 - # -fno-plt with cross-LTO causes obscure LLVM errors - # LLVM ERROR: Function Import: link error - CFLAGS="${CFLAGS/-fno-plt/}" - CXXFLAGS="${CXXFLAGS/-fno-plt/}" - # Do 3-tier PGO - msg2 "Building instrumented browser..." + echo "Building instrumented browser..." cat >.mozconfig ../mozconfig - <<END ac_add_options --enable-profile-generate=cross END ./mach build - msg2 "Profiling instrumented browser..." + echo "Profiling instrumented browser..." ./mach package LLVM_PROFDATA=llvm-profdata \ JARLOG_FILE="$PWD/jarlog" \ - xvfb-run -a -n 92 -s "-screen 0 1600x1200x24" \ + xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" \ ./mach python build/pgo/profileserver.py - if ! compgen -G '*.profraw' >&2; then - error "No profile data produced." - return 1 - fi + stat -c "Profile data found (%s bytes)" merged.profdata + test -s merged.profdata - if [[ ! -s jarlog ]]; then - error "No jar log produced." - return 1 - fi + stat -c "Jar log found (%s bytes)" jarlog + test -s jarlog - msg2 "Removing instrumented browser..." + echo "Removing instrumented browser..." ./mach clobber - msg2 "Building optimized browser..." + echo "Building optimized browser..." cat >.mozconfig ../mozconfig - <<END ac_add_options --enable-lto=cross ac_add_options --enable-profile-use=cross -ac_add_options --with-pgo-profile-path=${PWD@Q} +ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog END ./mach build - msg2 "Building symbol archive..." + echo "Building symbol archive..." ./mach buildsymbols } - package() { cd firefox-$pkgver DESTDIR="$pkgdir" ./mach install - local vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" + 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", ""); @@ -179,12 +179,11 @@ pref("spellchecker.dictionary_path", "/usr/share/hunspell"); // Disable default browser checking. pref("browser.shell.checkDefaultBrowser", false); -// Don't disable our bundled extensions in the application directory +// Don't disable extensions in the application directory pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); END - local distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" + local distini="$pkgdir/usr/lib/$_pkgname/distribution/distribution.ini" install -Dvm644 /dev/stdin "$distini" <<END [Global] id=archlinux @@ -197,17 +196,19 @@ app.distributor.channel=$_pkgname app.partner.archlinux=archlinux END - local i + local i theme=official for i in 16 22 24 32 48 64 128 256; do - install -Dvm644 browser/branding/official/default$i.png \ + install -Dvm644 browser/branding/$theme/default$i.png \ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgname.png" done - install -Dvm644 browser/branding/official/content/about-logo.png \ + install -Dvm644 browser/branding/$theme/content/about-logo.png \ "$pkgdir/usr/share/icons/hicolor/192x192/apps/$_pkgname.png" - install -Dvm644 browser/branding/official/content/about-logo@2x.png \ + install -Dvm644 browser/branding/$theme/content/about-logo@2x.png \ "$pkgdir/usr/share/icons/hicolor/384x384/apps/$_pkgname.png" - install -Dvm644 ../firefox-symbolic.svg \ - "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$_pkgname-symbolic.svg" + 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" @@ -220,20 +221,19 @@ 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" + ln -srfv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/lib/$_pkgname/firefox-bin" # Use system certificates - local nssckbi="$pkgdir/usr/lib/$pkgname/libnssckbi.so" + local nssckbi="$pkgdir/usr/lib/$_pkgname/libnssckbi.so" if [[ -e $nssckbi ]]; then ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi" fi - if [[ -f "$startdir/.crash-stats-api.token" ]]; then - find . -name '*crashreporter-symbols-full.zip' -exec \ - "$startdir/upload-symbol-archive" "$startdir/.crash-stats-api.token" {} + + export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE="$startdir/.crash-stats-api.token" + if [[ -f $SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE ]]; then + make -C obj uploadsymbols else - find . -name '*crashreporter-symbols-full.zip' -exec \ - cp -fvt "$startdir" {} + + cp -fvt "$startdir" obj/dist/*crashreporter-symbols-full.tar.zst fi } |