Date: Tuesday, April 25, 2017 @ 08:58:31 Author: foutrelis Revision: 294627
Add patch from PLD Linux to fix build with ICU 59 Added: webkit2gtk/trunk/icu59.patch Modified: webkit2gtk/trunk/PKGBUILD -------------+ PKGBUILD | 7 +++++-- icu59.patch | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-04-25 08:28:10 UTC (rev 294626) +++ PKGBUILD 2017-04-25 08:58:31 UTC (rev 294627) @@ -18,11 +18,13 @@ options=(!emptydirs) source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc} 0001-Merge-r214319-JSC-MachineThreads-does-not-consider-s.patch - 0001-Show-a-log-message-when-an-invalid-message-is-receiv.patch) + 0001-Show-a-log-message-when-an-invalid-message-is-receiv.patch + icu59.patch) sha256sums=('eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945' 'SKIP' '51541d4cb1f58d3b7c7112948ce0588e45ca445434350aec3e47c227651ff19f' - '18219f8a016eeb001efb4788891d18d83804f03bda537da621bcf73615a68e2f') + '18219f8a016eeb001efb4788891d18d83804f03bda537da621bcf73615a68e2f' + 'eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d') validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3') prepare() { @@ -34,6 +36,7 @@ #rm -r Source/ThirdParty/qunit/ patch -Np1 -i ../0001-Merge-r214319-JSC-MachineThreads-does-not-consider-s.patch patch -Np1 -i ../0001-Show-a-log-message-when-an-invalid-message-is-receiv.patch + patch -Np1 -i ../icu59.patch } build() { Added: icu59.patch =================================================================== --- icu59.patch (rev 0) +++ icu59.patch 2017-04-25 08:58:31 UTC (rev 294627) @@ -0,0 +1,38 @@ +--- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100 ++++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200 +@@ -32,6 +32,7 @@ + #include <stdbool.h> + #endif + #include <stddef.h> /* for size_t */ ++#include <uchar.h> + + #ifdef __cplusplus + extern "C" { +@@ -46,7 +47,7 @@ + character. As with all scalar types, endianness depends on the underlying + architecture. + */ +- typedef unsigned short JSChar; ++ typedef char16_t JSChar; + #else + typedef wchar_t JSChar; + #endif +--- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100 ++++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200 +@@ -28,6 +28,7 @@ + + #include <WebKit/WKBase.h> + #include <stddef.h> ++#include <uchar.h> + + #ifndef __cplusplus + #include <stdbool.h> +@@ -39,7 +40,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
