diff --git a/srcpkgs/chromium/files/musl-patches/dont-assume-secure-getenv.patch b/srcpkgs/chromium/files/musl-patches/dont-assume-secure-getenv.patch deleted file mode 100644 index abde598d8fd..00000000000 --- a/srcpkgs/chromium/files/musl-patches/dont-assume-secure-getenv.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/angle/third_party/vulkan-loader/src/BUILD.gn.orig 2020-02-08 16:16:30.786747326 -0500 -+++ third_party/angle/third_party/vulkan-loader/src/BUILD.gn 2020-02-08 16:17:02.682797286 -0500 -@@ -59,10 +59,6 @@ - if (is_win) { - cflags = [ "/wd4201" ] - } -- if (is_linux) { -- # assume secure_getenv() is available -- defines += [ "HAVE_SECURE_GETENV" ] -- } - } - - if (!is_android) { diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index aae904de440..c33c9e3cb0b 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=84.0.4147.89 +version=84.0.4147.105 revision=1 archs="i686* x86_64* aarch64* armv7l*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=17970d998c125b40765141f2cd346d1674f05dbd4a28fdcf31f9e3540890c679 +checksum=caf4ebeb2a2333454c3067a2534aeecaab5029aa78fc0d8b27f79ad3b9c5ccac nocross=yes lib32disabled=yes @@ -34,24 +34,22 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel re2-devel fontconfig-devel freetype-devel opus-devel - ffmpeg-devel libva-devel python-setuptools xcb-proto $(vopt_if sndio sndio-devel)" + ffmpeg-devel libvpx-devel libva-devel python-setuptools xcb-proto + $(vopt_if sndio sndio-devel)" depends="libexif hwids desktop-file-utils hicolor-icon-theme xdg-utils" -build_options_default="clang pulseaudio vaapi" +build_options_default="clang js_optimize vaapi pulseaudio" -case "${XBPS_TARGET_MACHINE}" in - x86_64|i686) build_options_default+=" js_optimize" ;; -esac - -post_extract() { - case "${XBPS_TARGET_MACHINE}" in - *-musl) +post_patch() { + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then for f in "${FILESDIR}"/musl-patches/*.patch; do echo "Applying $f" patch -Np0 -i "$f" done - ;; - i686) + fi + + case "${XBPS_TARGET_MACHINE}" in + i686*) for f in "${FILESDIR}"/i686-patches/*.patch; do echo "Applying $f" patch -Np0 -i "$f" @@ -98,7 +96,6 @@ do_configure() { # use_system_protobuf # use_system_v8=1 # use_system_zlib=1 - # use_system_libvpx=1 # bzip2 jsoncpp minizip xdg_utils speex system=" ffmpeg @@ -109,6 +106,7 @@ do_configure() { libevent libjpeg libpng + libvpx libwebp libxml libxslt