X-Git-Url: http://gitweb/?a=blobdiff_plain;f=chromium%2FPkgfile;h=c6a646850b87d40b9683f8919dab516d83b1ca0a;hb=c6d538bfc710156a29bf66cf27bde094f7e322f0;hp=3e2215f0a296b714d4d4babf326dde86bc353eb2;hpb=79d44473aa09ed8d8f5dc299fb066bf0600d2f72;p=ports%2Fopt-arm.git

diff --git a/chromium/Pkgfile b/chromium/Pkgfile
index 3e2215f..c6a6468 100644
--- a/chromium/Pkgfile
+++ b/chromium/Pkgfile
@@ -3,17 +3,17 @@
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Maintainer: Jose V Beneyto, sepen at crux dot nu
 # Packager: Tadeusz Sosnierz, tadzikes gmail com
-# Depends on: dbus-glib gperf gtk libevent libexif libgcrypt mesa3d ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt xorg-libxtst yasm
+# Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm
 
 name=chromium
-version=60.0.3112.78
+version=62.0.3202.94
 release=1
-source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \
-        last-commit-position.patch $name-build-toolchain.patch $name-gn-bootstrap-r2.patch $name.sh $name.desktop
-        0001-Clip-FreeType-glyph-bitmap-to-mask.patch
-        chromium-blink-gcc7.patch
-        chromium-v8-gcc7.patch
-        chromium-gn-bootstrap-r8.patch)
+source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz
+  chromium-build-toolchain.patch
+  last-commit-position.patch $name.sh $name.desktop
+  breakpad-use-ucontext_t.patch
+  chromium-gn-bootstrap-r17.patch
+  crc32c-string-view-check.patch)
 
 build() {
   cd $name-$version
@@ -38,17 +38,14 @@ build() {
   # we don't use git sources
   patch -p1 -i $SRC/last-commit-position.patch
 
-  # https://bugs.chromium.org/p/skia/issues/detail?id=6663
-  patch -p1 -d third_party/skia -i $SRC/0001-Clip-FreeType-glyph-bitmap-to-mask.patch
+  # Fix incorrect inclusion of <string_view> in modes other than >= C++17
+  patch -p1 -d third_party/crc32c/src -i $SRC/crc32c-string-view-check.patch
 
-  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853347
-  patch -p1 -i $SRC/chromium-blink-gcc7.patch
-
-  # https://bugs.chromium.org/p/chromium/issues/detail?id=614289
-  patch -p1 -i $SRC/chromium-v8-gcc7.patch
+  # Fix build with glibc 2.26
+  patch -p1 -i $SRC/breakpad-use-ucontext_t.patch
 
   # Fixes from Gentoo
-  patch -p1 -i $SRC/chromium-gn-bootstrap-r8.patch
+  patch -p1 -i $SRC/chromium-gn-bootstrap-r17.patch
 
   mkdir -p third_party/node/linux/node-linux-x64/bin
   ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
@@ -56,9 +53,6 @@ build() {
   # Let's fix the toolchain
   patch -p0 -i $SRC/$name-build-toolchain.patch
 
-  # Gentoo patch
-  patch -p1 -i $SRC/$name-gn-bootstrap-r2.patch
-
   _gn_args=(
     'blink_gc_plugin=false'
     'clang_use_chrome_plugins=false'
@@ -70,6 +64,7 @@ build() {
     'is_clang=false'
     'is_debug=false'
     'linux_use_bundled_binutils=false'
+    'use_custom_libcxx=false'
     'proprietary_codecs=true'
     'remove_webcore_debug_symbols=true'
     'symbol_level=0'
@@ -85,17 +80,13 @@ build() {
     'use_system_libjpeg=true'
   )
 
-  export TMPDIR="${PKGMK_WORK_DIR}/temp"
-  mkdir -p -m 755 "${TMPDIR}" || die
+#  export TMPDIR="${PKGMK_WORK_DIR}/temp"
+#  mkdir -p -m 755 "${TMPDIR}" || die
 
   python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}"
   out/Release/gn gen out/Release --args="${_gn_args[*]}" --script-executable=/usr/bin/python2
 
-  # Ninja, by default, sets the number of jobs to the number of availalble threads
-#  local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS)
-#  test -n "$JOBS" && export JOBS="-j $JOBS"
-  JOBS="-j 2"
-  ninja $JOBS -C out/Release chrome chrome_sandbox
+  ninja -j ${JOBS-1} -C out/Release chrome chrome_sandbox
  
   install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name
   install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox