From f9fa2c25ae24f7651f2ca81a39ff1ef0af76d3d6 Mon Sep 17 00:00:00 2001 From: Sertonix Date: Fri, 22 Dec 2023 15:00:11 +0100 Subject: [PATCH] testing/librewolf: upgrade to 121.0-1 --- testing/librewolf/APKBUILD | 17 ++++---- testing/librewolf/audio-lfs64.patch | 61 ----------------------------- testing/librewolf/vendor-prefs.js | 6 --- 3 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 testing/librewolf/audio-lfs64.patch diff --git a/testing/librewolf/APKBUILD b/testing/librewolf/APKBUILD index c4e23b716e6..e539b1dba92 100644 --- a/testing/librewolf/APKBUILD +++ b/testing/librewolf/APKBUILD @@ -6,10 +6,10 @@ # Maintainer: Sertonix _pkgname=Librewolf pkgname=librewolf -_pkgver=120.0.1 +_pkgver=121.0 _pkgrel=1 pkgver="$_pkgver"_p"$_pkgrel" -_releasedate=2023-12-01 +_releasedate=2023-12-22 pkgrel=0 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." url="https://librewolf.net/" @@ -83,7 +83,6 @@ esac # The source has to change once the codeberg migration is done. source="$pkgname-$_pkgver-$_pkgrel.tar.gz::https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$_pkgver-$_pkgrel/librewolf-$_pkgver-$_pkgrel.source.tar.gz - audio-lfs64.patch disable-moz-stackwalk.patch fix-fortify-system-wrappers.patch fix-rust-target.patch @@ -531,6 +530,10 @@ prepare() { ac_add_options --disable-strip ac_add_options --disable-tests ac_add_options --disable-updater + mk_add_options MOZ_CRASHREPORTER=0 + mk_add_options MOZ_DATA_REPORTING=0 + mk_add_options MOZ_SERVICES_HEALTHREPORT=0 + mk_add_options MOZ_TELEMETRY_REPORTING=0 # features ac_add_options --enable-alsa @@ -560,7 +563,6 @@ prepare() { # misc ac_add_options --allow-addon-sideload - ac_add_options --with-unsigned-addon-scopes=app,system ac_add_options --prefix=/usr ac_add_options --with-distribution-id=org.alpinelinux ac_add_options --with-libclang-path=/usr/lib @@ -607,8 +609,6 @@ build() { export LDFLAGS="$LDFLAGS -Wl,--thinlto-jobs=$thinlto_jobs -Wl,--threads=$link_threads" export SHELL=/bin/sh - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 export USE_SHORT_LIBNAME=1 export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MOZBUILD_STATE_PATH="$srcdir"/mozbuild @@ -727,8 +727,7 @@ intl() { } sha512sums=" -ef62672b412328fd46c170320e0adcdfda92ffe545c61b17ad1b363b311006a20ddb9d99a31a81c18f5452a7eecd876471a11dd4d2cc06a141dda7f952bd64bc librewolf-120.0.1-1.tar.gz -3e0501ae7a650346c667dfdc0ae0ca286084f22e89ab2ac671cc0d7315673dc5b6dcb9f9882f6f39d26e9a31e57f7a0fd53d6b805e520224e22b8976850e2eb8 audio-lfs64.patch +c13a112f41744e761f610bb57addf74f85ce95a847218bdfd45ed3388152204b5a2f61027a6445a1d32d7767c490ca77c4f812cc4abfe5e9b485b31a056745ec librewolf-121.0-1.tar.gz 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch @@ -747,5 +746,5 @@ b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec 157a434f3354fccdff206301cf719010381515cdc1ea1c33c722ec27ad37c9e54110b930c89478fa0f7d3c90bc6299d32ef8b709803cbe9ed52ab834a1fbc3ad sqlite-ppc.patch 73e9c51977d1a675c38fafeaa7478499d002d0dbfc8741ed7d9810ac39fb190870bd3295b86f7c9f7e8191f0fda7b7d6454d0a4cc1d7c61f3810a4d3a165180f librewolf.desktop b6ceaf541ecb16a91398e1f629c7479e37c42c467e78980895ade8fe16feeb307ead50c839bac72f18bf74b7be46382c431a1361b3194cf3dffc6d58d67f82e5 distribution.ini -110ff5584c0f900ed9ca6cfdaf343303173fa930cac5a85b7bd93a94268fa3a71b76b203ac9aae3c783255d4848b0fe5d45f51efc416f1d1f6f6a82ce56208aa vendor-prefs.js +bd20f3a9606890d239b9a7fb66f75c7aa860622005613186e3dda8804fd9d8a89a00ace19b34c198e6bb5620b1c5ae36edc82a2edf437251df2dcbca67180ce7 vendor-prefs.js " diff --git a/testing/librewolf/audio-lfs64.patch b/testing/librewolf/audio-lfs64.patch deleted file mode 100644 index c34671a1fa7..00000000000 --- a/testing/librewolf/audio-lfs64.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/third_party/rust/audio_thread_priority/src/rt_linux.rs -+++ b/third_party/rust/audio_thread_priority/src/rt_linux.rs -@@ -112,7 +112,7 @@ - - /// Returns the maximum priority, maximum real-time time slice, and the current real-time time - /// slice for this process. --fn get_limits() -> Result<(i64, u64, libc::rlimit64), AudioThreadPriorityError> { -+fn get_limits() -> Result<(i64, u64, libc::rlimit), AudioThreadPriorityError> { - let c = Connection::get_private(BusType::System)?; - - let p = Props::new( -@@ -122,7 +122,7 @@ - "org.freedesktop.RealtimeKit1", - DBUS_SOCKET_TIMEOUT, - ); -- let mut current_limit = libc::rlimit64 { -+ let mut current_limit = libc::rlimit { - rlim_cur: 0, - rlim_max: 0, - }; -@@ -141,9 +141,9 @@ - )); - } - -- if unsafe { libc::getrlimit64(libc::RLIMIT_RTTIME, &mut current_limit) } < 0 { -+ if unsafe { libc::getrlimit(libc::RLIMIT_RTTIME, &mut current_limit) } < 0 { - return Err(AudioThreadPriorityError::new_with_inner( -- "getrlimit64", -+ "getrlimit", - Box::new(OSError::last_os_error()), - )); - } -@@ -154,13 +154,13 @@ - fn set_limits(request: u64, max: u64) -> Result<(), AudioThreadPriorityError> { - // Set a soft limit to the limit requested, to be able to handle going over the limit using - // SIGXCPU. Set the hard limit to the maxium slice to prevent getting SIGKILL. -- let new_limit = libc::rlimit64 { -+ let new_limit = libc::rlimit { - rlim_cur: request, - rlim_max: max, - }; -- if unsafe { libc::setrlimit64(libc::RLIMIT_RTTIME, &new_limit) } < 0 { -+ if unsafe { libc::setrlimit(libc::RLIMIT_RTTIME, &new_limit) } < 0 { - return Err(AudioThreadPriorityError::new_with_inner( -- "setrlimit64", -+ "setrlimit", - Box::new(OSError::last_os_error()), - )); - } -@@ -296,9 +296,9 @@ - match r { - Ok(_) => Ok(handle), - Err(e) => { -- if unsafe { libc::setrlimit64(libc::RLIMIT_RTTIME, &limits) } < 0 { -+ if unsafe { libc::setrlimit(libc::RLIMIT_RTTIME, &limits) } < 0 { - return Err(AudioThreadPriorityError::new_with_inner( -- "setrlimit64", -+ "setrlimit", - Box::new(OSError::last_os_error()), - )); - } diff --git a/testing/librewolf/vendor-prefs.js b/testing/librewolf/vendor-prefs.js index c043ab588fd..115617e0f17 100644 --- a/testing/librewolf/vendor-prefs.js +++ b/testing/librewolf/vendor-prefs.js @@ -4,12 +4,6 @@ pref("intl.locale.requested", ""); // Use system-provided dictionaries pref("spellchecker.dictionary_path", "/usr/share/hunspell"); -// Disable default browser checking. -pref("browser.shell.checkDefaultBrowser", false); - // Don't disable our bundled extensions in the application directory pref("extensions.autoDisableScopes", 11); pref("extensions.shownSelectionUI", true); - -// Disable sponsored tiles from "Mozilla Tiles Service" -pref("browser.topsites.contile.enabled", false);