summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-04-14 20:31:11 +0000
committer Eric Hameleers <alien@slackware.com>2020-04-14 20:31:11 +0000
commit3af79ef585027aa41b30118d2e26bacb494bba66 (patch)
tree71ead088e0875fc821ed6889e8356d85a7c61959
parent7c57be43e7e60a4ec4b2c6450600a6557011cf95 (diff)
downloadasb-3af79ef585027aa41b30118d2e26bacb494bba66.tar.gz
asb-3af79ef585027aa41b30118d2e26bacb494bba66.tar.xz
chromium: updated to 81.0.4044.92
-rwxr-xr-xchromium/build/chromium.SlackBuild38
1 files changed, 23 insertions, 15 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index 6dfcc77a..e50d976f 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -452,6 +452,9 @@
# 80.0.3987.149-1:
# 18/mar/2020 by Eric Hameleers <alien@slackware.com>
# * Updated.
+# 81.0.4044.92-1:
+# 08/apr/2020 by Eric Hameleers <alien@slackware.com>
+# * Update to M81.
#
# -----------------------------------------------------------------------------
#
@@ -464,7 +467,7 @@
SRCNAM=chromium
SRCEXT=${SRCEXT:-""} # could be "-dev" for development build
PRGNAM=${SRCNAM}${SRCEXT} # chromium or chromium-dev
-VERSION=${VERSION:-80.0.3987.149}
+VERSION=${VERSION:-81.0.4044.92}
BUILD=${BUILD:-1}
TAG=${TAG:-alien}
@@ -708,16 +711,11 @@ echo "Extracting the source archive(s) for $PRGNAM..."
tar -xf ${SOURCE[0]}
cd ${SRCNAM}-${VERSION}
+# Allow building against system libraries in official builds:
+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
-# Reduce log spam in console, see https://crbug.com/1005508
-cat $SRCDIR/patches/chromium_fontmatching-logspam.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# Enable USSPasswords by default to prevent a long delay in doing the
-# initial sync of stored passwords (fixed in next release):
-cat $SRCDIR/patches/chromium_sync-enable-usspasswords-by-default.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
@@ -758,12 +756,14 @@ sed -i tools/clang/scripts/build.py -e "s/x86_64-unknown-linux-gnu/$TARGET/g"
# (prebuilt binary from google is only available as 64bit):
sed -i tools/clang/scripts/build.py -e 's/^ *AddCMakeToPath/#&/'
-# Explicitly use Python 2:
-find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
+## Explicitly use Python 2:
+#find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
+## The above does not solve every invocation of python:
+#mkdir -p $TMP/tmp-$PRGNAM/privatebin
+#ln -sf /usr/bin/python2 $TMP/tmp-$PRGNAM/privatebin/python
-# The above does not solve every invocation of python:
-mkdir -p $TMP/tmp-$PRGNAM/privatebin
-ln -sf /usr/bin/python2 $TMP/tmp-$PRGNAM/privatebin/python
+# Force script incompatible with Python 3 to use /usr/bin/python2:
+sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
# Prevent a build failure (yes, 'x64' even on 32bit Slackware):
mkdir -p third_party/node/linux/node-linux-x64/bin
@@ -879,6 +879,9 @@ _chromium_conf=(
"extra_cxxflags=\"${CXXFLAGS}\""
"extra_ldflags=\"${LDFLAGS}\""
)
+ # For older Slackware:
+ #'use_system_libdrm=false'
+ #'use_system_minigbm=false'
if [ "${CROSS32}" = "YES" ]; then
_chromium_conf=("${_chromium_conf[@]}" 'target_cpu="x86"')
@@ -896,12 +899,16 @@ gn_system_libraries=(
# 'freetype2'
# 'harfbuzz'
# 'icu'
+ # 'libdrm'
# 'libevent'
# 'libjpeg'
# 'libpng'
+ # 'libvpx'
+ # 'libwebp'
# 'libxml'
# 'libxslt'
# 'opus'
+ # 're2'
# 'snappy'
'yasm'
# 'zlib'
@@ -916,7 +923,8 @@ 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\|py\)' \
+ \! -path '*third_party/yasm/run_yasm.py' \
+ \! -regex '.*\.\(gn\|gni\|isolate\)' \
-delete
done