diff --git a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch deleted file mode 100644 index 56a4ad1c807..00000000000 --- a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch +++ /dev/null @@ -1,24 +0,0 @@ -Use monotonic clock for pthread_cond_timedwait with musl too. - -diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc -index 5ea7083..c13027e 100644 ---- a/v8/src/base/platform/condition-variable.cc -+++ b/v8/src/base/platform/condition-variable.cc -@@ -16,7 +16,7 @@ namespace base { - - ConditionVariable::ConditionVariable() { - #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \ -- (V8_OS_LINUX && V8_LIBC_GLIBC)) -+ V8_OS_LINUX) - // On Free/Net/OpenBSD and Linux with glibc we can change the time - // source for pthread_cond_timedwait() to use the monotonic clock. - pthread_condattr_t attr; -@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) { - &native_handle_, &mutex->native_handle(), &ts); - #else - #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \ -- (V8_OS_LINUX && V8_LIBC_GLIBC)) -+ V8_OS_LINUX) - // On Free/Net/OpenBSD and Linux with glibc we can change the time - // source for pthread_cond_timedwait() to use the monotonic clock. - result = clock_gettime(CLOCK_MONOTONIC, &ts); diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch index 060865aa60e..b240ac3fed1 100644 --- a/srcpkgs/chromium/patches/sndio.patch +++ b/srcpkgs/chromium/patches/sndio.patch @@ -1,13 +1,13 @@ diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn ---- chromium-129.0.6668.58/media/BUILD.gn 2024-09-18 00:00:12.319230000 +0200 -+++ - 2024-09-19 19:44:06.486438185 +0200 -@@ -66,6 +66,7 @@ - "USE_CRAS=$use_cras", +--- a/media/BUILD.gn ++++ b/media/BUILD.gn +@@ -69,6 +69,7 @@ "USE_PROPRIETARY_CODECS=$proprietary_codecs", "ENABLE_GPU_CHANNEL_MEDIA_CAPTURE=$enable_gpu_channel_media_capture", + "USE_OPENSLES=$media_use_opensles", + "USE_SNDIO=$use_sndio", ] - + if (enable_library_cdms) { diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn --- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200 diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index c6c4f79502a..1e6981246fb 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=133.0.6943.53 +version=134.0.6998.35 revision=1 archs="i686* x86_64* aarch64* armv7l*" _llvmver=19 @@ -31,7 +31,7 @@ license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz" #distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz" -checksum=433c8891a3d717994b0e9544334491888e835a4b813354eefacae05489c23d01 +checksum=d77f09bfa9bda8bbc4638ead83339d5ec52e39032c5a7047060dfdf94b767be7 lib32disabled=yes @@ -93,6 +93,10 @@ post_patch() { mkdir -p third_party/node/linux/node-linux-x64/bin rm -f third_party/node/linux/node-linux-x64/bin/node ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ + + # Rust 1.86 ships adler2 but we need to change it to adler when + # using older Rust versions (idea for this borrowed from Gentoo^WArch) + sed -i 's/adler2/adler/' build/rust/std/BUILD.gn } _setup_clang() { @@ -230,7 +234,8 @@ do_configure() { 'use_system_harfbuzz=false' 'use_system_libffi=true' - 'use_qt=false' + 'use_qt5=false' + 'use_qt6=false' 'use_cups=true'