Skip to content

Commit

Permalink
Merge pull request #450 from mariux64/update-chromium-from-59-to-60
Browse files Browse the repository at this point in the history
Update Chromium from 59.0.3071.115 to 60.0.3112.78
  • Loading branch information
pmenzel authored Aug 10, 2017
2 parents c2f50a5 + d2f0a75 commit e85b676
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions chromium.be0
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env beesh

# BEE_VERSION chromium-59.0.3071.109-0
# BEE_VERSION chromium-60.0.3112.78-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]="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"

# EXCLUDE+=()

Expand All @@ -18,6 +18,7 @@ GN_CONFIG=(
'enable_hangout_services_extension=true'
'enable_nacl=false'
'enable_nacl_nonsfi=false'
'enable_swiftshader=false'
'enable_widevine=false'
'fatal_linker_warnings=false'
'ffmpeg_branding="Chrome"'
Expand All @@ -35,7 +36,7 @@ GN_CONFIG=(
'use_gconf=false'
'use_gnome_keyring=false'
'use_gold=false'
'use_gtk3=false'
'use_gtk3=true'
'use_kerberos=true'
'use_pulseaudio=true'
'use_sysroot=false')
Expand All @@ -54,7 +55,7 @@ launcher="chromium-launcher-3"

mee_configure() {
cd ${S}
for LIB in ffmpeg flac harfbuzz-ng libevent libpng \
for LIB in ffmpeg flac harfbuzz-ng libpng \
libjpeg libjpeg_turbo libwebp libxslt yasm; do
find -type f -path "*third_party/$LIB/*" \
\! -path "*third_party/$LIB/chromium/*" \
Expand All @@ -64,13 +65,13 @@ mee_configure() {
-delete
done
start_cmd python ${S}/build/linux/unbundle/replace_gn_files.py \
--system-libraries ffmpeg flac harfbuzz-ng libevent libpng \
--system-libraries ffmpeg flac harfbuzz-ng libpng \
libjpeg libwebp libxslt yasm

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

start_cmd sed "/internal\.cc',/a\ 'base/callback_helpers.cc'," \
-i ${S}/tools/gn/bootstrap/bootstrap.py
sed "/delayed_task_manager.cc/a\ 'base/task_scheduler/environment_config.cc'," \
-i tools/gn/bootstrap/bootstrap.py
}

mee_build() {
Expand Down

0 comments on commit e85b676

Please sign in to comment.