firefox: enable printing and pulseaudio

This commit is contained in:
kawanakaiku 2022-11-18 21:52:53 +09:00 committed by xtkoba
parent a0c4bac569
commit bc8c968881
2 changed files with 5 additions and 56 deletions

View File

@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=107.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=8a562e5a397b57e9bf383c2988308ab494c5d28844e792c658fedea27756584a
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"
TERMUX_PKG_DEPENDS="at-spi2-atk, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libandroid-shmem, libandroid-sysv-semaphore, libc++, libcairo, libcpufeatures, 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_step_post_get_source() {
local f="media/ffvpx/config_unix_aarch64.h"
@ -14,8 +14,6 @@ termux_step_post_get_source() {
}
termux_step_pre_configure() {
local _CFLAGS="$CFLAGS"
termux_setup_rust
termux_setup_nodejs
cargo install cbindgen
@ -25,8 +23,7 @@ termux_step_pre_configure() {
export HOST_CC=$(command -v clang)
export HOST_CXX=$(command -v clang++)
export CFLAGS="$_CFLAGS -DNO_NSPR_10_SUPPORT -DHAVE_STDINT_H -DMOZ_X11"
CXXFLAGS+=" -U__ANDROID__ -DMOZ_X11"
CXXFLAGS+=" -U__ANDROID__"
LDFLAGS+=" -landroid-shmem -landroid-sysv-semaphore -llog"
_NEED_DUMMY_LIBPTHREAD_A=
@ -41,9 +38,6 @@ termux_step_pre_configure() {
_NEED_DUMMY_LIBRT_A=true
echo '!<arch>' > $_LIBRT_A
fi
# SIGKILL while building gkrust
TERMUX_MAKE_PROCESSES=1
}
termux_step_configure() {
@ -51,9 +45,10 @@ termux_step_configure() {
--target=$TERMUX_HOST_PLATFORM \
--prefix=$TERMUX_PREFIX \
--with-sysroot=$TERMUX_PREFIX \
--disable-audio-backends \
--enable-audio-backends=pulseaudio \
--enable-minify=properties \
--enable-mobile-optimize \
--enable-printing \
--disable-jemalloc \
--enable-system-ffi \
--enable-system-pixman \
@ -66,7 +61,7 @@ termux_step_configure() {
--with-system-webp \
--with-system-zlib \
--without-wasm-sandboxed-libraries \
--with-branding=browser/branding/aurora \
--with-branding=browser/branding/official \
--disable-sandbox \
--disable-tests \
--disable-accessibility \
@ -76,7 +71,6 @@ termux_step_configure() {
--disable-updater \
--disable-hardening \
--disable-parental-controls \
--disable-printing \
--disable-webspeech \
--disable-synth-speechd \
--disable-elf-hack \

View File

@ -374,51 +374,6 @@ diff -uNr firefox-105.0.3/nsprpub/pr/src/pthreads/ptthread.c firefox-105.0.3.mod
/*
* 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-105.0.3/gfx/cairo/cairo/src/moz.build firefox-105.0.3.mod/gfx/cairo/cairo/src/moz.build
--- firefox-105.0.3/gfx/cairo/cairo/src/moz.build 2022-10-07 22:37:48.000000000 +0900
+++ firefox-105.0.3.mod/gfx/cairo/cairo/src/moz.build 2022-10-18 01:50:34.180360552 +0900
@@ -15,7 +15,7 @@
'pixman-rename.h',
]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('cocoa', 'uikit'):
+if False:
EXPORTS.cairo += [
'cairo-pdf.h',
]
diff -uNr firefox-105.0.3/gfx/cairo/cairo/src/cairo-features.h firefox-105.0.3.mod/gfx/cairo/cairo/src/cairo-features.h
--- firefox-105.0.3/gfx/cairo/cairo/src/cairo-features.h 2022-10-07 22:37:48.000000000 +0900
+++ firefox-105.0.3.mod/gfx/cairo/cairo/src/cairo-features.h 2022-10-18 03:44:09.352362967 +0900
@@ -52,7 +52,6 @@
#endif
#ifdef MOZ_PDF_PRINTING
-#define CAIRO_HAS_PDF_SURFACE 1
#endif
#if defined(MOZ_X11) || defined(MOZ_WAYLAND)
diff -uNr firefox-105.0.3/gfx/thebes/moz.build firefox-105.0.3.mod/gfx/thebes/moz.build
--- firefox-105.0.3/gfx/thebes/moz.build 2022-10-08 00:40:07.000000000 +0900
+++ firefox-105.0.3.mod/gfx/thebes/moz.build 2022-10-18 03:50:47.722636946 +0900
@@ -126,7 +126,6 @@
"gfxFT2FontBase.cpp",
"gfxFT2Utils.cpp",
"gfxPlatformGtk.cpp",
- "PrintTargetPDF.cpp",
]
if CONFIG["MOZ_X11"]:
diff -uNr firefox-105.0.3/gfx/cairo/cairo/src/cairoint.h firefox-105.0.3.mod/gfx/cairo/cairo/src/cairoint.h
--- firefox-105.0.3/gfx/cairo/cairo/src/cairoint.h 2022-10-07 22:37:49.000000000 +0900
+++ firefox-105.0.3.mod/gfx/cairo/cairo/src/cairoint.h 2022-10-18 04:14:40.627988166 +0900
@@ -84,7 +84,6 @@
CAIRO_HAS_PDF_SURFACE || \
CAIRO_HAS_SVG_SURFACE || \
CAIRO_HAS_WIN32_SURFACE
-#define CAIRO_HAS_FONT_SUBSET 1
#endif
#if CAIRO_HAS_PS_SURFACE || \
diff -uNr firefox-105.0.3/old-configure.in firefox-105.0.3.mod/old-configure.in
--- firefox-105.0.3/old-configure.in 2022-10-07 22:37:53.000000000 +0900
+++ firefox-105.0.3.mod/old-configure.in 2022-10-18 11:44:37.005989967 +0900