[arch-commits] Commit in qt5-webkit-ng/trunk (PKGBUILD qt5-webkit-icu59.patch)

[Antonio Rojas]

    Date: Wednesday, April 26, 2017 @ 10:32:13
  Author: arojas
Revision: 294742

Add patch from PLD to fix build with ICU 59

Added:
  qt5-webkit-ng/trunk/qt5-webkit-icu59.patch
Modified:
  qt5-webkit-ng/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    8 ++++++--
 qt5-webkit-icu59.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-26 10:28:50 UTC (rev 294741)
+++ PKGBUILD	2017-04-26 10:32:13 UTC (rev 294742)
@@ -14,9 +14,11 @@
 conflicts=(qt5-webkit)
 provides=(qt5-webkit)
 source=("https://github.com/annulen/webkit/archive/qtwebkit-$pkgver.tar.gz"
-        qtwebkit-ng-export-cmake-variables.patch::"https://github.com/annulen/webkit/commit/1467a945.patch")
+        qtwebkit-ng-export-cmake-variables.patch::"https://github.com/annulen/webkit/commit/1467a945.patch"
+        qt5-webkit-icu59.patch)
 sha256sums=('04bcb819675be6ebe0bba81519319dede6510512a73ef53d20465f91034ee719'
-            'e7839c2eb2d4f998a6c7f6316f408bb8a948c769f8d987903368b0fe689558c6')
+            'e7839c2eb2d4f998a6c7f6316f408bb8a948c769f8d987903368b0fe689558c6'
+            'e1306e696ad7125fa00083aa966be0ea6fe6de555c9e1d119957f208f258edfe')
 
 prepare() {
   mkdir -p build
@@ -24,6 +26,8 @@
 # Correctly export all needed cmake variables
   cd webkit-qtwebkit-$pkgver
   patch -p1 -i ../qtwebkit-ng-export-cmake-variables.patch
+# Fix build with ICU 59 (PLD linux)
+  patch -p1 -i ../qt5-webkit-icu59.patch
 }
 
 build() {

Added: qt5-webkit-icu59.patch
===================================================================
--- qt5-webkit-icu59.patch	                        (rev 0)
+++ qt5-webkit-icu59.patch	2017-04-26 10:32:13 UTC (rev 294742)
@@ -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