diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 5866b0f02b..ffa505579e 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -154,7 +154,8 @@ jobs: - name: Free additional disk space (if necessary) run: | - if grep -q '^clvk$\|^dart$\|^rust$\|^rustc-nightly$' ./built_termux-main_packages.txt; then + if grep -q '^clvk$\|^dart$\|^rust$\|^rustc-nightly$' ./built_termux-main_packages.txt || \ + grep -q '^firefox$' ./built_termux-x11_packages.txt; then echo "Free additional disk space on host" sudo apt purge -yq $(dpkg -l | grep '^ii' | awk '{ print $2 }' | grep -P '(cabal-|dotnet-|ghc-|libmono|php|aspnetcore)') \ mono-runtime-common monodoc-manual ruby diff --git a/x11-packages/firefox/build.sh b/x11-packages/firefox/build.sh index c0bd645536..d019bea3de 100644 --- a/x11-packages/firefox/build.sh +++ b/x11-packages/firefox/build.sh @@ -2,9 +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=113.0 +TERMUX_PKG_VERSION=114.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=7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627 +TERMUX_PKG_SHA256=d23a0502742f52110ce496837ba82b47bf38d40585633787508ae5be9a5b4bc6 # ffmpeg and pulseaudio are dependencies through dlopen(3): TERMUX_PKG_DEPENDS="at-spi2-atk, ffmpeg, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libandroid-shmem, libandroid-sysv-semaphore, libc++, libcairo, libevent, libffi, libice, libicu, libjpeg-turbo, libnspr, libnss, libpixman, libsm, libvpx, libwebp, libx11, libxcb, libxcomposite, libxcursor, libxdamage, libxext, libxfixes, libxi, libxrandr, libxrender, libxtst, pango, pulseaudio" TERMUX_PKG_BUILD_DEPENDS="libcpufeatures" diff --git a/x11-packages/firefox/firefox.patch b/x11-packages/firefox/firefox.patch index 033f029b27..3406cd7af8 100644 --- a/x11-packages/firefox/firefox.patch +++ b/x11-packages/firefox/firefox.patch @@ -359,11 +359,10 @@ diff -uNr firefox-105.0.3/toolkit/moz.configure firefox-105.0.3.mod/toolkit/moz. ) # Smart card support -diff -uNr firefox-105.0.3/toolkit/xre/glxtest.cpp firefox-105.0.3.mod/toolkit/xre/glxtest.cpp ---- firefox-105.0.3/toolkit/xre/glxtest.cpp 2022-10-08 00:25:42.000000000 +0900 -+++ firefox-105.0.3.mod/toolkit/xre/glxtest.cpp 2022-10-17 19:31:36.885513927 +0900 -@@ -1175,7 +1175,9 @@ - glxtest_bufsize = bufsize; +--- a/toolkit/xre/glxtest/glxtest.cpp ++++ b/toolkit/xre/glxtest/glxtest.cpp +@@ -946,7 +946,9 @@ + log("GLX_TEST: childgltest start\n"); // Get a list of all GPUs from the PCI bus. +#if !defined(__TERMUX__) @@ -371,7 +370,7 @@ diff -uNr firefox-105.0.3/toolkit/xre/glxtest.cpp firefox-105.0.3.mod/toolkit/xr +#endif #ifdef MOZ_WAYLAND - if (IsWaylandEnabled()) { + if (aWayland) { diff -uNr firefox-105.0.3/js/src/ctypes/libffi/src/closures.c firefox-105.0.3.mod/js/src/ctypes/libffi/src/closures.c --- firefox-105.0.3/js/src/ctypes/libffi/src/closures.c 2022-10-07 22:37:49.000000000 +0900 +++ firefox-105.0.3.mod/js/src/ctypes/libffi/src/closures.c 2022-10-17 19:42:34.472896402 +0900