diff --git a/firefox/.signature b/firefox/.signature index f9e51822b..cd5af47cb 100644 --- a/firefox/.signature +++ b/firefox/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38FdfRdMPBv9cpcToo/NBzom8r1LQV2Np7FUqtA4isiBokSM1m2+au45H7PezqJ1a4IltR8R3W6K55Ee24ybqAk= -SHA256 (Pkgfile) = 3a000599d369e2f035cfced99727468894a6135645c7233afd4bca75e4564c2f +RWSagIOpLGJF3+fsBPtBVAJCf41dVP2SrY4EGNju453/D7WtqSp7S3Ay5oB2VjYONAGaDlY4cLEJGC9AFqQyzItiRf0WFBTi4gQ= +SHA256 (Pkgfile) = 68d7df9ef96254f08b45a3c7c1bb981d38369c37b1641292e9ede8847072cc6a SHA256 (.footprint) = d932c0f2d873abbf10fe3fd1a0d1dd95bf413717d06238eae7d85e86637aae53 -SHA256 (firefox-115.0.2esr.source.tar.xz) = 45723c83ea7dc318ec50d67eebf834163b626ec3924a3131fecddfc7268a95f5 +SHA256 (firefox-115.0.3esr.source.tar.xz) = 0bcc571c44f94ac6b8c26e896fd771eb7bd41b2a8ec35598bced0102c1b855fa SHA256 (firefox.desktop) = 05bd1a4e283bc68f525f87cabf35ad0a59e5e63e107ce3901a4ac73e3d16ef33 SHA256 (node-stdout-nonblocking-wrapper) = bb8c503015e49ed1b152225bdc56cf502cd831f35962d113dcbb9121967f3523 diff --git a/firefox/Pkgfile b/firefox/Pkgfile index faf55ccd8..d82175bc8 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -1,11 +1,11 @@ # Description: The Mozilla Firefox browser with Alsa support # URL: https://www.mozilla.com/firefox/ # Maintainer: John McQuah, jmcquah at disroot dot org -# Depends on: aom autoconf-2.13 brotli cbindgen dav1d dbus-glib ffmpeg graphite2 libevent libnotify libvpx libwebp libxkbcommon nodejs nss unzip xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxt zip -# Optional: sccache lld wasi-libc++ alsa-lib pulseaudio jack pipewire +# Depends on: alsa-lib aom autoconf-2.13 brotli cbindgen dav1d dbus-glib ffmpeg graphite2 libevent libnotify libvpx libwebp libxkbcommon nodejs nss unzip xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxt zip +# Optional: apulse jack pulseaudio pipewire sndio sccache lld wasi-libc++ name=firefox -version=115.0.2 +version=115.0.3 release=1 source=(https://ftp.mozilla.org/pub/firefox/releases/${version}esr/source/$name-${version}esr.source.tar.xz firefox.desktop @@ -68,11 +68,11 @@ cat <<- EOF > .mozconfig EOF # audio - prt-get isinst alsa-lib && PKGMK_FFAUDIO=",alsa" - prt-get isinst pulseaudio && PKGMK_FFAUDIO+=",pulseaudio" + PKGMK_FFAUDIO="alsa" + [ -e /usr/lib/libpulse.so -o -e /usr/lib/apulse/libpulse.so ] && PKGMK_FFAUDIO+=",pulseaudio" [ -e /usr/lib/libjack.so ] && PKGMK_FFAUDIO+=",jack" [ -e /usr/lib/libsndio.so ] && PKGMK_FFAUDIO+=",sndio" - echo "ac_add_options --enable-audio-backends=${PKGMK_FFAUDIO#,}" >> .mozconfig + echo "ac_add_options --enable-audio-backends=${PKGMK_FFAUDIO}" >> .mozconfig prt-get isinst wayland-protocols && \ echo 'ac_add_options --enable-default-toolkit=cairo-gtk3-wayland' >> .mozconfig || \ @@ -106,10 +106,10 @@ EOF # Disable notification when build system has finished export MOZ_NOSPAM=1 - # Use system's Python environment - export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach + # Specify the Python environment to use #export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip + export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach mkdir $SRC/bin ln -s /usr/bin/pip3 $SRC/bin/pip ln -s /usr/bin/python3 $SRC/bin/python