diff options
author | Eric Hameleers <alien@slackware.com> | 2023-02-11 22:31:32 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-02-11 22:31:32 +0000 |
commit | f0a6993b99ae8b12a3b9c714c1e9e7cf9c58bbee (patch) | |
tree | d9a2cf816687a4f6dded25e4ea07cd1424f1ce14 /chromium | |
parent | adbdab37782140b2793987703f1d445a6312810e (diff) | |
download | asb-f0a6993b99ae8b12a3b9c714c1e9e7cf9c58bbee.tar.gz asb-f0a6993b99ae8b12a3b9c714c1e9e7cf9c58bbee.tar.xz |
chromium: update to 110.0.5481.77
Diffstat (limited to 'chromium')
-rwxr-xr-x | chromium/build/chromium.SlackBuild | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild index fff6ccb1..3eed5130 100755 --- a/chromium/build/chromium.SlackBuild +++ b/chromium/build/chromium.SlackBuild @@ -504,6 +504,8 @@ # * System libdrm on Slackware 14.2 is too old. # 109.0.5414.119-1: 25/jan/2023 by Eric Hameleers <alien@slackware.com> # * Update. +# 110.0.5481.77-1: 09/feb/2023 by Eric Hameleers <alien@slackware.com> +# * Update to M110. # # ----------------------------------------------------------------------------- # @@ -526,8 +528,8 @@ USE_DEV=${USE_DEV:-0} SRCNAM=chromium PRGNAM=${SRCNAM}${SRCEXT} # chromium, chromium-dev, chromium-ungoogled, etc -VERSION=${VERSION:-109.0.5414.119} -UNGOOGLED=${UNGOOGLED:-109.0.5414.119-1} +VERSION=${VERSION:-110.0.5481.77} +UNGOOGLED=${UNGOOGLED:-110.0.5481.77-1} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -563,8 +565,13 @@ else USE_WAYLAND=${USE_WAYLAND:-0} fi -# Do not enable Qt UI yet: -USE_QT=${USE_QT:-0} +# Enable Qt UI on Slackware 15.0 and newer. +# Until Chromium 110, enable Qt5 UI using param '--enable-features=AllowQt': +if pkg-config --exists "Qt5Core >= 5.15.3" + USE_QT=${USE_QT:-1} +else + USE_QT=${USE_QT:-0} +fi # Build Chromium using a debian sysroot for Slackware 14.2 or older; # FYI, this will actually also just work for Slackware > 14.2: @@ -859,11 +866,6 @@ sed -e 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ -i tools/generate_shim_headers/generate_shim_headers.py # Patches and bug fixes: touch $OUTPUT/patch-${PRGNAM}.log -# Upstream fixes: -# https://crbug.com/angleproject/7582 -cat $SRCDIR/patches/angle-wayland-include-protocol.patch \ - | patch -p0 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # https://github.com/protocolbuffers/protobuf/issues/9792 cat $SRCDIR/patches/chromium_protobuf_32bit.patch \ | patch -p0 --verbose \ @@ -934,6 +936,9 @@ sed -i tools/clang/scripts/build.py -e "s/x86_64-unknown-linux-gnu/$TARGET/g" # And fix the 32bit compilation while we are at it: sed -i tools/clang/scripts/build.py -e "s/ldflags = \[\]/ldflags = \['-latomic'\]/" +## Avoid failure because the built clang version is not what update.py expects: +#sed -i tools/clang/scripts/update.py -e "s/RELEASE_VERSION = '16'/RELEASE_VERSION = '16.0.0'/" + # ARM platform specifics: if [[ "$ARCH" =~ arm.* ]]; then # Fix the hard-coded bootstrap target 'X86': @@ -1023,6 +1028,7 @@ _chromium_conf=( 'fatal_linker_warnings=false' "ffmpeg_branding=\"${FFMPEG_BRANDING}\"" "is_clang=${do_clang}" + "llvm_force_head_revision=${do_clang}" 'is_debug=false' "is_component_build=${SHARED_FFMPEG}" "is_component_ffmpeg=${SHARED_FFMPEG}" @@ -1049,7 +1055,7 @@ _chromium_conf=( 'use_lld=true' 'use_ozone=true' "use_pulseaudio=${do_pa}" - "use_system_libwayland=${do_wayland}" + 'use_system_libffi=false' 'use_system_minigbm=false' "use_qt=${do_qt}" "use_sysroot=${do_sysroot}" |