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

[Evangelos Foutras]

    Date: Wednesday, April 26, 2017 @ 06:25:49
  Author: foutrelis
Revision: 225392

Add patch from PLD Linux to fix build with ICU 59

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

-------------+
 PKGBUILD    |   10 ++++++----
 gcc-5.patch |   17 -----------------
 icu59.patch |   38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-26 06:12:24 UTC (rev 225391)
+++ PKGBUILD	2017-04-26 06:25:49 UTC (rev 225392)
@@ -15,9 +15,12 @@
 depends=('icu' 'libjpeg-turbo' 'libpng' 'fontconfig' 'gperf' 'ruby' 'python2' 'openssl-1.0')
 makedepends=('git')
 source=("git+https://github.com/ariya/${pkgname}.git#tag=$pkgver"
-        gcc-5.patch)
+        icu59.patch)
 
 prepare() {
+  cd $pkgname
+  git submodule update --init
+  patch -Np1 -d src/qt/qtwebkit <../icu59.patch
   mkdir "$srcdir/python2-path"
   ln -s /usr/bin/python2 "$srcdir/python2-path/python"
 }
@@ -24,11 +27,10 @@
 
 build() {
   cd $pkgname
-  export PATH="$srcdir/python2-path:$PATH" PYTHON=/usr/bin/python2 
+  export PATH="$srcdir/python2-path:$PATH" PYTHON=/usr/bin/python2
   export CXXFLAGS+=" -I/usr/include/openssl-1.0"
   export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
 
-  
   python2 build.py --confirm --release --qt-config='-no-rpath'
 }
 
@@ -43,4 +45,4 @@
 }
 
 sha512sums=('SKIP'
-            '9c584fb049c1c32d9ca640c44ed42beb0706833ee11d689fa738f9b6543f24e315fa707a61efaefe7fccaa88478cbe5bdcc6d490c2b0cfac580bd96e534bc2eb')
+            'e349a14c5d32e5627f28be6ebd20104370ec6b7f086f670e7f19b484b38839220cfeb49178765f38d918d05fb889bbc990f8a3809db6d9e1cbde0af5b9dd923b')

Deleted: gcc-5.patch
===================================================================
--- gcc-5.patch	2017-04-26 06:12:24 UTC (rev 225391)
+++ gcc-5.patch	2017-04-26 06:25:49 UTC (rev 225392)
@@ -1,17 +0,0 @@
-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();
-

Added: icu59.patch
===================================================================
--- icu59.patch	                        (rev 0)
+++ icu59.patch	2017-04-26 06:25:49 UTC (rev 225392)
@@ -0,0 +1,38 @@
+--- qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h.orig	2015-10-13 06:37:10.000000000 +0200
++++ qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h	2017-04-24 12:26:42.495345570 +0200
+@@ -32,6 +32,7 @@
+ #include <stdbool.h>
+ #endif
+ #include <stddef.h> /* for size_t */
++#include <uchar.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -43,7 +44,7 @@
+ @typedef JSChar
+ @abstract A Unicode character.
+ */
+-    typedef unsigned short JSChar;
++    typedef char16_t JSChar;
+ #else
+     typedef wchar_t JSChar;
+ #endif
+--- qtwebkit-opensource-src-5.5.1/Source/WebKit2/Shared/API/c/WKString.h.orig	2015-10-13 06:37:12.000000000 +0200
++++ qtwebkit-opensource-src-5.5.1/Source/WebKit2/Shared/API/c/WKString.h	2017-04-24 12:27:33.432011867 +0200
+@@ -31,6 +31,7 @@
+ #ifndef __cplusplus
+ #include <stdbool.h>
+ #endif
++#include <uchar.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -38,7 +39,7 @@
+ 
+ #if !defined(WIN32) && !defined(_WIN32) \
+     && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
+-    typedef unsigned short WKChar;
++    typedef char16_t WKChar;
+ #else
+     typedef wchar_t WKChar;
+ #endif