From e810a9cdbc2c59d5bbe6a468c24c1b4c63b5a7b4 Mon Sep 17 00:00:00 2001 From: Luis Date: Tue, 13 Jun 2023 10:56:57 +0000 Subject: [PATCH] firefox: update spkgbuild --- main/firefox/.pkgfiles | 11 +-- main/firefox/spkgbuild | 162 +++++++++++++++++++++-------------------- 2 files changed, 91 insertions(+), 82 deletions(-) diff --git a/main/firefox/.pkgfiles b/main/firefox/.pkgfiles index a5f0bf375..71b8ecf80 100644 --- a/main/firefox/.pkgfiles +++ b/main/firefox/.pkgfiles @@ -6,6 +6,12 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ lrwxrwxrwx root/root usr/bin/firefox -> /usr/lib/firefox/firefox drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/browser/ +drwxr-xr-x root/root usr/lib/browser/defaults/ +drwxr-xr-x root/root usr/lib/browser/defaults/preferences/ +-rw-r--r-- root/root usr/lib/browser/defaults/preferences/vendor.js +drwxr-xr-x root/root usr/lib/distribution/ +-rw-r--r-- root/root usr/lib/distribution/distribution.ini drwxr-xr-x root/root usr/lib/firefox/ -rw-r--r-- root/root usr/lib/firefox/application.ini drwxr-xr-x root/root usr/lib/firefox/browser/ @@ -17,16 +23,11 @@ drwxr-xr-x root/root usr/lib/firefox/browser/chrome/icons/default/ -rw-r--r-- root/root usr/lib/firefox/browser/chrome/icons/default/default32.png -rw-r--r-- root/root usr/lib/firefox/browser/chrome/icons/default/default48.png -rw-r--r-- root/root usr/lib/firefox/browser/chrome/icons/default/default64.png -drwxr-xr-x root/root usr/lib/firefox/browser/defaults/ -drwxr-xr-x root/root usr/lib/firefox/browser/defaults/preferences/ --rw-r--r-- root/root usr/lib/firefox/browser/defaults/preferences/vendor.js -rw-r--r-- root/root usr/lib/firefox/browser/omni.ja drwxr-xr-x root/root usr/lib/firefox/defaults/ drwxr-xr-x root/root usr/lib/firefox/defaults/pref/ -rw-r--r-- root/root usr/lib/firefox/defaults/pref/channel-prefs.js -rw-r--r-- root/root usr/lib/firefox/dependentlibs.list -drwxr-xr-x root/root usr/lib/firefox/distribution/ --rw-r--r-- root/root usr/lib/firefox/distribution/distribution.ini -rwxr-xr-x root/root usr/lib/firefox/firefox -rwxr-xr-x root/root usr/lib/firefox/firefox-bin drwxr-xr-x root/root usr/lib/firefox/fonts/ diff --git a/main/firefox/spkgbuild b/main/firefox/spkgbuild index 8a2597b56..59f2d242d 100644 --- a/main/firefox/spkgbuild +++ b/main/firefox/spkgbuild @@ -1,5 +1,7 @@ -# description : Stand-alone browser based on the Mozilla codebase -# depends : alsa-lib autoconf2.13 cbindgen clang dav1d dbus-glib ffmpeg gtk3 hicolor-icon-theme icu libevent libffi libjpeg-turbo libnotify libpng libvpx libxrender libxcomposite libsm libxt libxdamage libxscrnsaver libwebp lld nasm nodejs nspr nss perl pixman pkgconf python3 rust yasm unzip zip zlib +# description : Standalone web browser from mozilla.org +# homepage : https://www.mozilla.org/firefox/ +# depends : autoconf2.13 cbindgen clang dbus-glib ffmpeg hicolor-icon-theme libevent libffi libnotify +# depends : libxrender libxt libxdamage libxscrnsaver libwebp lld nodejs nspr nss pkgconf rust unzip name=firefox version=114.0.1 @@ -8,112 +10,118 @@ source="$name-$version.tar.xz::https://archive.mozilla.org/pub/firefox/releases/ $name.desktop" build() { - cd $name-$version - mkdir "$SRC/rust" - export CARGO_HOME="$SRC/rust" + cd $name-$version + mkdir "$SRC/rust" + export CARGO_HOME="$SRC/rust" cat <<- EOF > .mozconfig -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj unset MOZ_TELEMETRY_REPORTING ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +ac_add_options --disable-bootstrap +ac_add_options --disable-crashreporter +ac_add_options --disable-debug +ac_add_options --disable-debug-symbols +ac_add_options --disable-elf-hack +ac_add_options --disable-necko-wifi +ac_add_options --disable-parental-controls +ac_add_options --disable-tests +ac_add_options --disable-updater ac_add_options --enable-application=browser -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-png -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --with-system-webp -ac_add_options --without-wasm-sandboxed-libraries ac_add_options --enable-audio-backends=alsa -ac_add_options --enable-av1 -ac_add_options --enable-system-ffi -ac_add_options --enable-system-pixman +ac_add_options --enable-linker=lld +ac_add_options --enable-lto=thin +ac_add_options --enable-official-branding ac_add_options --enable-optimize ac_add_options --enable-release ac_add_options --enable-rust-simd ac_add_options --enable-sandbox -ac_add_options --disable-debug-symbols -ac_add_options --enable-official-branding +ac_add_options --enable-system-ffi +ac_add_options --enable-system-pixman ac_add_options --with-distribution-id=org.venomlinux -ac_add_options --enable-linker=lld -ac_add_options --enable-lto=thin -ac_add_options --disable-tests -ac_add_options --disable-debug-symbols -ac_add_options --disable-updater -ac_add_options --disable-crashreporter -ac_add_options --disable-necko-wifi -ac_add_options --disable-parental-controls -ac_add_options --disable-elf-hack +ac_add_options --with-system-icu +ac_add_options --with-system-jpeg +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-png +ac_add_options --with-system-webp +ac_add_options --with-system-zlib +ac_add_options --without-wasm-sandboxed-libraries EOF - # Audio - scratch isinstalled alsa-lib && echo 'ac_add_options --enable-alsa' >> .mozconfig - scratch isinstalled jack && echo 'ac_add_options --enable-jack' >> .mozconfig - scratch isinstalled pulseaudio && echo 'ac_add_options --enable-pulseaudio' >> .mozconfig + # audio + scratch isinstalled alsa-lib && echo 'ac_add_options --enable-alsa' >> .mozconfig + scratch isinstalled jack && echo 'ac_add_options --enable-jack' >> .mozconfig + scratch isinstalled pulseaudio && echo 'ac_add_options --enable-pulseaudio' >> .mozconfig - scratch isinstalled wayland-protocols && \ - echo 'ac_add_options --enable-default-toolkit=cairo-gtk3-wayland' >> .mozconfig || \ - echo 'ac_add_options --enable-default-toolkit=cairo-gtk3' >> .mozconfig + # wayland + scratch isinstalled wayland-protocols && \ + echo 'ac_add_options --enable-default-toolkit=cairo-gtk3-wayland' >> .mozconfig || \ + echo 'ac_add_options --enable-default-toolkit=cairo-gtk3' >> .mozconfig - scratch isinstalled ccache && echo 'ac_add_options --enable-ccache' >> .mozconfig + # ccache + scratch isinstalled ccache && echo 'ac_add_options --enable-ccache' >> .mozconfig - export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib RUSTFLAGS="-C opt-level=2 $RUSTFLAGS" - export MOZBUILD_STATE_PATH="$SRC"/mozbuild + export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib RUSTFLAGS="-C opt-level=2 $RUSTFLAGS" + export MOZBUILD_STATE_PATH="$SRC"/mozbuild + + # Disable notification when build system has finished + export MOZ_NOSPAM=1 - # Disable notification when build system has finished - export MOZ_NOSPAM=1 + # Python + export SHELL='/bin/sh' + export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip + + ./mach build + DESTDIR=$PKG ./mach install - # Use system's Python environment - export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach - export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip - mkdir $SRC/bin - ln -s /usr/bin/pip3 $SRC/bin/pip - ln -s /usr/bin/python3 $SRC/bin/python - export PATH="$SRC/bin:$PATH" + unset MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE MOZBUILD_STATE_PATH - # python/mach/mach/mixin/process.py fails to detect SHELL - export SHELL='/usr/bin/sh' - - ./mach build - DESTDIR=$PKG ./mach install - - unset MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE MOZBUILD_STATE_PATH - - local vendorjs="$PKG/usr/lib/$name/browser/defaults/preferences/vendor.js" + # Vendor + local vendorjs="$PKG/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" install -Dvm644 /dev/stdin "$vendorjs" < $PKG/etc/revdep.d/$name.conf + # Exclude library for revdep. + install -d $PKG/etc/revdep.d + echo "/usr/lib/firefox/" > $PKG/etc/revdep.d/$name.conf }