[arch-commits] Commit in phantomjs/trunk (PKGBUILD gcc-5.patch)

[Felix Yan]

    Date: Wednesday, June 3, 2015 @ 06:22:34
  Author: fyan
Revision: 134666

upgpkg: phantomjs 2.0.0-4

fix gcc 5 build

Added:
  phantomjs/trunk/gcc-5.patch
Modified:
  phantomjs/trunk/PKGBUILD

-------------+
 PKGBUILD    |   19 +++++++++++++------
 gcc-5.patch |   17 +++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-03 03:57:29 UTC (rev 134665)
+++ PKGBUILD	2015-06-03 04:22:34 UTC (rev 134666)
@@ -7,7 +7,7 @@
 
 pkgname=phantomjs
 pkgver=2.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Headless WebKit with JavaScript API"
 url="http://www.phantomjs.org/"
 license=('BSD' 'LGPL' 'MIT')
@@ -14,13 +14,19 @@
 arch=('i686' 'x86_64')
 depends=('icu' 'libjpeg-turbo' 'libpng' 'fontconfig' 'gperf' 'ruby' 'python2' 'gstreamer0.10-base')
 makedepends=('git')
-source=("git+https://github.com/ariya/${pkgname}.git#tag=$pkgver")
+source=("git+https://github.com/ariya/${pkgname}.git#tag=$pkgver"
+        gcc-5.patch)
 
+prepare() {
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+
+  # https://bugreports.qt.io/browse/QTBUG-44829 / https://github.com/ariya/phantomjs/issues/13265
+  (cd $pkgname/src/qt/qtwebkit; patch -p1 -i "$srcdir/gcc-5.patch")
+}
+
 build() {
   cd $pkgname
-  
-  mkdir "$srcdir/python2-path"
-  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
   export PATH="$srcdir/python2-path:$PATH" PYTHON=/usr/bin/python2 
   
   # shared build requires qt 5.3
@@ -38,4 +44,5 @@
   install -Dm644 "$srcdir/$pkgname/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt"
 }
 
-sha512sums=('SKIP')
+sha512sums=('SKIP'
+            '9c584fb049c1c32d9ca640c44ed42beb0706833ee11d689fa738f9b6543f24e315fa707a61efaefe7fccaa88478cbe5bdcc6d490c2b0cfac580bd96e534bc2eb')

Added: gcc-5.patch
===================================================================
--- gcc-5.patch	                        (rev 0)
+++ gcc-5.patch	2015-06-03 04:22:34 UTC (rev 134666)
@@ -0,0 +1,17 @@
+diff -up qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than 
+qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp
+--- qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than	2015-03-18 10:24:38.683352327 
+-0400
++++ qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp	2015-03-18 10:25:21.953352327 -0400
+@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen
+     }
+ }
+ 
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
++
+ void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
+ {
+     VM& vm = exec->vm();
+