[arch-commits] Commit in phantomjs/repos (6 files)
Felix Yan
fyan at archlinux.org
Wed Jun 3 04:27:30 UTC 2015
Date: Wednesday, June 3, 2015 @ 06:27:29
Author: fyan
Revision: 134667
archrelease: copy trunk to community-i686, community-x86_64
Added:
phantomjs/repos/community-i686/PKGBUILD
(from rev 134666, phantomjs/trunk/PKGBUILD)
phantomjs/repos/community-i686/gcc-5.patch
(from rev 134666, phantomjs/trunk/gcc-5.patch)
phantomjs/repos/community-x86_64/PKGBUILD
(from rev 134666, phantomjs/trunk/PKGBUILD)
phantomjs/repos/community-x86_64/gcc-5.patch
(from rev 134666, phantomjs/trunk/gcc-5.patch)
Deleted:
phantomjs/repos/community-i686/PKGBUILD
phantomjs/repos/community-x86_64/PKGBUILD
------------------------------+
/PKGBUILD | 96 +++++++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 41 -----------------
community-i686/gcc-5.patch | 17 +++++++
community-x86_64/PKGBUILD | 41 -----------------
community-x86_64/gcc-5.patch | 17 +++++++
5 files changed, 130 insertions(+), 82 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-06-03 04:22:34 UTC (rev 134666)
+++ community-i686/PKGBUILD 2015-06-03 04:27:29 UTC (rev 134667)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: grimsock <lord.grimsock at gmail dot com>
-# Contributor: Dieter Plaetinck <dieter at plaetinck.be>
-# Contributor: Vladimir Chizhov <jagoterr at gmail.com>
-# Contributor: Henry Tang <henryykt at gmail.com>
-
-pkgname=phantomjs
-pkgver=2.0.0
-pkgrel=3
-pkgdesc="Headless WebKit with JavaScript API"
-url="http://www.phantomjs.org/"
-license=('BSD' 'LGPL' 'MIT')
-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")
-
-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
- #sed -i "s/export QMAKE=qmake/export QMAKE=qmake-qt5/" build.sh
- ./build.sh --confirm --qtdeps=system --qt-config '-no-rpath' # --qtwebkit=system
-}
-
-package() {
- install -Dm755 "$srcdir/$pkgname/bin/phantomjs" "$pkgdir/usr/bin/phantomjs"
-
- mkdir -p "$pkgdir/usr/share/$pkgname"
- cp -r "$srcdir/$pkgname/examples" "$pkgdir/usr/share/$pkgname"/
-
- install -Dm644 "$srcdir/$pkgname/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD"
- install -Dm644 "$srcdir/$pkgname/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt"
-}
-
-sha512sums=('SKIP')
Copied: phantomjs/repos/community-i686/PKGBUILD (from rev 134666, phantomjs/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-06-03 04:27:29 UTC (rev 134667)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: grimsock <lord.grimsock at gmail dot com>
+# Contributor: Dieter Plaetinck <dieter at plaetinck.be>
+# Contributor: Vladimir Chizhov <jagoterr at gmail.com>
+# Contributor: Henry Tang <henryykt at gmail.com>
+
+pkgname=phantomjs
+pkgver=2.0.0
+pkgrel=4
+pkgdesc="Headless WebKit with JavaScript API"
+url="http://www.phantomjs.org/"
+license=('BSD' 'LGPL' 'MIT')
+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"
+ 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
+ export PATH="$srcdir/python2-path:$PATH" PYTHON=/usr/bin/python2
+
+ # shared build requires qt 5.3
+ #sed -i "s/export QMAKE=qmake/export QMAKE=qmake-qt5/" build.sh
+ ./build.sh --confirm --qtdeps=system --qt-config '-no-rpath' # --qtwebkit=system
+}
+
+package() {
+ install -Dm755 "$srcdir/$pkgname/bin/phantomjs" "$pkgdir/usr/bin/phantomjs"
+
+ mkdir -p "$pkgdir/usr/share/$pkgname"
+ cp -r "$srcdir/$pkgname/examples" "$pkgdir/usr/share/$pkgname"/
+
+ install -Dm644 "$srcdir/$pkgname/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD"
+ install -Dm644 "$srcdir/$pkgname/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt"
+}
+
+sha512sums=('SKIP'
+ '9c584fb049c1c32d9ca640c44ed42beb0706833ee11d689fa738f9b6543f24e315fa707a61efaefe7fccaa88478cbe5bdcc6d490c2b0cfac580bd96e534bc2eb')
Copied: phantomjs/repos/community-i686/gcc-5.patch (from rev 134666, phantomjs/trunk/gcc-5.patch)
===================================================================
--- community-i686/gcc-5.patch (rev 0)
+++ community-i686/gcc-5.patch 2015-06-03 04:27:29 UTC (rev 134667)
@@ -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();
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-06-03 04:22:34 UTC (rev 134666)
+++ community-x86_64/PKGBUILD 2015-06-03 04:27:29 UTC (rev 134667)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: grimsock <lord.grimsock at gmail dot com>
-# Contributor: Dieter Plaetinck <dieter at plaetinck.be>
-# Contributor: Vladimir Chizhov <jagoterr at gmail.com>
-# Contributor: Henry Tang <henryykt at gmail.com>
-
-pkgname=phantomjs
-pkgver=2.0.0
-pkgrel=3
-pkgdesc="Headless WebKit with JavaScript API"
-url="http://www.phantomjs.org/"
-license=('BSD' 'LGPL' 'MIT')
-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")
-
-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
- #sed -i "s/export QMAKE=qmake/export QMAKE=qmake-qt5/" build.sh
- ./build.sh --confirm --qtdeps=system --qt-config '-no-rpath' # --qtwebkit=system
-}
-
-package() {
- install -Dm755 "$srcdir/$pkgname/bin/phantomjs" "$pkgdir/usr/bin/phantomjs"
-
- mkdir -p "$pkgdir/usr/share/$pkgname"
- cp -r "$srcdir/$pkgname/examples" "$pkgdir/usr/share/$pkgname"/
-
- install -Dm644 "$srcdir/$pkgname/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD"
- install -Dm644 "$srcdir/$pkgname/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt"
-}
-
-sha512sums=('SKIP')
Copied: phantomjs/repos/community-x86_64/PKGBUILD (from rev 134666, phantomjs/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-06-03 04:27:29 UTC (rev 134667)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: grimsock <lord.grimsock at gmail dot com>
+# Contributor: Dieter Plaetinck <dieter at plaetinck.be>
+# Contributor: Vladimir Chizhov <jagoterr at gmail.com>
+# Contributor: Henry Tang <henryykt at gmail.com>
+
+pkgname=phantomjs
+pkgver=2.0.0
+pkgrel=4
+pkgdesc="Headless WebKit with JavaScript API"
+url="http://www.phantomjs.org/"
+license=('BSD' 'LGPL' 'MIT')
+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"
+ 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
+ export PATH="$srcdir/python2-path:$PATH" PYTHON=/usr/bin/python2
+
+ # shared build requires qt 5.3
+ #sed -i "s/export QMAKE=qmake/export QMAKE=qmake-qt5/" build.sh
+ ./build.sh --confirm --qtdeps=system --qt-config '-no-rpath' # --qtwebkit=system
+}
+
+package() {
+ install -Dm755 "$srcdir/$pkgname/bin/phantomjs" "$pkgdir/usr/bin/phantomjs"
+
+ mkdir -p "$pkgdir/usr/share/$pkgname"
+ cp -r "$srcdir/$pkgname/examples" "$pkgdir/usr/share/$pkgname"/
+
+ install -Dm644 "$srcdir/$pkgname/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD"
+ install -Dm644 "$srcdir/$pkgname/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt"
+}
+
+sha512sums=('SKIP'
+ '9c584fb049c1c32d9ca640c44ed42beb0706833ee11d689fa738f9b6543f24e315fa707a61efaefe7fccaa88478cbe5bdcc6d490c2b0cfac580bd96e534bc2eb')
Copied: phantomjs/repos/community-x86_64/gcc-5.patch (from rev 134666, phantomjs/trunk/gcc-5.patch)
===================================================================
--- community-x86_64/gcc-5.patch (rev 0)
+++ community-x86_64/gcc-5.patch 2015-06-03 04:27:29 UTC (rev 134667)
@@ -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();
+
More information about the arch-commits
mailing list