diff options
author | Eric Hameleers <alien@slackware.com> | 2023-01-16 20:09:45 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-01-16 20:09:45 +0000 |
commit | 394a6ac9116033e76e725ae3d72a109d7f828868 (patch) | |
tree | ccc524899f2cd2c51f5505419350539de90609a8 | |
parent | 98f66a0916c662a973bb9e50c6c0f3b1147bf2d4 (diff) | |
download | asb-394a6ac9116033e76e725ae3d72a109d7f828868.tar.gz asb-394a6ac9116033e76e725ae3d72a109d7f828868.tar.xz |
chromium: update to 109.0.5414.74
-rwxr-xr-x | chromium/build/chromium.SlackBuild | 105 |
1 files changed, 60 insertions, 45 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild index a54d4d2f..6ffbb05b 100755 --- a/chromium/build/chromium.SlackBuild +++ b/chromium/build/chromium.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash # $Id$ -# Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Eric Hameleers, Eindhoven, NL +# Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -498,6 +498,8 @@ # * Update. # 108.0.5359.124-1: 17/dec/2022 by Eric Hameleers <alien@slackware.com> # * Update. +# 109.0.5414.74-1: 15/jan/2023 by Eric Hameleers <alien@slackware.com> +# * Update to M109. # # ----------------------------------------------------------------------------- # @@ -520,8 +522,8 @@ USE_DEV=${USE_DEV:-0} SRCNAM=chromium PRGNAM=${SRCNAM}${SRCEXT} # chromium, chromium-dev, chromium-ungoogled, etc -VERSION=${VERSION:-108.0.5359.124} -UNGOOGLED=${UNGOOGLED:-108.0.5359.124-1} +VERSION=${VERSION:-109.0.5414.74} +UNGOOGLED=${UNGOOGLED:-109.0.5414.74-1} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -844,7 +846,7 @@ fi # For chromium >= 102, download a specific build.py which allows us to # compile our 32bit package successfully: if [ ${VERSION%%.*} -ge 102 ]; then - wget -O - https://raw.githubusercontent.com/chromium/chromium/ad35291af36d609042e1d320adb1568daafef9a8/tools/clang/scripts/build.py > tools/clang/scripts/build.py + wget --no-check-certificate -O - https://raw.githubusercontent.com/chromium/chromium/ad35291af36d609042e1d320adb1568daafef9a8/tools/clang/scripts/build.py > tools/clang/scripts/build.py fi # Allow building against system libraries in official builds: @@ -861,13 +863,21 @@ cat $SRCDIR/patches/angle-wayland-include-protocol.patch \ cat $SRCDIR/patches/chromium_protobuf_32bit.patch \ | patch -p0 --verbose \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log + # Be compatible with gcc 10: cat $SRCDIR/patches/chromium_gcc10.patch | patch -p1 --verbose \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # Fix the link on 32bit: sed -e '/ldflags /s/-m32/&", "-Wl,-z,notext/' \ -i build/config/compiler/BUILD.gn - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log +if [ "$ARCH" == "i586" ] ; then + # Don't complain about unsupported flags when we add + # "--disable-seccomp-sandbox" on 32bit OS: + cat $SRCDIR/patches/chromium_slax_nobadflagsmessage.patch \ + | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log +fi # Prevent an error 'Looking for xmlReadMemory - not found ' building clang: sed \ @@ -1113,45 +1123,46 @@ fi # See https://bugs.chromium.org/p/chromium/issues/detail?id=592268 # icu_use_data_file_flag=false -# The array of possible replacements of embedded with system libraries is -# found in 'build/linux/unbundle/replace_gn_files.py': -gn_system_libraries=( - # 'bzip2' - # 'ffmpeg' - # 'flac' - # 'freetype2' - # 'harfbuzz' - # 'icu' - # 'libdrm' - # 'libevent' - # 'libjpeg' - # 'libpng' - # 'libvpx' - # 'libwebp' - # 'libxml' - # 'libxslt' - # 'opus' - # 're2' - # 'snappy' - # 'zlib' - ) - -# Unbundle the libraries which we use from the system. -# (taken from Arch Linux:) -# This *should* do what the remove_bundled_libraries.py script does, -# with the added benefit of not having to list all the remaining libraries: -echo "-- Unbundling system libraries from $PRGNAM sources." -for ULIB in ${gn_system_libraries[@]}; do - find -type f -path "*third_party/$ULIB/*" \ - \! -path "*third_party/$ULIB/chromium/*" \ - \! -path "*third_party/$ULIB/google/*" \ - \! -regex '.*\.\(gn\|gni\|isolate\)' \ - -delete -done - -# Change bundled libraries to system ones: -echo "-- Change bundled to system libraries in $PRGNAM sources." -python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries[@]} +## The array of possible replacements of embedded with system libraries is +## found in 'build/linux/unbundle/replace_gn_files.py': +#gn_system_libraries=( +# # 'bzip2' +# # 'ffmpeg' +# # 'flac' +# # 'freetype2' +# # 'harfbuzz' +# # 'icu' +# # 'libdrm' +# # 'libevent' +# # 'libjpeg' +# # 'libpng' +# # 'libvpx' +# # 'libwebp' +# # 'libxml' +# # 'libxslt' +# # 'opus' +# # 're2' +# # 'snappy' +# # 'zlib' +# ) +# +## Unbundle the libraries which we use from the system. +## (taken from Arch Linux:) +## This *should* do what the remove_bundled_libraries.py script does, +## with the added benefit of not having to list all the remaining libraries: +#echo "-- Unbundling system libraries from $PRGNAM sources." +#for ULIB in ${gn_system_libraries[@]}; do +# find -type f -path "*third_party/$ULIB/*" \ +# \! -path "*third_party/$ULIB/chromium/*" \ +# \! -path "*third_party/$ULIB/google/*" \ +# \! -regex '.*\.\(gn\|gni\|isolate\)' \ +# -delete +#done +# +## Change bundled libraries to system ones: +#echo "-- Change bundled to system libraries in $PRGNAM sources." +#python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries[@]} +# # Do not make the build fail, see Chromium issue #386097: python3 third_party/libaddressinput/chromium/tools/update-strings.py \ @@ -1361,7 +1372,7 @@ export AS=as LDFLAGS="$LDFLAGS" \ LC_ALL=C \ ninja -C out/Release \ - chrome chrome_sandbox chromedriver \ + chrome chrome_sandbox chromedriver content_shell \ 2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log if [ $USE_UNGOOGLED -eq 0 ]; then @@ -1379,6 +1390,10 @@ echo "-- Manually installing everything." # The main binary: install -D out/Release/chrome $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/${PRGNAM} +# The headless browser: +install -D out/Release/content_shell \ + $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/${PRGNAM}-shell + # The sandbox: install -D -m4755 -o root -g root out/Release/chrome_sandbox \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chrome-sandbox |