Merge pull request #578 from mariux64/update-chromium-from-version-61…

….0.3163.100-to-63.0.3239.132

Update Chromium from 61.0.3163.10 to 63.0.3239.132

chromium.be0

@@ -1,12 +1,10 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION chromium-62.0.3202.75-0
+# BEE_VERSION chromium-63.0.3239.132-0
 
 SRCURL[0]="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PKGVERSION}.tar.xz"
 
-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"
+PATCHURL[0]="/src/mariux/beeroot/downloads/chromium-disable-google-api-warnings.patch"
 
 # EXCLUDE+=()
 
@@ -42,7 +40,7 @@ GN_CONFIG=(
 'use_pulseaudio=true'
 'use_sysroot=false')
 
-thirdparty="ffmpeg flac harfbuzz-ng libjpeg libpng libwebp libxslt yasm"
+thirdparty="ffmpeg flac libjpeg libpng libwebp libxslt yasm"
 
 #mee_extract() {
 #    bee_extract "${@}"
@@ -54,11 +52,10 @@ thirdparty="ffmpeg flac harfbuzz-ng libjpeg libpng libwebp libxslt yasm"
 
 mee_configure() {
     cd ${S}
-    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
+
+    source /pkg/gcc-7.2.0-0/profile
+
+    start_cmd sed '/port\.h"/a#include <math.h>' -i.bak third_party/webrtc/p2p/base/port.cc
 
     for LIB in $thirdparty libjpeg_turbo; do
     find -type f -path "*third_party/$LIB/*" \
@@ -69,13 +66,17 @@ mee_configure() {
         -delete
     done
     start_cmd python ${S}/build/linux/unbundle/replace_gn_files.py \
-    --system-libraries $thirdparty
+    --system-libraries $thirdparty libxml libevent opus
 
     start_cmd python ${S}/third_party/libaddressinput/chromium/tools/update-strings.py
+
+    #start_cmd python ${S}/tools/clang/scripts/update.py  --force-local-build \
+    #--gcc-toolchain /usr --without-android
 }
 
 mee_build() {
     cd ${S}
+
     start_cmd python tools/gn/bootstrap/bootstrap.py --gn-gen-args "${GN_CONFIG[*]}" &&
     out/Release/gn gen out/Release --args="${GN_CONFIG[*]}"
 
@@ -100,11 +101,25 @@ mee_install() {
     ${D}${LIBDIR}/chromium/
     start_cmd install -vm644 out/Release/{*.pak,*.bin} ${D}${LIBDIR}/chromium/
     start_cmd cp -av out/Release/locales ${D}${LIBDIR}/chromium/
-    start_cmd install -vDm644 out/Release/chrome.1 ${D}${DATAROOTDIR}/man/man1/chromium.1
+    start_cmd sed -i \
+                  -e "s/@@MENUNAME@@/Chromium/g" \
+                  -e "s/@@PACKAGE@@/chromium/g" \
+                  -e "s/@@USR_BIN_SYMLINK_NAME@@/chromium/g" \
+                  chrome/installer/linux/common/desktop.template \
+                  chrome/app/resources/manpage.1.in
+    start_cmd mkdir -pm755 ${D}${DATAROOTDIR}/applications/
+    start_cmd install -vDm644 chrome/installer/linux/common/desktop.template \
+                              ${D}${DATAROOTDIR}/applications/chromium.desktop
+    start_cmd install -vDm644 chrome/app/resources/manpage.1.in \
+                              ${D}${DATAROOTDIR}/man/man1/chromium.1
     start_cmd mkdir -m755 ${D}${BINDIR}
     start_cmd cd ${D}
     start_cmd ln -sv ${LIBDIR}/chromium/chromedriver usr/bin/chromedriver
-    start_cmd ln -sv ${LIBDIR}/chromium/chromium usr/bin/chromium
+    #start_cmd ln -sv ${LIBDIR}/chromium/chromium usr/bin/chromium
+    cat >${D}${BINDIR}/chromium<<EOF
+LD_LIBRARY_PATH=/pkg/gcc-7.2.0-0/lib /usr/lib/chromium/chromium ${@}
+EOF
+    start_cmd chmod 755 ${D}${BINDIR}/chromium
     cd ${S}
 
     ## Desktop file
@@ -118,21 +133,5 @@ mee_install() {
     install -vDm644 "${S}/chrome/app/theme/chromium/product_logo_$size.png" \
         "${D}${DATAROOTDIR}/icons/hicolor/${size}x${size}/apps/chromium.png"
     done
-
-    start_cmd mkdir -m755 ${D}${DATAROOTDIR}/applications/
-
-    cat > ${D}${DATAROOTDIR}/applications/chromium.desktop <<-EOF
-    [Desktop Entry]
-    Encoding=UTF-8
-    Name=Chromium Web Browser
-    Comment=Access the Internet
-    GenericName=Web Browser
-    Exec=chromium %u
-    Terminal=false
-    Type=Application
-    Icon=chromium
-    Categories=GTK;Network;WebBrowser;
-    MimeType=application/xhtml+xml;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-EOF
 }
 ## by default this may be 'make install DESTDIR="${D}"'