Skip to content

Update Chromium from 60.0.3112.78 to 61.0.3163.100 #524

Merged
merged 1 commit into from
Nov 1, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions chromium.be0
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/usr/bin/env beesh

# BEE_VERSION chromium-60.0.3112.78-0
# BEE_VERSION chromium-62.0.3202.75-0

SRCURL[0]="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PKGVERSION}.tar.xz"

#PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/chromium-${PKGVERSION}-system_ffmpeg-1.patch"
#PATCHURL[1]="http://www.linuxfromscratch.org/patches/blfs/svn/chromium-${PKGVERSION}-kernel_dmabuf-1.patch"
PATCHURL[0]="/src/mariux/beeroot/downloads/chromium-gcc-clang.patch"
PATCHURL[1]="/src/mariux/beeroot/downloads/chromium-gcc-class-not-found-error.patch"
#PATCHURL[2]="/src/mariux/beeroot/downloads/chromium-set-error.patch"

# EXCLUDE+=()

Expand Down Expand Up @@ -41,9 +42,7 @@ GN_CONFIG=(
'use_pulseaudio=true'
'use_sysroot=false')

filedir=${BEE_TMP_BUILDROOT}/${PKGNAME}/files
launcher="chromium-launcher-3"

thirdparty="ffmpeg flac harfbuzz-ng libjpeg libpng libwebp libxslt yasm"

#mee_extract() {
# bee_extract "${@}"
Expand All @@ -55,23 +54,24 @@ launcher="chromium-launcher-3"

mee_configure() {
cd ${S}
for LIB in ffmpeg flac harfbuzz-ng libpng \
libjpeg libjpeg_turbo libwebp libxslt yasm; do
sed -e "/histogram_samples.cc/a\ 'base/metrics/histogram_snapshot_manager.cc'," \
-e "/heap_profiler_event_writer.cc/s/event_/heap_dump_/" \
-i tools/gn/bootstrap/bootstrap.py
sed '/atk_state_set_add_state/s@atk_state_set,@state_set,@' \
-i content/browser/accessibility/browser_accessibility_auralinux.cc

for LIB in $thirdparty libjpeg_turbo; do
find -type f -path "*third_party/$LIB/*" \
\! -path "*third_party/$LIB/chromium/*" \
\! -path "*third_party/$LIB/google/*" \
\! -path "*base/third_party/libevent/*" \
\! -path "*base/third_party/icu/*" \
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-delete
done
start_cmd python ${S}/build/linux/unbundle/replace_gn_files.py \
--system-libraries ffmpeg flac harfbuzz-ng libpng \
libjpeg libwebp libxslt yasm
--system-libraries $thirdparty

start_cmd python ${S}/third_party/libaddressinput/chromium/tools/update-strings.py

sed "/delayed_task_manager.cc/a\ 'base/task_scheduler/environment_config.cc'," \
-i tools/gn/bootstrap/bootstrap.py
}

mee_build() {
Expand Down