[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD qt5-webkit-icu59.patch)
Antonio Rojas
arojas at archlinux.org
Wed Apr 26 10:28:53 UTC 2017
Date: Wednesday, April 26, 2017 @ 10:28:50
Author: arojas
Revision: 294741
Add patch from PLD to fix build with ICU 59
Added:
qt5-webkit/trunk/qt5-webkit-icu59.patch
Modified:
qt5-webkit/trunk/PKGBUILD
------------------------+
PKGBUILD | 10 ++++++++--
qt5-webkit-icu59.patch | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-04-26 09:59:42 UTC (rev 294740)
+++ PKGBUILD 2017-04-26 10:28:50 UTC (rev 294741)
@@ -16,11 +16,17 @@
conflicts=('qt')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${pkgver}"
-source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}-final/qtwebkit-opensource-src-${pkgver}.tar.xz")
-md5sums=('60a6935aca4a7c553d0ec4646ceed3b4')
+source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}-final/qtwebkit-opensource-src-${pkgver}.tar.xz"
+ qt5-webkit-icu59.patch)
+md5sums=('60a6935aca4a7c553d0ec4646ceed3b4'
+ '245b9d4edeecba9bd09a10a8c8ecf4b2')
prepare() {
mkdir -p build
+
+# Fix build with ICU 59 (PLD linux)
+ cd ${_pkgfqn}
+ 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:28:50 UTC (rev 294741)
@@ -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
More information about the arch-commits
mailing list