From b0f16dfa89820bd8884bb1bab6cb7db8112e4f45 Mon Sep 17 00:00:00 2001 From: Robert David Date: Mon, 8 Jul 2024 13:29:48 +0200 Subject: [PATCH] firefox-esr: update to 128.1.0 --- srcpkgs/firefox-esr/files/mozconfig | 36 ------------ srcpkgs/firefox-esr/files/vendor.js | 4 +- .../firefox-esr/patches/flac-no-ffvpx.patch | 25 --------- .../patches/sandbox-largefile.patch | 17 ------ srcpkgs/firefox-esr/patches/sqlite-ppc.patch | 55 ------------------- srcpkgs/firefox-esr/template | 23 ++------ 6 files changed, 8 insertions(+), 152 deletions(-) delete mode 100644 srcpkgs/firefox-esr/files/mozconfig delete mode 100644 srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch delete mode 100644 srcpkgs/firefox-esr/patches/sandbox-largefile.patch delete mode 100644 srcpkgs/firefox-esr/patches/sqlite-ppc.patch diff --git a/srcpkgs/firefox-esr/files/mozconfig b/srcpkgs/firefox-esr/files/mozconfig deleted file mode 100644 index fa5a7a42e04..00000000000 --- a/srcpkgs/firefox-esr/files/mozconfig +++ /dev/null @@ -1,36 +0,0 @@ -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --with-system-icu -# XXX: the system's libpng doesn't have APNG support -ac_add_options --without-system-png -ac_add_options --enable-system-pixman -ac_add_options --enable-system-ffi - -nspr_config_args=" - --libdir=${XBPS_CROSS_BASE}/usr/lib - --includedir=${XBPS_CROSS_BASE}/usr/include/nspr" - -nss_config_args=" - --libdir=${XBPS_CROSS_BASE}/usr/lib - --includedir=${XBPS_CROSS_BASE}/usr/include/nss" - -ac_add_options --disable-tests -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-install-strip -ac_add_options --disable-strip -ac_add_options --disable-profiling -ac_add_options --enable-release -ac_add_options --enable-optimize="$CFLAGS" - -ac_add_options --enable-official-branding -ac_add_options --enable-application=browser - -ac_add_options --allow-addon-sideload diff --git a/srcpkgs/firefox-esr/files/vendor.js b/srcpkgs/firefox-esr/files/vendor.js index 5be4f1b5f3f..1b0273175a5 100644 --- a/srcpkgs/firefox-esr/files/vendor.js +++ b/srcpkgs/firefox-esr/files/vendor.js @@ -6,4 +6,6 @@ pref("browser.shell.checkDefaultBrowser", false); // Don't disable our bundled extensions in the application directory pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); + +// The default is google and we don't have api keys for it. +pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); diff --git a/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch b/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch deleted file mode 100644 index 643d186f3ad..00000000000 --- a/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch +++ /dev/null @@ -1,25 +0,0 @@ -Enable FLAC on platforms without ffvpx like powerpc* - -diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp -index 53fc3c9937f7..b23771ab80fa 100644 ---- a/dom/media/flac/FlacDecoder.cpp -+++ b/dom/media/flac/FlacDecoder.cpp -@@ -7,6 +7,7 @@ - #include "FlacDecoder.h" - #include "MediaContainerType.h" - #include "mozilla/StaticPrefs_media.h" -+#include "PDMFactory.h" - - namespace mozilla { - -@@ -14,6 +15,10 @@ namespace mozilla { - bool FlacDecoder::IsEnabled() { - #ifdef MOZ_FFVPX - return StaticPrefs::media_flac_enabled(); -+#elif defined(MOZ_FFMPEG) -+ RefPtr platform = new PDMFactory(); -+ return StaticPrefs::media_flac_enabled() && -+ platform->SupportsMimeType("audio/flac"_ns) != media::DecodeSupport::Unsupported; - #else - // Until bug 1295886 is fixed. - return false; diff --git a/srcpkgs/firefox-esr/patches/sandbox-largefile.patch b/srcpkgs/firefox-esr/patches/sandbox-largefile.patch deleted file mode 100644 index 6ee7f3a8215..00000000000 --- a/srcpkgs/firefox-esr/patches/sandbox-largefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100 -+++ b/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100 -@@ -68,7 +68,13 @@ - - // The headers define O_LARGEFILE as 0 on x86_64, but we need the - // actual value because it shows up in file flags. --#define O_LARGEFILE_REAL 00100000 -+#if defined(__x86_64__) || defined(__i386__) || defined(__mips__) -+#define O_LARGEFILE_REAL 0100000 -+#elif defined(__powerpc__) -+#define O_LARGEFILE_REAL 0200000 -+#else -+#define O_LARGEFILE_REAL O_LARGEFILE -+#endif - - // Not part of UAPI, but userspace sees it in F_GETFL; see bug 1650751. - #define FMODE_NONOTIFY 0x4000000 diff --git a/srcpkgs/firefox-esr/patches/sqlite-ppc.patch b/srcpkgs/firefox-esr/patches/sqlite-ppc.patch deleted file mode 100644 index 51f7faa618d..00000000000 --- a/srcpkgs/firefox-esr/patches/sqlite-ppc.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 67157b1aa7da0a146b7d2d5abb9237eea1f434ec Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Fri, 23 Sep 2022 02:38:29 +0200 -Subject: [PATCH] fix sqlite3 on ppc with clang - -The __ppc__ macro is always defined on clang but not gcc, which -results in sqlite mistakenly thinking that ppc64le with clang -is big endian. - -Also disable some inline assembly stuff on ppc that is never used -with gcc and probably was never tested with modern machines. ---- - third_party/sqlite3/src/sqlite3.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/third_party/sqlite3/src/sqlite3.c b/third_party/sqlite3/src/sqlite3.c -index 4f3dc68..9017062 100644 ---- a/third_party/sqlite3/src/sqlite3.c -+++ b/third_party/sqlite3/src/sqlite3.c -@@ -14317,9 +14317,9 @@ typedef INT16_TYPE LogEst; - # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ - defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ - defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ -- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) -+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__) - # define SQLITE_BYTEORDER 1234 --# elif defined(sparc) || defined(__ppc__) || \ -+# elif defined(sparc) || defined(__BIG_ENDIAN__) || \ - defined(__ARMEB__) || defined(__AARCH64EB__) - # define SQLITE_BYTEORDER 4321 - # else -@@ -20713,7 +20713,7 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt); - return val; - } - --#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__)) -+#elif 0 - - __inline__ sqlite_uint64 sqlite3Hwtime(void){ - unsigned long long retval; -@@ -196385,9 +196385,9 @@ struct RtreeMatchArg { - #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ - defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ - defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ -- defined(__arm__) -+ defined(__arm__) || defined(__LITTLE_ENDIAN__) - # define SQLITE_BYTEORDER 1234 --#elif defined(sparc) || defined(__ppc__) -+#elif defined(sparc) || defined(__BIG_ENDIAN__) - # define SQLITE_BYTEORDER 4321 - #else - # define SQLITE_BYTEORDER 0 /* 0 means "unknown at compile-time" */ --- -2.37.3 - diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index baa8e8455f2..c3706b519a3 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -1,23 +1,22 @@ # Template file for 'firefox-esr' # # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n". -# After bumping this package, restore the depends of browsh # pkgname=firefox-esr -version=115.0.2 -revision=2 +version=128.1.0 +revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser - Extended Support Release" maintainer="Orphaned " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=45723c83ea7dc318ec50d67eebf834163b626ec3924a3131fecddfc7268a95f5 +checksum=ccdab622a395622abc6d80040a11715ad81a614f601db6672c05b98ac91fd9b5 lib32disabled=yes -hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo - llvm clang lld nodejs cbindgen nasm which tar" +hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust + cargo llvm18 clang18 lld18 nodejs cbindgen nasm which tar" makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel icu-devel pixman-devel libevent-devel libnotify-devel libvpx-devel libwebp-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std @@ -80,11 +79,7 @@ do_build() { #!/bin/sh exec clang \ --target="${XBPS_CROSS_TRIPLET}" \ - --gcc-toolchain=/usr \ --sysroot="${XBPS_CROSS_BASE}" \ - -nostdinc \ - -isystem "${XBPS_CROSS_BASE}/usr/include" \ - -isystem "/usr/lib/clang/${clang_version}/include" \ "\$@" ! @@ -92,15 +87,7 @@ do_build() { #!/bin/sh exec clang++ \ --target="${XBPS_CROSS_TRIPLET}" \ - --gcc-toolchain=/usr \ --sysroot="${XBPS_CROSS_BASE}" \ - -nostdinc++ \ - -isystem "${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}" \ - -isystem "${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/${XBPS_CROSS_TRIPLET}" \ - -isystem "${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/backward" \ - -nostdinc \ - -isystem "${XBPS_CROSS_BASE}/usr/include" \ - -isystem "/usr/lib/clang/${clang_version}/include" \ "\$@" !