X-Git-Url: http://gitweb/?a=blobdiff_plain;f=chromium%2FPkgfile;h=121703fa82163a45b895fc4fc2e953c72ab2a13a;hb=47f61ca04308c054a13b0cac45a8a2b79ce8e608;hp=0bace6431a42a83ccd4796baab9a6e9f9a040ff0;hpb=8ba6a019336430a5df5cf1e47b83b1220b5deab6;p=ports%2Fopt-arm.git

diff --git a/chromium/Pkgfile b/chromium/Pkgfile
index 0bace64..121703f 100644
--- a/chromium/Pkgfile
+++ b/chromium/Pkgfile
@@ -6,17 +6,15 @@
 # Depends on: dbus-glib gperf gtk libevent libexif libgcrypt mesa3d ninja nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt xorg-libxtst yasm
 
 name=chromium
-version=53.0.2785.143
+version=54.0.2840.100
 
 release=1
 source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \
-        $name.sh $name.desktop)
+        last-commit-position.patch $name-build-toolchain.patch $name.sh $name.desktop)
 
 build() {
   cd $name-$version
 
-	touch chrome/test/data/webui/i18n_process_css_test.html
-
   export CFLAGS="$CFLAGS $(pkg-config --cflags nspr) -lpthread"
   export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"
 
@@ -31,51 +29,41 @@ build() {
     esac
   done
 
-  build/gyp_chromium build/all.gyp --depth=. \
-        -Dtarget_arch=arm \
-        -Darm_float_abi=hard \
-        -Darmv7=$USE_ARMV7 \
-        -Darm_thumb=$USE_ARM_THUMB \
-        -Darm_neon=$USE_ARM_NEON \
-        -Dv8_target_arch=arm \
-        -Dv8_use_arm_eabi_hardfloat=1 \
-        -Dsysroot= \
-        -Dclang=0 \
-        -Dpython_ver="2.7" \
-        -Dno_strict_aliasing=1 \
-        -Dwerror= \
-        -Dlinux_sandbox_path=/usr/lib/$name/chrome-sandbox \
-        -Dlinux_strip_binary=1 \
-        -Dlinux_use_gold_binary=0 \
-        -Dlinux_use_gold_flags=0 \
-        -Drelease_extra_cflags="$CFLAGS" \
-        -Dproprietary_codecs=1 \
-        -Dffmpeg_branding=Chrome \
-        -Dlibspeechd_h_prefix=speech-dispatcher/ \
-        -Duse_system_libjpeg=1 \
-        -Duse_system_libxslt=1 \
-        -Duse_system_libxml=1 \
-        -Duse_system_bzip2=1 \
-        -Duse_system_zlib=0 \
-        -Duse_system_libpng=0 \
-        -Duse_system_ffmpeg=0 \
-        -Duse_system_yasm=1 \
-        -Duse_system_libevent=1 \
-        -Duse_system_sqlite=0 \
-        -Duse_system_ssl=0 \
-        -Duse_system_icu=0 \
-        -Dremove_webcore_debug_symbols=1 \
-        -Duse_gconf=0 \
-        -Duse_cups=0 \
-        -Duse_gnome_keyring=0 \
-        -Duse_kerberos=0 \
-        -Duse_pulseaudio=0 \
-        -Dlinux_link_gnome_keyring=0 \
-        -Dlinux_link_libpci=1 \
-        -Dlinux_link_libspeechd=1 \
-        -Denable_webrtc=1 \
-        -Ddisable_nacl=1 \
-        -Dicu_use_data_file_flag=1
+
+  # we don't use git sources
+  patch -p1 -i $SRC/last-commit-position.patch
+
+  # Let's fix the toolchain
+  patch -p0 -i $SRC/$name-build-toolchain.patch
+
+  _gn_args=(
+    'blink_gc_plugin=false'
+    'clang_use_chrome_plugins=false'
+    'enable_hangout_services_extension=true'
+    'enable_nacl=false'
+    'enable_nacl_nonsfi=false'
+    'fatal_linker_warnings=false'
+    'ffmpeg_branding="Chrome"'
+    'is_clang=false'
+    'is_debug=false'
+    'linux_use_bundled_binutils=false'
+    'proprietary_codecs=true'
+    'remove_webcore_debug_symbols=true'
+    'symbol_level=0'
+    'treat_warnings_as_errors=false'
+    'use_allocator="none"'
+    'use_cups=false'
+    'use_gconf=false'
+    'use_gnome_keyring=false'
+    'use_gold=false'
+    'use_kerberos=false'
+    'use_pulseaudio=false'
+    'use_sysroot=false'
+    'use_system_libjpeg=true'
+  )
+
+  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 -C out/Release chrome chrome_sandbox
 
@@ -92,7 +80,7 @@ build() {
 
   for size in 22 24 48 128 256; do
     install -m 0644 -D chrome/app/theme/$name/product_logo_${size}.png \
-      $PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
+    $PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
   done
 
   # fix icu installation