From ebef6544bb33887432e1bdf0ee56d57dc1cce8ed Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Fri, 29 Sep 2023 09:31:05 +0000 Subject: [PATCH] bump(x11/firefox): 118.0 (#17968) * bump(main/libnss): 3.93 --- packages/libnss/build.sh | 4 +- x11-packages/firefox/build.sh | 12 +- x11-packages/firefox/firefox.patch | 160 +++++++++--------- x11-packages/firefox/fix-arm-build.patch | 50 +++--- x11-packages/firefox/rust.configure.patch | 6 +- .../firefox/shared_memory_posix.cc.patch | 6 +- 6 files changed, 115 insertions(+), 123 deletions(-) diff --git a/packages/libnss/build.sh b/packages/libnss/build.sh index 125976dfb8..ada2a17e1d 100644 --- a/packages/libnss/build.sh +++ b/packages/libnss/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Network Security Services (NSS)" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_LICENSE_FILE="nss/COPYING" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.92 +TERMUX_PKG_VERSION=3.93 TERMUX_PKG_SRCURL=https://archive.mozilla.org/pub/security/nss/releases/NSS_${TERMUX_PKG_VERSION//./_}_RTM/src/nss-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=3db192d6e882039af02ae7eaf3217ed114bb7ad83414c646772ab8021e24a254 +TERMUX_PKG_SHA256=15f54bb72048eb105f8c0e936a04b899e74c3db9a19bbc1e00acee2af9476a8a TERMUX_PKG_DEPENDS="libnspr, libsqlite" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS=" diff --git a/x11-packages/firefox/build.sh b/x11-packages/firefox/build.sh index 79a3d6edd0..e83d1b24f0 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="117.0.1" +TERMUX_PKG_VERSION="118.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=7ea4203b5cf9e59f80043597e2c9020291754fcab784a337586b5f5e1370c416 +TERMUX_PKG_SHA256=d0f996116ae234dc7bd59e0d77ddefe268179d7500d16a9488309c826547c97c # 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" @@ -55,8 +55,12 @@ termux_step_pre_configure() { # https://github.com/rust-lang/rust/issues/49853 # https://github.com/rust-lang/rust/issues/45854 - # Out of memory when building gkrust on Arm - [[ "${TERMUX_ARCH}" == "arm" ]] && RUSTFLAGS+=" -C debuginfo=0" + # Out of memory when building gkrust + # CI shows (signal: 9, SIGKILL: kill) + case "${TERMUX_ARCH}" in + aarch64) RUSTFLAGS+=" -C debuginfo=0" ;; + arm) RUSTFLAGS+=" -C debuginfo=0" ;; + esac cargo install cbindgen diff --git a/x11-packages/firefox/firefox.patch b/x11-packages/firefox/firefox.patch index 8ac469202f..932549595b 100644 --- a/x11-packages/firefox/firefox.patch +++ b/x11-packages/firefox/firefox.patch @@ -1,6 +1,6 @@ -diff -uNr firefox-117.0/browser/moz.configure firefox-117.0.mod/browser/moz.configure ---- firefox-117.0/browser/moz.configure 2023-08-25 02:33:47.000000000 +0800 -+++ firefox-117.0.mod/browser/moz.configure 2023-08-30 19:58:42.954671773 +0800 +diff -uNr firefox-118.0/browser/moz.configure firefox-118.0.mod/browser/moz.configure +--- firefox-118.0/browser/moz.configure 2023-09-19 01:41:14.000000000 +0800 ++++ firefox-118.0.mod/browser/moz.configure 2023-09-28 02:38:09.135038018 +0800 @@ -5,11 +5,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -15,9 +15,9 @@ diff -uNr firefox-117.0/browser/moz.configure firefox-117.0.mod/browser/moz.conf with only_when(target_has_linux_kernel & compile_environment): option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper") -diff -uNr firefox-117.0/build/autoconf/android.m4 firefox-117.0.mod/build/autoconf/android.m4 ---- firefox-117.0/build/autoconf/android.m4 2023-08-25 02:33:47.000000000 +0800 -+++ firefox-117.0.mod/build/autoconf/android.m4 2023-08-30 19:58:42.958671773 +0800 +diff -uNr firefox-118.0/build/autoconf/android.m4 firefox-118.0.mod/build/autoconf/android.m4 +--- firefox-118.0/build/autoconf/android.m4 2023-09-19 01:41:14.000000000 +0800 ++++ firefox-118.0.mod/build/autoconf/android.m4 2023-09-28 02:38:09.135038018 +0800 @@ -6,7 +6,7 @@ [ @@ -27,9 +27,9 @@ diff -uNr firefox-117.0/build/autoconf/android.m4 firefox-117.0.mod/build/autoco dnl $extra_android_flags will be set for us by Python configure. dnl $_topsrcdir/build/android is a hack for versions of rustc < 1.68 LDFLAGS="$extra_android_flags -L$_topsrcdir/build/android $LDFLAGS" -diff -uNr firefox-117.0/build/moz.configure/init.configure firefox-117.0.mod/build/moz.configure/init.configure ---- firefox-117.0/build/moz.configure/init.configure 2023-08-25 02:33:47.000000000 +0800 -+++ firefox-117.0.mod/build/moz.configure/init.configure 2023-08-30 19:58:42.962671773 +0800 +diff -uNr firefox-118.0/build/moz.configure/init.configure firefox-118.0.mod/build/moz.configure/init.configure +--- firefox-118.0/build/moz.configure/init.configure 2023-09-19 02:27:27.000000000 +0800 ++++ firefox-118.0.mod/build/moz.configure/init.configure 2023-09-28 02:38:09.139038018 +0800 @@ -500,7 +500,7 @@ abi = None sub_configure_alias = triplet @@ -39,21 +39,21 @@ diff -uNr firefox-117.0/build/moz.configure/init.configure firefox-117.0.mod/bui canonical_kernel = "Linux" elif os.startswith("linux"): canonical_os = "GNU" -diff -uNr firefox-117.0/build/moz.configure/pkg.configure firefox-117.0.mod/build/moz.configure/pkg.configure ---- firefox-117.0/build/moz.configure/pkg.configure 2023-08-25 02:33:47.000000000 +0800 -+++ firefox-117.0.mod/build/moz.configure/pkg.configure 2023-08-30 19:58:42.962671773 +0800 +diff -uNr firefox-118.0/build/moz.configure/pkg.configure firefox-118.0.mod/build/moz.configure/pkg.configure +--- firefox-118.0/build/moz.configure/pkg.configure 2023-09-19 01:41:14.000000000 +0800 ++++ firefox-118.0.mod/build/moz.configure/pkg.configure 2023-09-28 02:45:51.175038045 +0800 @@ -56,7 +56,7 @@ @imports(_from="os", _import="environ") @imports(_from="os", _import="pathsep") def pkg_config_vars(target, sysroot_path, multiarch_dir): - if sysroot_path and target.kernel != "Darwin": + if False: - return namespace( - PKG_CONFIG_PATH="", - PKG_CONFIG_SYSROOT_DIR=sysroot_path, -diff -uNr firefox-117.0/build/moz.configure/toolchain.configure firefox-117.0.mod/build/moz.configure/toolchain.configure ---- firefox-117.0/build/moz.configure/toolchain.configure 2023-08-25 02:33:47.000000000 +0800 -+++ firefox-117.0.mod/build/moz.configure/toolchain.configure 2023-08-30 19:58:42.966671773 +0800 + pkgconfig_dirs = [ + "usr/lib/pkgconfig", + "usr/lib/{}/pkgconfig".format(multiarch_dir), +diff -uNr firefox-118.0/build/moz.configure/toolchain.configure firefox-118.0.mod/build/moz.configure/toolchain.configure +--- firefox-118.0/build/moz.configure/toolchain.configure 2023-09-19 02:27:27.000000000 +0800 ++++ firefox-118.0.mod/build/moz.configure/toolchain.configure 2023-09-28 02:38:09.143038018 +0800 @@ -1256,7 +1256,7 @@ ): wrapper = list(compiler_wrapper or ()) @@ -82,9 +82,9 @@ diff -uNr firefox-117.0/build/moz.configure/toolchain.configure firefox-117.0.mo def die_on_old_libstdcxx(): -diff -uNr firefox-117.0/dom/media/CubebUtils.cpp firefox-117.0.mod/dom/media/CubebUtils.cpp ---- firefox-117.0/dom/media/CubebUtils.cpp 2023-08-25 02:33:48.000000000 +0800 -+++ firefox-117.0.mod/dom/media/CubebUtils.cpp 2023-08-30 19:58:42.970671773 +0800 +diff -uNr firefox-118.0/dom/media/CubebUtils.cpp firefox-118.0.mod/dom/media/CubebUtils.cpp +--- firefox-118.0/dom/media/CubebUtils.cpp 2023-09-19 01:41:15.000000000 +0800 ++++ firefox-118.0.mod/dom/media/CubebUtils.cpp 2023-09-28 02:38:09.147038018 +0800 @@ -57,7 +57,7 @@ #define PREF_AUDIOIPC_STACK_SIZE "media.audioipc.stack_size" #define PREF_AUDIOIPC_SHM_AREA_SIZE "media.audioipc.shm_area_size" @@ -94,10 +94,10 @@ diff -uNr firefox-117.0/dom/media/CubebUtils.cpp firefox-117.0.mod/dom/media/Cub defined(XP_MACOSX) || defined(XP_WIN) # define MOZ_CUBEB_REMOTING #endif -diff -uNr firefox-117.0/dom/media/moz.build firefox-117.0.mod/dom/media/moz.build ---- firefox-117.0/dom/media/moz.build 2023-08-25 02:33:48.000000000 +0800 -+++ firefox-117.0.mod/dom/media/moz.build 2023-08-30 19:58:42.970671773 +0800 -@@ -324,7 +324,7 @@ +diff -uNr firefox-118.0/dom/media/moz.build firefox-118.0.mod/dom/media/moz.build +--- firefox-118.0/dom/media/moz.build 2023-09-19 02:27:27.000000000 +0800 ++++ firefox-118.0.mod/dom/media/moz.build 2023-09-28 02:38:09.147038018 +0800 +@@ -321,7 +321,7 @@ "XiphExtradata.cpp", ] @@ -106,10 +106,10 @@ diff -uNr firefox-117.0/dom/media/moz.build firefox-117.0.mod/dom/media/moz.buil UNIFIED_SOURCES += ["UnderrunHandlerLinux.cpp"] else: UNIFIED_SOURCES += ["UnderrunHandlerNoop.cpp"] -diff -uNr firefox-117.0/dom/media/systemservices/VideoEngine.cpp firefox-117.0.mod/dom/media/systemservices/VideoEngine.cpp ---- firefox-117.0/dom/media/systemservices/VideoEngine.cpp 2023-08-25 02:33:48.000000000 +0800 -+++ firefox-117.0.mod/dom/media/systemservices/VideoEngine.cpp 2023-08-30 19:58:42.982671773 +0800 -@@ -24,7 +24,7 @@ +diff -uNr firefox-118.0/dom/media/systemservices/VideoEngine.cpp firefox-118.0.mod/dom/media/systemservices/VideoEngine.cpp +--- firefox-118.0/dom/media/systemservices/VideoEngine.cpp 2023-09-19 01:41:16.000000000 +0800 ++++ firefox-118.0.mod/dom/media/systemservices/VideoEngine.cpp 2023-09-28 02:38:09.151038018 +0800 +@@ -30,7 +30,7 @@ #define LOG(args) MOZ_LOG(gVideoEngineLog, mozilla::LogLevel::Debug, args) #define LOG_ENABLED() MOZ_LOG_TEST(gVideoEngineLog, mozilla::LogLevel::Debug) @@ -118,9 +118,9 @@ diff -uNr firefox-117.0/dom/media/systemservices/VideoEngine.cpp firefox-117.0.m int VideoEngine::SetAndroidObjects() { LOG(("%s", __PRETTY_FUNCTION__)); -diff -uNr firefox-117.0/ipc/chromium/src/base/lock_impl_posix.cc firefox-117.0.mod/ipc/chromium/src/base/lock_impl_posix.cc ---- firefox-117.0/ipc/chromium/src/base/lock_impl_posix.cc 2023-08-25 02:33:49.000000000 +0800 -+++ firefox-117.0.mod/ipc/chromium/src/base/lock_impl_posix.cc 2023-08-30 19:58:42.986671773 +0800 +diff -uNr firefox-118.0/ipc/chromium/src/base/lock_impl_posix.cc firefox-118.0.mod/ipc/chromium/src/base/lock_impl_posix.cc +--- firefox-118.0/ipc/chromium/src/base/lock_impl_posix.cc 2023-09-19 01:41:17.000000000 +0800 ++++ firefox-118.0.mod/ipc/chromium/src/base/lock_impl_posix.cc 2023-09-28 02:38:09.151038018 +0800 @@ -22,7 +22,7 @@ // Lock::PriorityInheritanceAvailable still must be checked as the code may // compile but the underlying platform still may not correctly support priority @@ -130,9 +130,9 @@ diff -uNr firefox-117.0/ipc/chromium/src/base/lock_impl_posix.cc firefox-117.0.m # define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 0 #else # define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 1 -diff -uNr firefox-117.0/js/src/ctypes/libffi/src/closures.c firefox-117.0.mod/js/src/ctypes/libffi/src/closures.c ---- firefox-117.0/js/src/ctypes/libffi/src/closures.c 2023-08-25 02:33:50.000000000 +0800 -+++ firefox-117.0.mod/js/src/ctypes/libffi/src/closures.c 2023-08-30 19:58:42.986671773 +0800 +diff -uNr firefox-118.0/js/src/ctypes/libffi/src/closures.c firefox-118.0.mod/js/src/ctypes/libffi/src/closures.c +--- firefox-118.0/js/src/ctypes/libffi/src/closures.c 2023-09-19 01:41:17.000000000 +0800 ++++ firefox-118.0.mod/js/src/ctypes/libffi/src/closures.c 2023-09-28 02:38:09.151038018 +0800 @@ -112,7 +112,7 @@ #else /* !NetBSD with PROT_MPROTECT */ @@ -142,9 +142,9 @@ diff -uNr firefox-117.0/js/src/ctypes/libffi/src/closures.c firefox-117.0.mod/js /* This macro indicates it may be forbidden to map anonymous memory with both write and execute permission. Code compiled when this option is defined will attempt to map such pages once, but if it -diff -uNr firefox-117.0/memory/build/Mutex.h firefox-117.0.mod/memory/build/Mutex.h ---- firefox-117.0/memory/build/Mutex.h 2023-08-25 02:33:53.000000000 +0800 -+++ firefox-117.0.mod/memory/build/Mutex.h 2023-08-30 19:58:42.990671773 +0800 +diff -uNr firefox-118.0/memory/build/Mutex.h firefox-118.0.mod/memory/build/Mutex.h +--- firefox-118.0/memory/build/Mutex.h 2023-09-19 01:41:21.000000000 +0800 ++++ firefox-118.0.mod/memory/build/Mutex.h 2023-09-28 02:38:09.155038018 +0800 @@ -57,7 +57,7 @@ } #elif defined(XP_DARWIN) @@ -154,7 +154,7 @@ diff -uNr firefox-117.0/memory/build/Mutex.h firefox-117.0.mod/memory/build/Mute pthread_mutexattr_t attr; if (pthread_mutexattr_init(&attr) != 0) { return false; -@@ -173,7 +173,7 @@ +@@ -142,7 +142,7 @@ # if defined(XP_DARWIN) # define STATIC_MUTEX_INIT OS_UNFAIR_LOCK_INIT @@ -163,9 +163,9 @@ diff -uNr firefox-117.0/memory/build/Mutex.h firefox-117.0.mod/memory/build/Mute # define STATIC_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP # else # define STATIC_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER -diff -uNr firefox-117.0/memory/build/malloc_decls.h firefox-117.0.mod/memory/build/malloc_decls.h ---- firefox-117.0/memory/build/malloc_decls.h 2023-08-25 02:33:54.000000000 +0800 -+++ firefox-117.0.mod/memory/build/malloc_decls.h 2023-08-30 19:58:42.990671773 +0800 +diff -uNr firefox-118.0/memory/build/malloc_decls.h firefox-118.0.mod/memory/build/malloc_decls.h +--- firefox-118.0/memory/build/malloc_decls.h 2023-09-19 01:41:21.000000000 +0800 ++++ firefox-118.0.mod/memory/build/malloc_decls.h 2023-09-28 02:38:09.155038018 +0800 @@ -39,7 +39,7 @@ // consistent declare certain functions as `throw()`, though. @@ -175,9 +175,9 @@ diff -uNr firefox-117.0/memory/build/malloc_decls.h firefox-117.0.mod/memory/bui # undef NOTHROW_MALLOC_DECL # define NOTHROW_MALLOC_DECL MALLOC_DECL // Some places don't care about the distinction. -diff -uNr firefox-117.0/modules/zlib/src/gzguts.h firefox-117.0.mod/modules/zlib/src/gzguts.h ---- firefox-117.0/modules/zlib/src/gzguts.h 2023-08-25 02:33:55.000000000 +0800 -+++ firefox-117.0.mod/modules/zlib/src/gzguts.h 2023-08-30 19:58:42.994671773 +0800 +diff -uNr firefox-118.0/modules/zlib/src/gzguts.h firefox-118.0.mod/modules/zlib/src/gzguts.h +--- firefox-118.0/modules/zlib/src/gzguts.h 2023-09-19 01:41:22.000000000 +0800 ++++ firefox-118.0.mod/modules/zlib/src/gzguts.h 2023-09-28 02:38:09.155038018 +0800 @@ -3,6 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -187,9 +187,9 @@ diff -uNr firefox-117.0/modules/zlib/src/gzguts.h firefox-117.0.mod/modules/zlib #ifdef _LARGEFILE64_SOURCE # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1 -diff -uNr firefox-117.0/mozglue/misc/ConditionVariable_posix.cpp firefox-117.0.mod/mozglue/misc/ConditionVariable_posix.cpp ---- firefox-117.0/mozglue/misc/ConditionVariable_posix.cpp 2023-08-25 02:33:54.000000000 +0800 -+++ firefox-117.0.mod/mozglue/misc/ConditionVariable_posix.cpp 2023-08-30 19:58:42.998671773 +0800 +diff -uNr firefox-118.0/mozglue/misc/ConditionVariable_posix.cpp firefox-118.0.mod/mozglue/misc/ConditionVariable_posix.cpp +--- firefox-118.0/mozglue/misc/ConditionVariable_posix.cpp 2023-09-19 01:41:21.000000000 +0800 ++++ firefox-118.0.mod/mozglue/misc/ConditionVariable_posix.cpp 2023-09-28 02:38:09.155038018 +0800 @@ -23,7 +23,7 @@ // Android 4.4 or earlier & macOS 10.12 has the clock functions, but not // pthread_condattr_setclock. @@ -199,9 +199,9 @@ diff -uNr firefox-117.0/mozglue/misc/ConditionVariable_posix.cpp firefox-117.0.m # define CV_USE_CLOCK_API #endif -diff -uNr firefox-117.0/mozglue/misc/StackWalk.cpp firefox-117.0.mod/mozglue/misc/StackWalk.cpp ---- firefox-117.0/mozglue/misc/StackWalk.cpp 2023-08-25 02:33:54.000000000 +0800 -+++ firefox-117.0.mod/mozglue/misc/StackWalk.cpp 2023-08-30 19:58:42.998671773 +0800 +diff -uNr firefox-118.0/mozglue/misc/StackWalk.cpp firefox-118.0.mod/mozglue/misc/StackWalk.cpp +--- firefox-118.0/mozglue/misc/StackWalk.cpp 2023-09-19 02:27:27.000000000 +0800 ++++ firefox-118.0.mod/mozglue/misc/StackWalk.cpp 2023-09-28 02:38:09.159038018 +0800 @@ -692,7 +692,7 @@ stackEnd = __libc_stack_end; # elif defined(XP_DARWIN) @@ -211,9 +211,9 @@ diff -uNr firefox-117.0/mozglue/misc/StackWalk.cpp firefox-117.0.mod/mozglue/mis pthread_attr_t sattr; pthread_attr_init(&sattr); pthread_getattr_np(pthread_self(), &sattr); -diff -uNr firefox-117.0/nsprpub/pr/src/pthreads/ptsynch.c firefox-117.0.mod/nsprpub/pr/src/pthreads/ptsynch.c ---- firefox-117.0/nsprpub/pr/src/pthreads/ptsynch.c 2023-08-25 02:33:55.000000000 +0800 -+++ firefox-117.0.mod/nsprpub/pr/src/pthreads/ptsynch.c 2023-08-30 19:58:43.002671773 +0800 +diff -uNr firefox-118.0/nsprpub/pr/src/pthreads/ptsynch.c firefox-118.0.mod/nsprpub/pr/src/pthreads/ptsynch.c +--- firefox-118.0/nsprpub/pr/src/pthreads/ptsynch.c 2023-09-19 01:41:21.000000000 +0800 ++++ firefox-118.0.mod/nsprpub/pr/src/pthreads/ptsynch.c 2023-09-28 02:38:09.163038018 +0800 @@ -953,7 +953,7 @@ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ || (defined(FREEBSD) && __FreeBSD_version < 1200059) \ @@ -223,9 +223,9 @@ diff -uNr firefox-117.0/nsprpub/pr/src/pthreads/ptsynch.c firefox-117.0.mod/nspr /* union semun is defined by including */ #else /* according to X/OPEN we have to define it ourselves */ -diff -uNr firefox-117.0/nsprpub/pr/src/pthreads/ptthread.c firefox-117.0.mod/nsprpub/pr/src/pthreads/ptthread.c ---- firefox-117.0/nsprpub/pr/src/pthreads/ptthread.c 2023-08-25 02:33:54.000000000 +0800 -+++ firefox-117.0.mod/nsprpub/pr/src/pthreads/ptthread.c 2023-08-30 19:58:43.002671773 +0800 +diff -uNr firefox-118.0/nsprpub/pr/src/pthreads/ptthread.c firefox-118.0.mod/nsprpub/pr/src/pthreads/ptthread.c +--- firefox-118.0/nsprpub/pr/src/pthreads/ptthread.c 2023-09-19 01:41:21.000000000 +0800 ++++ firefox-118.0.mod/nsprpub/pr/src/pthreads/ptthread.c 2023-09-28 02:38:09.163038018 +0800 @@ -37,6 +37,10 @@ #endif #endif @@ -237,9 +237,9 @@ diff -uNr firefox-117.0/nsprpub/pr/src/pthreads/ptthread.c firefox-117.0.mod/nsp /* * Record whether or not we have the privilege to set the scheduling * policy and priority of threads. 0 means that privilege is available. -diff -uNr firefox-117.0/old-configure.in firefox-117.0.mod/old-configure.in ---- firefox-117.0/old-configure.in 2023-08-25 02:33:54.000000000 +0800 -+++ firefox-117.0.mod/old-configure.in 2023-08-30 19:58:43.006671773 +0800 +diff -uNr firefox-118.0/old-configure.in firefox-118.0.mod/old-configure.in +--- firefox-118.0/old-configure.in 2023-09-19 02:27:27.000000000 +0800 ++++ firefox-118.0.mod/old-configure.in 2023-09-28 02:38:09.167038018 +0800 @@ -197,9 +197,6 @@ AC_MSG_CHECKING([for --noexecstack option to as]) _SAVE_CFLAGS=$CFLAGS @@ -250,9 +250,9 @@ diff -uNr firefox-117.0/old-configure.in firefox-117.0.mod/old-configure.in CFLAGS=$_SAVE_CFLAGS AC_MSG_CHECKING([for -z noexecstack option to ld]) _SAVE_LDFLAGS=$LDFLAGS -diff -uNr firefox-117.0/toolkit/components/extensions/storage/moz.build firefox-117.0.mod/toolkit/components/extensions/storage/moz.build ---- firefox-117.0/toolkit/components/extensions/storage/moz.build 2023-08-25 02:34:01.000000000 +0800 -+++ firefox-117.0.mod/toolkit/components/extensions/storage/moz.build 2023-08-30 19:58:43.010671773 +0800 +diff -uNr firefox-118.0/toolkit/components/extensions/storage/moz.build firefox-118.0.mod/toolkit/components/extensions/storage/moz.build +--- firefox-118.0/toolkit/components/extensions/storage/moz.build 2023-09-19 01:41:30.000000000 +0800 ++++ firefox-118.0.mod/toolkit/components/extensions/storage/moz.build 2023-09-28 02:38:09.167038018 +0800 @@ -17,7 +17,7 @@ # a delegate for consumers to use instead. Android Components can then provide # an implementation of the delegate that's backed by the Rust component. For @@ -262,9 +262,9 @@ diff -uNr firefox-117.0/toolkit/components/extensions/storage/moz.build firefox- EXPORTS.mozilla.extensions.storage += [ "ExtensionStorageComponents.h", ] -diff -uNr firefox-117.0/toolkit/library/rust/shared/Cargo.toml firefox-117.0.mod/toolkit/library/rust/shared/Cargo.toml ---- firefox-117.0/toolkit/library/rust/shared/Cargo.toml 2023-08-25 02:34:02.000000000 +0800 -+++ firefox-117.0.mod/toolkit/library/rust/shared/Cargo.toml 2023-08-30 19:58:43.014671773 +0800 +diff -uNr firefox-118.0/toolkit/library/rust/shared/Cargo.toml firefox-118.0.mod/toolkit/library/rust/shared/Cargo.toml +--- firefox-118.0/toolkit/library/rust/shared/Cargo.toml 2023-09-19 02:27:27.000000000 +0800 ++++ firefox-118.0.mod/toolkit/library/rust/shared/Cargo.toml 2023-09-28 02:38:09.167038018 +0800 @@ -106,11 +106,12 @@ # Since we're building with at least rustc 1.63, enable rust 1.57 features (use of try_reserve methods). fallible_collections = { version = "0.4", features = ["rust_1_57"] } @@ -280,9 +280,9 @@ diff -uNr firefox-117.0/toolkit/library/rust/shared/Cargo.toml firefox-117.0.mod [target.'cfg(target_os = "windows")'.dependencies] detect_win32k_conflicts = { path = "../../../xre/detect_win32k_conflicts" } -diff -uNr firefox-117.0/toolkit/library/rust/shared/lib.rs firefox-117.0.mod/toolkit/library/rust/shared/lib.rs ---- firefox-117.0/toolkit/library/rust/shared/lib.rs 2023-08-25 02:34:02.000000000 +0800 -+++ firefox-117.0.mod/toolkit/library/rust/shared/lib.rs 2023-08-30 19:58:43.014671773 +0800 +diff -uNr firefox-118.0/toolkit/library/rust/shared/lib.rs firefox-118.0.mod/toolkit/library/rust/shared/lib.rs +--- firefox-118.0/toolkit/library/rust/shared/lib.rs 2023-09-19 02:27:27.000000000 +0800 ++++ firefox-118.0.mod/toolkit/library/rust/shared/lib.rs 2023-09-28 02:38:09.171038018 +0800 @@ -52,10 +52,8 @@ #[cfg(not(target_os = "android"))] extern crate webext_storage_bridge; @@ -302,9 +302,9 @@ diff -uNr firefox-117.0/toolkit/library/rust/shared/lib.rs firefox-117.0.mod/too extern crate viaduct; extern crate gecko_logger; -diff -uNr firefox-117.0/toolkit/moz.configure firefox-117.0.mod/toolkit/moz.configure ---- firefox-117.0/toolkit/moz.configure 2023-08-25 02:34:02.000000000 +0800 -+++ firefox-117.0.mod/toolkit/moz.configure 2023-08-30 19:58:43.018671773 +0800 +diff -uNr firefox-118.0/toolkit/moz.configure firefox-118.0.mod/toolkit/moz.configure +--- firefox-118.0/toolkit/moz.configure 2023-09-19 02:27:27.000000000 +0800 ++++ firefox-118.0.mod/toolkit/moz.configure 2023-09-28 02:38:09.171038018 +0800 @@ -172,7 +172,7 @@ @depends(target) def midir_linux_support(target): @@ -332,7 +332,7 @@ diff -uNr firefox-117.0/toolkit/moz.configure firefox-117.0.mod/toolkit/moz.conf die("Cannot enable OpenSL on %s", target.os) return any("opensl" in value for value in values) or None -@@ -2196,6 +2196,8 @@ +@@ -2147,6 +2147,8 @@ set_config("MOZ_JPEG_CFLAGS", jpeg_flags.cflags) set_config("MOZ_JPEG_LIBS", jpeg_flags.ldflags) @@ -341,7 +341,7 @@ diff -uNr firefox-117.0/toolkit/moz.configure firefox-117.0.mod/toolkit/moz.conf @depends("--with-system-jpeg", target, neon_flags) def in_tree_jpeg_arm(system_jpeg, target, neon_flags): if system_jpeg: -@@ -3049,7 +3051,7 @@ +@@ -3016,7 +3018,7 @@ "MOZ_NORMANDY", ) def data_reporting(telemetry, healthreport, crashreporter, normandy): @@ -350,7 +350,7 @@ diff -uNr firefox-117.0/toolkit/moz.configure firefox-117.0.mod/toolkit/moz.conf set_config("MOZ_DATA_REPORTING", True, when=data_reporting) -@@ -3155,8 +3157,8 @@ +@@ -3122,8 +3124,8 @@ # Enable runtime logging # ============================================================== @@ -361,7 +361,7 @@ diff -uNr firefox-117.0/toolkit/moz.configure firefox-117.0.mod/toolkit/moz.conf # This will enable logging of addref, release, ctor, dtor. # ============================================================== -@@ -3346,7 +3348,7 @@ +@@ -3313,7 +3315,7 @@ option( env="MOZ_LINKER", default=depends(target.os, when="--enable-jemalloc")( @@ -370,7 +370,7 @@ diff -uNr firefox-117.0/toolkit/moz.configure firefox-117.0.mod/toolkit/moz.conf ), help="{Enable|Disable} custom dynamic linker", ) -@@ -3378,7 +3380,7 @@ +@@ -3345,7 +3347,7 @@ "Can't find header linux/joystick.h, needed for gamepad support." " Please install Linux kernel headers." ), @@ -379,9 +379,9 @@ diff -uNr firefox-117.0/toolkit/moz.configure firefox-117.0.mod/toolkit/moz.conf ) # Smart card support -diff -uNr firefox-117.0/toolkit/xre/glxtest/glxtest.cpp firefox-117.0.mod/toolkit/xre/glxtest/glxtest.cpp ---- firefox-117.0/toolkit/xre/glxtest/glxtest.cpp 2023-08-25 02:34:02.000000000 +0800 -+++ firefox-117.0.mod/toolkit/xre/glxtest/glxtest.cpp 2023-08-30 19:58:43.022671773 +0800 +diff -uNr firefox-118.0/toolkit/xre/glxtest/glxtest.cpp firefox-118.0.mod/toolkit/xre/glxtest/glxtest.cpp +--- firefox-118.0/toolkit/xre/glxtest/glxtest.cpp 2023-09-19 01:41:31.000000000 +0800 ++++ firefox-118.0.mod/toolkit/xre/glxtest/glxtest.cpp 2023-09-28 02:38:09.175038018 +0800 @@ -946,7 +946,9 @@ log("GLX_TEST: childgltest start\n"); diff --git a/x11-packages/firefox/fix-arm-build.patch b/x11-packages/firefox/fix-arm-build.patch index 4151434383..5f8e8780f9 100644 --- a/x11-packages/firefox/fix-arm-build.patch +++ b/x11-packages/firefox/fix-arm-build.patch @@ -1,6 +1,6 @@ -diff -uNr firefox-117.0/dom/media/webaudio/FFTBlock.h firefox-117.0.mod/dom/media/webaudio/FFTBlock.h ---- firefox-117.0/dom/media/webaudio/FFTBlock.h 2023-08-25 02:33:48.000000000 +0800 -+++ firefox-117.0.mod/dom/media/webaudio/FFTBlock.h 2023-08-30 19:58:43.046671773 +0800 +diff -uNr firefox-118.0/dom/media/webaudio/FFTBlock.h firefox-118.0.mod/dom/media/webaudio/FFTBlock.h +--- firefox-118.0/dom/media/webaudio/FFTBlock.h 2023-09-19 01:41:16.000000000 +0800 ++++ firefox-118.0.mod/dom/media/webaudio/FFTBlock.h 2023-09-28 02:38:09.187038018 +0800 @@ -7,6 +7,10 @@ #ifndef FFTBlock_h_ #define FFTBlock_h_ @@ -12,9 +12,9 @@ diff -uNr firefox-117.0/dom/media/webaudio/FFTBlock.h firefox-117.0.mod/dom/medi #ifdef BUILD_ARM_NEON # include # include "mozilla/arm.h" -diff -uNr firefox-117.0/gfx/cairo/libpixman/src/pixman-arm.c firefox-117.0.mod/gfx/cairo/libpixman/src/pixman-arm.c ---- firefox-117.0/gfx/cairo/libpixman/src/pixman-arm.c 2023-08-25 02:33:49.000000000 +0800 -+++ firefox-117.0.mod/gfx/cairo/libpixman/src/pixman-arm.c 2023-08-30 19:58:43.050671773 +0800 +diff -uNr firefox-118.0/gfx/cairo/libpixman/src/pixman-arm.c firefox-118.0.mod/gfx/cairo/libpixman/src/pixman-arm.c +--- firefox-118.0/gfx/cairo/libpixman/src/pixman-arm.c 2023-09-19 01:41:17.000000000 +0800 ++++ firefox-118.0.mod/gfx/cairo/libpixman/src/pixman-arm.c 2023-09-28 02:38:09.187038018 +0800 @@ -34,6 +34,12 @@ ARM_IWMMXT = (1 << 4) } arm_cpu_features_t; @@ -28,10 +28,10 @@ diff -uNr firefox-117.0/gfx/cairo/libpixman/src/pixman-arm.c firefox-117.0.mod/g #if defined(USE_ARM_SIMD) || defined(USE_ARM_NEON) || defined(USE_ARM_IWMMXT) #if defined(_MSC_VER) -diff -uNr firefox-117.0/media/libtheora/moz.build firefox-117.0.mod/media/libtheora/moz.build ---- firefox-117.0/media/libtheora/moz.build 2023-08-25 02:33:53.000000000 +0800 -+++ firefox-117.0.mod/media/libtheora/moz.build 2023-08-30 19:58:43.038671773 +0800 -@@ -79,7 +79,7 @@ +diff -uNr firefox-118.0/media/libtheora/moz.build firefox-118.0.mod/media/libtheora/moz.build +--- firefox-118.0/media/libtheora/moz.build 2023-09-19 01:41:21.000000000 +0800 ++++ firefox-118.0.mod/media/libtheora/moz.build 2023-09-28 02:38:09.191038018 +0800 +@@ -80,7 +80,7 @@ ] if CONFIG['GNU_AS']: @@ -40,21 +40,9 @@ diff -uNr firefox-117.0/media/libtheora/moz.build firefox-117.0.mod/media/libthe SOURCES += [ 'lib/arm/armcpu.c', 'lib/arm/armstate.c', -diff -uNr firefox-117.0/media/libtremor/lib/moz.build firefox-117.0.mod/media/libtremor/lib/moz.build ---- firefox-117.0/media/libtremor/lib/moz.build 2023-08-25 02:33:54.000000000 +0800 -+++ firefox-117.0.mod/media/libtremor/lib/moz.build 2023-08-30 19:58:43.038671773 +0800 -@@ -24,7 +24,7 @@ - if CONFIG['OS_ARCH'] == 'AIX': - DEFINES['alloca'] = '__alloca' - --if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc') and not CONFIG['MOZ_THUMB2']: -+if False: - DEFINES['_ARM_ASSEM_'] = True - - LOCAL_INCLUDES += [ -diff -uNr firefox-117.0/media/libvpx/libvpx/vpx_ports/arm_cpudetect.c firefox-117.0.mod/media/libvpx/libvpx/vpx_ports/arm_cpudetect.c ---- firefox-117.0/media/libvpx/libvpx/vpx_ports/arm_cpudetect.c 2023-08-25 02:33:53.000000000 +0800 -+++ firefox-117.0.mod/media/libvpx/libvpx/vpx_ports/arm_cpudetect.c 2023-08-30 19:58:43.054671773 +0800 +diff -uNr firefox-118.0/media/libvpx/libvpx/vpx_ports/arm_cpudetect.c firefox-118.0.mod/media/libvpx/libvpx/vpx_ports/arm_cpudetect.c +--- firefox-118.0/media/libvpx/libvpx/vpx_ports/arm_cpudetect.c 2023-09-19 01:41:21.000000000 +0800 ++++ firefox-118.0.mod/media/libvpx/libvpx/vpx_ports/arm_cpudetect.c 2023-09-28 02:38:30.015038019 +0800 @@ -91,7 +91,7 @@ return flags & mask; } @@ -64,9 +52,9 @@ diff -uNr firefox-117.0/media/libvpx/libvpx/vpx_ports/arm_cpudetect.c firefox-11 #include int arm_cpu_caps(void) { -diff -uNr firefox-117.0/media/openmax_dl/dl/moz.build firefox-117.0.mod/media/openmax_dl/dl/moz.build ---- firefox-117.0/media/openmax_dl/dl/moz.build 2023-08-25 02:33:54.000000000 +0800 -+++ firefox-117.0.mod/media/openmax_dl/dl/moz.build 2023-08-30 19:58:43.042671773 +0800 +diff -uNr firefox-118.0/media/openmax_dl/dl/moz.build firefox-118.0.mod/media/openmax_dl/dl/moz.build +--- firefox-118.0/media/openmax_dl/dl/moz.build 2023-09-19 01:41:22.000000000 +0800 ++++ firefox-118.0.mod/media/openmax_dl/dl/moz.build 2023-09-28 02:38:30.015038019 +0800 @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -76,9 +64,9 @@ diff -uNr firefox-117.0/media/openmax_dl/dl/moz.build firefox-117.0.mod/media/op Library('openmax_dl') EXPORTS.dl.api += [ -diff -uNr firefox-117.0/third_party/aom/aom_ports/arm_cpudetect.c firefox-117.0.mod/third_party/aom/aom_ports/arm_cpudetect.c ---- firefox-117.0/third_party/aom/aom_ports/arm_cpudetect.c 2023-08-25 02:34:00.000000000 +0800 -+++ firefox-117.0.mod/third_party/aom/aom_ports/arm_cpudetect.c 2023-08-30 19:58:43.050671773 +0800 +diff -uNr firefox-118.0/third_party/aom/aom_ports/arm_cpudetect.c firefox-118.0.mod/third_party/aom/aom_ports/arm_cpudetect.c +--- firefox-118.0/third_party/aom/aom_ports/arm_cpudetect.c 2023-09-19 01:41:28.000000000 +0800 ++++ firefox-118.0.mod/third_party/aom/aom_ports/arm_cpudetect.c 2023-09-28 02:38:30.019038019 +0800 @@ -87,7 +87,7 @@ return flags & mask; } diff --git a/x11-packages/firefox/rust.configure.patch b/x11-packages/firefox/rust.configure.patch index 55ac1a5063..b2cfd59a02 100644 --- a/x11-packages/firefox/rust.configure.patch +++ b/x11-packages/firefox/rust.configure.patch @@ -1,6 +1,6 @@ -diff -uNr firefox-117.0/build/moz.configure/rust.configure firefox-117.0.mod/build/moz.configure/rust.configure ---- firefox-117.0/build/moz.configure/rust.configure 2023-08-25 02:33:47.000000000 +0800 -+++ firefox-117.0.mod/build/moz.configure/rust.configure 2023-08-30 19:58:43.082671773 +0800 +diff -uNr firefox-118.0/build/moz.configure/rust.configure firefox-118.0.mod/build/moz.configure/rust.configure +--- firefox-118.0/build/moz.configure/rust.configure 2023-09-19 01:41:14.000000000 +0800 ++++ firefox-118.0.mod/build/moz.configure/rust.configure 2023-09-28 02:38:30.043038019 +0800 @@ -414,7 +414,7 @@ rustc_target = find_candidate(candidates) diff --git a/x11-packages/firefox/shared_memory_posix.cc.patch b/x11-packages/firefox/shared_memory_posix.cc.patch index 35fffb6fff..c2c287aa94 100644 --- a/x11-packages/firefox/shared_memory_posix.cc.patch +++ b/x11-packages/firefox/shared_memory_posix.cc.patch @@ -1,6 +1,6 @@ -diff -uNr firefox-117.0/ipc/chromium/src/base/shared_memory_posix.cc firefox-117.0.mod/ipc/chromium/src/base/shared_memory_posix.cc ---- firefox-117.0/ipc/chromium/src/base/shared_memory_posix.cc 2023-08-25 02:33:50.000000000 +0800 -+++ firefox-117.0.mod/ipc/chromium/src/base/shared_memory_posix.cc 2023-08-30 19:58:43.094671773 +0800 +diff -uNr firefox-118.0/ipc/chromium/src/base/shared_memory_posix.cc firefox-118.0.mod/ipc/chromium/src/base/shared_memory_posix.cc +--- firefox-118.0/ipc/chromium/src/base/shared_memory_posix.cc 2023-09-19 01:41:18.000000000 +0800 ++++ firefox-118.0.mod/ipc/chromium/src/base/shared_memory_posix.cc 2023-09-28 02:38:30.059038019 +0800 @@ -40,6 +40,65 @@ #include "mozilla/UniquePtrExtensions.h" #include "prenv.h"