diff --git a/x11-packages/firefox/build.sh b/x11-packages/firefox/build.sh index f2a2a40fe1..e1d9a9c3ca 100644 --- a/x11-packages/firefox/build.sh +++ b/x11-packages/firefox/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.mozilla.org/firefox TERMUX_PKG_DESCRIPTION="Mozilla Firefox web browser" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="120.0.1" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="121.0" TERMUX_PKG_SRCURL=https://ftp.mozilla.org/pub/firefox/releases/${TERMUX_PKG_VERSION}/source/firefox-${TERMUX_PKG_VERSION}.source.tar.xz -TERMUX_PKG_SHA256=76e7bb2a144880158444d8e9014f4d080d219bd150c3db405b27e4c7e3959ae2 +TERMUX_PKG_SHA256=edc7a5159d23ff2a23e22bf5abe22231658cee2902b93b5889ee73958aa06aa4 # ffmpeg and pulseaudio are dependencies through dlopen(3): TERMUX_PKG_DEPENDS="ffmpeg, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libandroid-shmem, libc++, libcairo, libevent, libffi, libice, libicu, libjpeg-turbo, libnspr, libnss, libpixman, libsm, libvpx, libwebp, libx11, libxcb, libxcomposite, libxdamage, libxext, libxfixes, libxrandr, libxtst, pango, pulseaudio, zlib" TERMUX_PKG_BUILD_DEPENDS="libcpufeatures, libice, libsm" @@ -47,7 +46,7 @@ termux_pkg_auto_update() { termux_step_post_get_source() { local f="media/ffvpx/config_unix_aarch64.h" echo "Applying sed substitution to ${f}" - sed -i -E '/^#define (CONFIG_LINUX_PERF|HAVE_SYSCTL) /s/1$/0/' ${f} + sed -E '/^#define (CONFIG_LINUX_PERF|HAVE_SYSCTL) /s/1$/0/' -i ${f} } termux_step_pre_configure() { @@ -64,7 +63,9 @@ termux_step_pre_configure() { cargo install cbindgen - sed -i -e "s|%TERMUX_CARGO_TARGET_NAME%|$CARGO_TARGET_NAME|" $TERMUX_PKG_SRCDIR/build/moz.configure/rust.configure + sed \ + -e "s|@CARGO_TARGET_NAME@|${CARGO_TARGET_NAME}|" \ + -i "${TERMUX_PKG_SRCDIR}"/build/moz.configure/rust.configure export HOST_CC=$(command -v clang) export HOST_CXX=$(command -v clang++) @@ -75,41 +76,41 @@ termux_step_pre_configure() { } termux_step_configure() { - python3 $TERMUX_PKG_SRCDIR/configure.py \ - --target=$TERMUX_HOST_PLATFORM \ - --prefix=$TERMUX_PREFIX \ - --with-sysroot=$TERMUX_PREFIX \ + python3 "${TERMUX_PKG_SRCDIR}"/configure.py \ + --target=${TERMUX_HOST_PLATFORM} \ + --prefix=${TERMUX_PREFIX} \ + --with-sysroot=${TERMUX_PREFIX} \ + --allow-addon-sideload \ + --disable-accessibility \ + --disable-address-sanitizer-reporter \ + --disable-crashreporter \ + --disable-dbus \ + --disable-elf-hack \ + --disable-hardening \ + --disable-jemalloc \ + --disable-necko-wifi \ + --disable-parental-controls \ + --disable-synth-speechd \ + --disable-webspeech \ + --disable-sandbox \ + --disable-tests \ + --disable-updater \ --enable-audio-backends=pulseaudio \ --enable-minify=properties \ --enable-mobile-optimize \ --enable-printing \ - --disable-jemalloc \ --enable-system-ffi \ --enable-system-pixman \ + --with-branding=browser/branding/official \ --with-system-icu \ - --with-system-jpeg=$TERMUX_PREFIX \ + --with-system-jpeg=${TERMUX_PREFIX} \ --with-system-libevent \ --with-system-libvpx \ --with-system-nspr \ --with-system-nss \ --with-system-webp \ --with-system-zlib \ - --without-wasm-sandboxed-libraries \ - --with-branding=browser/branding/official \ - --disable-sandbox \ - --disable-tests \ - --disable-accessibility \ - --disable-crashreporter \ - --disable-dbus \ - --disable-necko-wifi \ - --disable-updater \ - --disable-hardening \ - --disable-parental-controls \ - --disable-webspeech \ - --disable-synth-speechd \ - --disable-elf-hack \ - --disable-address-sanitizer-reporter \ - --allow-addon-sideload + --without-wasm-sandboxed-libraries } termux_step_post_make_install() { diff --git a/x11-packages/firefox/firefox.patch b/x11-packages/firefox/firefox.patch index 57449a1646..d7549565bc 100644 --- a/x11-packages/firefox/firefox.patch +++ b/x11-packages/firefox/firefox.patch @@ -67,11 +67,11 @@ #define PREF_AUDIOIPC_STACK_SIZE "media.audioipc.stack_size" #define PREF_AUDIOIPC_SHM_AREA_SIZE "media.audioipc.shm_area_size" --#if (defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID)) || \ -+#if (defined(XP_LINUX) && !defined(__TERMUX__)) || \ - defined(XP_MACOSX) || defined(XP_WIN) +-#if defined(XP_LINUX) || defined(XP_MACOSX) || defined(XP_WIN) ++#if (defined(XP_LINUX) && !defined(__TERMUX__)) || defined(XP_MACOSX) || defined(XP_WIN) # define MOZ_CUBEB_REMOTING #endif + --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -321,7 +321,7 @@ diff --git a/x11-packages/firefox/rust.configure.patch b/x11-packages/firefox/rust.configure.patch index a9151c8129..48175419cc 100644 --- a/x11-packages/firefox/rust.configure.patch +++ b/x11-packages/firefox/rust.configure.patch @@ -5,7 +5,7 @@ if rustc_target is None: - die("Don't know how to translate {} for rustc".format(host_or_target.alias)) -+ rustc_target = "%TERMUX_CARGO_TARGET_NAME%" ++ rustc_target = "@CARGO_TARGET_NAME@" return rustc_target