apply dflemstr patch, add wget as makedep

1 files changed, 48 insertions, 29 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0e7901d4e9ae..e6d3a412d619 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,38 @@
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: tocer <tocer.deng@gmail.com>
+# Contributor: David Flemström <david.flemstrom@gmail.com>
 # Maintainer: Marco Pompili <aur@emarcs.org>
 
 pkgname=v8
-pkgver=5.5.63.1
+pkgver=5.6.178
 pkgrel=1
 pkgdesc="Fast and modern Javascript engine used in Google Chrome."
 arch=('i686' 'x86_64')
 url="https://code.google.com/p/v8/"
 license=('BSD')
 depends=('readline' 'icu')
-makedepends=('clang>=3.8.1' 'clang-tools-extra>=3.8.1' 'python2' 'python2-virtualenv' 'ninja' 'git')
+makedepends=('clang>=3.8.1' 'clang-tools-extra>=3.8.1' 'python2' 'python2-virtualenv' 'ninja' 'git' 'wget')
 conflicts=('v8-5.2' 'v8-3.14' 'v8-3.15' 'v8-3.20')
 source=("depot_tools::git+https://chromium.googlesource.com/chromium/tools/depot_tools.git"
         "v8.pc"
+        "v8_libbase.pc"
+        "v8_libplatform.pc"
         "d8")
+
 sha256sums=('SKIP'
-            '2b054309df9af9fb2e3e14527e88360b44745649b4866e592fb357ac90935f5d'
-            'cfd0712ee91d30b62e761da130e194c18f2b92a7f1654fb4af49f96ae9ce3e1b')
+            '3616bcfb15af7cd5a39bc0f223b2a52f15883a4bc8cfcfb291837c7421363d75'
+            'efb37bd706e6535abfa20c77bb16597253391619dae275627312d00ee7332fa3'
+            'ae23d543f655b4d8449f98828d0aff6858a777429b9ebdd2e23541f89645d4eb'
+            '6abb07ab1cf593067d19028f385bd7ee52196fc644e315c388f08294d82ceff0')
 
 case "$CARCH" in
   x86_64) V8_ARCH="x64" ;;
   i686) V8_ARCH="ia32" ;;
 esac
 
+OUTFLD=out.gn/Release
+
 prepare() {
   msg2 "Creating Python Virtual Environment"
   virtualenv2 -q venv
@@ -48,27 +56,41 @@ prepare() {
 
   cd v8
 
+  if [ -f third_party/icu/BUILD.gn.orig ]
+  then
+      msg2 "Restoring bundled ICU build files for syncing"
+      ./build/linux/unbundle/replace_gn_files.py --undo --system-libraries icu
+  fi
+
   msg2 "Syncing"
-  gclient sync
-  git checkout tags/${pkgver}
+  gclient sync --revision ${pkgver}
+
+  msg2 "Using system libraries for ICU"
+  ./build/linux/unbundle/replace_gn_files.py --system-libraries icu
 
   sed "s/@VERSION@/${pkgver}/g" -i "${srcdir}/v8.pc"
+  sed "s/@VERSION@/${pkgver}/g" -i "${srcdir}/v8_libbase.pc"
+  sed "s/@VERSION@/${pkgver}/g" -i "${srcdir}/v8_libplatform.pc"
 }
 
-OUTFLD=out.gn/Release
-
 build() {
   cd v8
 
   msg2 "Running GN..."
   ../depot_tools/gn gen $OUTFLD \
-		    -vv --fail-on-unused-args \
-		    --args='is_debug=false is_clang=false use_sysroot=false clang_base_path="/usr" is_component_build=true v8_enable_i18n_support=true icu_use_data_file=false'
-  
-
-  ## Needs to resync after running GN
-  msg2 "Resyncing..."
-  gclient sync > /dev/null
+    -vv --fail-on-unused-args \
+    --args='is_debug=false
+    is_official_build=true
+    is_clang=false
+    use_sysroot=false
+    clang_base_path="/usr"
+    is_component_build=true
+    v8_enable_i18n_support=true
+    v8_use_external_startup_data=false'
+
+  # Fixes bug in generate_shim_headers.py that fails to create these dirs
+  mkdir -p "$OUTFLD/gen/shim_headers/icuuc_shim/third_party/icu/source/common/unicode/"
+  mkdir -p "$OUTFLD/gen/shim_headers/icui18n_shim/third_party/icu/source/i18n/unicode/"
 
   msg2 "Building, this will take a while..."
   ninja -C $OUTFLD
@@ -79,10 +101,10 @@ check() {
 
   msg2 "Testing, this will take also a while..."
   tools/run-tests.py --no-presubmit \
-		     --outdir=out.gn \
-		     --buildbot \
-		     --arch=$V8_ARCH \
-		     --mode=Release
+                     --outdir=out.gn \
+                     --buildbot \
+                     --arch=$V8_ARCH \
+                     --mode=Release
 }
 
 package() {
@@ -90,17 +112,12 @@ package() {
 
   install -d ${pkgdir}/usr/lib/v8
 
-  #install -Dm644 $srcdir/v8/$OUTFLD/obj/src/*.a $pkgdir/usr/lib/v8
-  
   install -Dm755 $OUTFLD/d8 ${pkgdir}/usr/lib/v8/d8
-  install -Dm644 $OUTFLD/natives_blob.bin ${pkgdir}/usr/lib/v8/natives_blob.bin
-  install -Dm644 $OUTFLD/snapshot_blob.bin ${pkgdir}/usr/lib/v8/snapshot_blob.bin
-  
-  install -Dm755 $OUTFLD/libicui18n.so ${pkgdir}/usr/lib/v8/libicui18n.so
-  install -Dm755 $OUTFLD/libicuuc.so ${pkgdir}/usr/lib/v8/libicuuc.so
-  install -Dm755 $OUTFLD/libv8.so ${pkgdir}/usr/lib/v8/libv8.so
-  
-  ln -s v8/libv8.so ${pkgdir}/usr/libv8.so
+
+  install -Dm755 $OUTFLD/libv8.so ${pkgdir}/usr/lib/libv8.so
+  install -Dm755 $OUTFLD/libv8_libbase.so ${pkgdir}/usr/lib/libv8_libbase.so
+  install -Dm755 $OUTFLD/libv8_libplatform.so ${pkgdir}/usr/lib/libv8_libplatform.so
+
   install -Dm755 ${srcdir}/d8 ${pkgdir}/usr/bin/d8
 
   # V8 has several header files and ideally if it had its own folder in /usr/include
@@ -110,6 +127,8 @@ package() {
 
   install -d ${pkgdir}/usr/lib/pkgconfig
   install -m644 $srcdir/v8.pc ${pkgdir}/usr/lib/pkgconfig
+  install -m644 $srcdir/v8_libbase.pc ${pkgdir}/usr/lib/pkgconfig
+  install -m644 $srcdir/v8_libplatform.pc ${pkgdir}/usr/lib/pkgconfig
 
   install -d ${pkgdir}/usr/share/licenses/v8
   install -m644 LICENSE* ${pkgdir}/usr/share/licenses/v8