summaryrefslogtreecommitdiff
path: root/firefox
diff options
context:
space:
mode:
authorDanny Rawlins <contact@romster.me>2022-09-20 21:25:26 +1000
committerDanny Rawlins <contact@romster.me>2022-09-20 21:28:53 +1000
commitfb30a93c1c69955a73da003a52277e3cef8762bf (patch)
tree297faad6f35c826069c2fd369e7586f5000b8567 /firefox
parente69d3c89d8ee691f282b53151e028715cfcf8d07 (diff)
downloadcontrib-fb30a93c1c69955a73da003a52277e3cef8762bf.tar.gz
contrib-fb30a93c1c69955a73da003a52277e3cef8762bf.tar.xz
firefox: 104.0.2 -> 105.0
Diffstat (limited to 'firefox')
-rw-r--r--firefox/.signature8
-rw-r--r--firefox/0032-bmo-1773336-disable_audio_thread_priority_default_features.patch45
-rw-r--r--firefox/Pkgfile24
-rw-r--r--firefox/arc4random.patch33
4 files changed, 13 insertions, 97 deletions
diff --git a/firefox/.signature b/firefox/.signature
index 99ad3dba7..de39ddab4 100644
--- a/firefox/.signature
+++ b/firefox/.signature
@@ -1,8 +1,8 @@
untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/slVbBgAxPneZMx7BptybCq3o8h2TvYcDWGnglcb1X93V0D+WWA90cnJiFN/kA6IZXVCxtDBselpDQgS1+CQgo=
-SHA256 (Pkgfile) = 91ea1a35fbaaaf2975cbbbdf31d276b8a699d7daac0e336d26a97322fb08c121
+RWSagIOpLGJF3w4ECwAkVPyJKOLZ70WgnlHKPi71xf8Mq28d9MSKRWjkHUxlRfCQOH6h9cVuUcxbmwuNQxQNbEOhB/zSI0CncQ0=
+SHA256 (Pkgfile) = 5c6fa87f1327bcc609047cbeb06106653bc1d504e49cc0e104a8a165d7fa36ea
SHA256 (.footprint) = c8226cc240304363b6289982601426f70c5cd4e82ac62feff3485bee4f48e050
-SHA256 (firefox-104.0.2.source.tar.xz) = 72bba06f04e7745f6b02951906413eb1c15a7e253e06e373302162c6219f286a
+SHA256 (firefox-105.0.source.tar.xz) = 2b5becbb89aa2b2007ba8c86ad517aeae1b54904d007d9d3acbf054be6a0ed62
SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91
SHA256 (node-stdout-nonblocking-wrapper) = bb8c503015e49ed1b152225bdc56cf502cd831f35962d113dcbb9121967f3523
SHA256 (0001-Don-t-use-build-id.patch) = f55742252e6005670d05606e18ed7fb64369d8f12ff41993b8d713f468fd3465
@@ -36,9 +36,7 @@ SHA256 (0028-bmo-1559213-fix-system-av1-libs.patch) = 344482f28d4512718320e73967
SHA256 (0029-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch) = b47ea62937d7f87485e0f372c0110785bbb6f4dbc79d3d139d54887cac0773e3
SHA256 (0030-bmo-1754469-memory_mozalloc_throw.patch) = ba1013f0b5a76312802ac62cc5dbc35ecdcd3d4946df78c4b3fc144afc829023
SHA256 (0031-bmo-1769631-python-3.11-compatibility.patch) = 5b0aad43012e4c175a6dde70b006fa9f07c4b0d70e9632414f16ac55d5243be4
-SHA256 (0032-bmo-1773336-disable_audio_thread_priority_default_features.patch) = 4bbd43f7dbe7e01f168264dd3c02fd32c9e3b341b8eff297e4d98c7bba6a5d3a
SHA256 (0033-rhbz-2115253-vaapi-fixes.patch) = f2b19e14d8add13930e2ce89fa5e1b252ac979c8177a78a6fa3eb4ae2ad56633
SHA256 (0034-bgo-860033-firefox-wayland-no-dbus.patch) = efdf58e256b298bf8f0c0b7ead119830e99d1b2bf29ba1e43a9e0eeb8ac2e538
-SHA256 (arc4random.patch) = 714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4
SHA256 (libwebrtc-screen-cast-sync-1.patch) = c8b07fce4bb923cdac621ab8c53de7dcb5e5a37891b883524de86546976b1779
SHA256 (no-ccache-stats.patch) = dc164e37ccf78d9a83dded7d7e52f091a703b650967ed8888120689c213eb1ab
diff --git a/firefox/0032-bmo-1773336-disable_audio_thread_priority_default_features.patch b/firefox/0032-bmo-1773336-disable_audio_thread_priority_default_features.patch
deleted file mode 100644
index 4f96eae7b..000000000
--- a/firefox/0032-bmo-1773336-disable_audio_thread_priority_default_features.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 64d822a598f46f9d08a41eab6a7d416a6c54927b Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh@glandium.org>
-Date: Wed, 8 Jun 2022 16:03:49 +0900
-Subject: [PATCH] Disable audio_thread_priority default features
-
-with_dbus is supposed to be optional in gecko, but in practice, the
-audio_thread_priority defaults force it on.
-# https://github.com/kinetiknz/audioipc/pull/5/
----
- audioipc/Cargo.toml | 1 +
- client/Cargo.toml | 1 +
- server/Cargo.toml | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/third_party/rust/audioipc/Cargo.toml b/third_party/rust/audioipc/Cargo.toml
-index d69c56d..8a9dd3d 100644
---- a/third_party/rust/audioipc/Cargo.toml
-+++ b/third_party/rust/audioipc/Cargo.toml
-@@ -30,6 +30,7 @@ memmap2 = "0.2"
-
- [target.'cfg(target_os = "linux")'.dependencies.audio_thread_priority]
- version = "0.26.1"
-+default-features = false
-
- [target.'cfg(windows)'.dependencies]
- mio = "0.6.19"
-diff --git a/third_party/rust/audioipc-client/Cargo.toml b/third_party/rust/audioipc-client/Cargo.toml
-index 3ffb268..5dbf5f6 100644
---- a/third_party/rust/audioipc-client/Cargo.toml
-+++ b/third_party/rust/audioipc-client/Cargo.toml
-@@ -19,3 +19,4 @@ tokio = { version="0.1", default-features=false, features = ["rt-full"] }
-
- [dependencies.audio_thread_priority]
- version = "0.26.1"
-+default-features = false
-diff --git a/third_party/rust/audioipc-server/Cargo.toml b/third_party/rust/audioipc-server/Cargo.toml
-index 2c82fbf..b2b710c 100644
---- a/third_party/rust/audioipc-server/Cargo.toml
-+++ b/third_party/rust/audioipc-server/Cargo.toml
-@@ -24,3 +24,4 @@ default-features = false
-
- [dependencies.audio_thread_priority]
- version = "0.26.1"
-+default-features = false
-
diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 946b22ff7..d7ccfe1a5 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -1,11 +1,11 @@
# Description: The Mozilla Firefox browser with Alsa support
# URL: https://www.mozilla.com/firefox/
# Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: alsa-lib autoconf-2.13 brotli cbindgen dav1d dbus-glib ffmpeg graphite2 libaom libdav1d libevent libnotify libvpx libwebp libxkbcommon lld nodejs nss unzip wasi-libc++ xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxt zip
-# Optional: sccache jack
+# Depends on: alsa-lib autoconf-2.13 brotli cbindgen dav1d dbus-glib ffmpeg graphite2 libaom libdav1d libevent libnotify libvpx libwebp libxkbcommon lld nodejs pulseaudio nss unzip wasi-libc++ xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxt zip
+# Optional: sccache jack pipewire
name=firefox
-version=104.0.2
+version=105.0
release=1
source=(https://archive.mozilla.org/pub/firefox/releases/$version/source/$name-$version.source.tar.xz
firefox.desktop
@@ -41,10 +41,8 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$version/source/$name-$
0029-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
0030-bmo-1754469-memory_mozalloc_throw.patch
0031-bmo-1769631-python-3.11-compatibility.patch
- 0032-bmo-1773336-disable_audio_thread_priority_default_features.patch
0033-rhbz-2115253-vaapi-fixes.patch
0034-bgo-860033-firefox-wayland-no-dbus.patch
- arc4random.patch
libwebrtc-screen-cast-sync-1.patch
no-ccache-stats.patch)
@@ -59,10 +57,6 @@ build() {
patch -p1 -i $p
done
- _clear_vendor_checksums audioipc
- _clear_vendor_checksums audioipc-client
- _clear_vendor_checksums audioipc-server
-
if [ "$(/usr/bin/python3 -c "import sys; print(sys.stdout.encoding)")" != 'utf-8' ]; then
printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n"
exit 1
@@ -102,23 +96,25 @@ cat <<- EOF > .mozconfig
ac_add_options --enable-optimize
ac_add_options --enable-release
ac_add_options --enable-rust-simd
+ ac_add_options --enable-sandbox
ac_add_options --disable-debug-symbols
ac_add_options --enable-official-branding
ac_add_options --with-distribution-id=nu.crux
ac_add_options --enable-linker=lld
ac_add_options --enable-lto=thin
ac_add_options --disable-tests
- ac_add_options --disable-debug
+ ac_add_options --disable-debug-symbols
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
+ ac_add_options --disable-parental-controls
ac_add_options --disable-elf-hack
EOF
# audio
- prt-get isinst alsa-lib && echo 'ac_add_options --enable-alsa' >> .mozconfig || echo 'ac_add_options --disable-alsa' >> .mozconfig
- prt-get isinst jack && echo 'ac_add_options --enable-jack' >> .mozconfig || echo 'ac_add_options --disable-jack' >> .mozconfig
- prt-get isinst pulseaudio && echo 'ac_add_options --enable-pulseaudio' >> .mozconfig || echo 'ac_add_options --disable-pulseaudio' >> .mozconfig
+ prt-get isinst alsa-lib && echo 'ac_add_options --enable-alsa' >> .mozconfig
+ prt-get isinst jack && echo 'ac_add_options --enable-jack' >> .mozconfig
+ prt-get isinst pulseaudio && echo 'ac_add_options --enable-pulseaudio' >> .mozconfig
prt-get isinst wayland-protocols && \
echo 'ac_add_options --enable-default-toolkit=cairo-gtk3-wayland' >> .mozconfig || \
@@ -127,7 +123,7 @@ EOF
[[ -e '/usr/bin/ccache' ]] && echo 'ac_add_options --enable-ccache' >> .mozconfig
export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib RUSTFLAGS="-C opt-level=2 $RUSTFLAGS"
- export MOZ_MAKE_FLAGS="-j ${JOBS-1}"
+ export MOZ_MAKE_FLAGS="-j ${JOBS-1}" LDFLAGS+=" -Wl,--thinlto-jobs=$((JOBS / 2))"
export MOZBUILD_STATE_PATH="$SRC"/mozbuild
# Disable notification when build system has finished
diff --git a/firefox/arc4random.patch b/firefox/arc4random.patch
deleted file mode 100644
index c877d54c1..000000000
--- a/firefox/arc4random.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
-index 101d39d455107..3764806240f9f 100644
---- i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
-+++ w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
-@@ -30,13 +30,13 @@
- /* #undef EVENT__HAVE_AFUNIX_H 1 */
-
- /* Define to 1 if you have the `arc4random' function. */
--/* #undef EVENT__HAVE_ARC4RANDOM */
-+#define EVENT__HAVE_ARC4RANDOM 1
-
- /* Define to 1 if you have the `arc4random_addrandom' function. */
- /* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */
-
- /* Define to 1 if you have the `arc4random_buf' function. */
--/* #undef EVENT__HAVE_ARC4RANDOM_BUF */
-+#define EVENT__HAVE_ARC4RANDOM_BUF 1
-
- /* Define to 1 if you have the <arpa/inet.h> header file. */
- #define EVENT__HAVE_ARPA_INET_H 1
-diff --git i/toolkit/crashreporter/client/ping.cpp w/toolkit/crashreporter/client/ping.cpp
-index 57cf85de80b79..93a2f6e80ad0b 100644
---- i/toolkit/crashreporter/client/ping.cpp
-+++ w/toolkit/crashreporter/client/ping.cpp
-@@ -53,7 +53,7 @@ static string GenerateUUID() {
-
- CFRelease(uuid);
- #elif defined(HAVE_ARC4RANDOM_BUF) // Android, BSD, ...
-- arc4random_buf(id, sizeof(UUID));
-+ arc4random_buf(&id, sizeof(UUID));
- #else // Linux
- int fd = open("/dev/urandom", O_RDONLY);
-

Generated by cgit