diff --git a/x11-packages/firefox/build.sh b/x11-packages/firefox/build.sh index 8eb92a1b5a..4dbe2531f0 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=108.0.1 +TERMUX_PKG_VERSION=109.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=9821ac130dad01383e03276bf6cc92d41329d351da1fa7fa238168f8890611ea +TERMUX_PKG_SHA256=0678a03b572b5992fb85f0923a25b236acf81e5ea2c08e549b63a56076a69351 TERMUX_PKG_DEPENDS="at-spi2-atk, 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" TERMUX_MAKE_PROCESSES=1 diff --git a/x11-packages/firefox/firefox.patch b/x11-packages/firefox/firefox.patch index c0474e44d0..0eb538f597 100644 --- a/x11-packages/firefox/firefox.patch +++ b/x11-packages/firefox/firefox.patch @@ -232,32 +232,23 @@ diff -uNr firefox-105.0.3/toolkit/components/extensions/storage/moz.build firefo EXPORTS.mozilla.extensions.storage += [ "ExtensionStorageComponents.h", ] -diff -uNr firefox-105.0.3/toolkit/components/moz.build firefox-105.0.3.mod/toolkit/components/moz.build ---- firefox-105.0.3/toolkit/components/moz.build 2022-10-08 00:40:08.000000000 +0900 -+++ firefox-105.0.3.mod/toolkit/components/moz.build 2022-10-16 00:07:55.637517815 +0900 -@@ -95,7 +95,6 @@ - "aboutconfig", - "narrate", - "reader", -- "viaduct", - "uniffi-js", - "uniffi-bindgen-gecko-js/components", - ] --- a/toolkit/library/rust/shared/Cargo.toml +++ b/toolkit/library/rust/shared/Cargo.toml -@@ -111,10 +111,11 @@ +@@ -113,11 +113,12 @@ # This happens to work around issues the older code has with 1.65. fallible_collections = { version = "0.4", features = ["rust_1_57"] } -+tabs = { version = "0.1" } -+ - [target.'cfg(not(target_os = "android"))'.dependencies] +-[target.'cfg(not(target_os = "android"))'.dependencies] viaduct = "0.1" - webext_storage_bridge = { path = "../../../components/extensions/storage/webext_storage_bridge" } --tabs = { version = "0.1" } +-webext_storage_bridge = { path = "../../../components/extensions/storage/webext_storage_bridge" } + tabs = { version = "0.1" } ++[target.'cfg(not(target_os = "android"))'.dependencies] ++webext_storage_bridge = { path = "../../../components/extensions/storage/webext_storage_bridge" } ++ [target.'cfg(target_os = "windows")'.dependencies] detect_win32k_conflicts = { path = "../../../xre/detect_win32k_conflicts" } + --- a/toolkit/library/rust/shared/lib.rs +++ b/toolkit/library/rust/shared/lib.rs @@ -57,10 +57,8 @@ @@ -271,6 +262,14 @@ diff -uNr firefox-105.0.3/toolkit/components/moz.build firefox-105.0.3.mod/toolk mod reexport_tabs { tabs::uniffi_reexport_scaffolding!(); } +@@ -89,7 +87,6 @@ + extern crate l10nregistry_ffi; + extern crate localization_ffi; + +-#[cfg(not(target_os = "android"))] + extern crate viaduct; + + extern crate gecko_logger; diff -uNr firefox-105.0.3/toolkit/moz.configure firefox-105.0.3.mod/toolkit/moz.configure --- firefox-105.0.3/toolkit/moz.configure 2022-10-08 00:40:08.000000000 +0900 +++ firefox-105.0.3.mod/toolkit/moz.configure 2022-10-18 01:42:19.379553089 +0900