wok-next rev 20359
icu: fix dependencies; webkitgtk: patch for updated icu
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Thu Nov 23 12:57:31 2017 +0200 (2017-11-23) |
parents | 6ba36b73ef48 |
children | 191c68e928af |
files | icu/receipt webkitgtk/stuff/patches/icu60.patch webkitgtk/stuff/patches/series |
line diff
1.1 --- a/icu/receipt Wed Nov 22 21:52:02 2017 +0200 1.2 +++ b/icu/receipt Thu Nov 23 12:57:31 2017 +0200 1.3 @@ -34,22 +34,37 @@ 1.4 1.5 genpkg_rules() { 1.6 case $PACKAGE in 1.7 - libicu|libicu-full) 1.8 + libicu) 1.9 copy libicuuc.so* libicudata.so* 1.10 CAT="libs|core libraries" 1.11 - DEPENDS=" " 1.12 + DEPENDS="glibc-base" 1.13 ;; 1.14 - icu|icu-full) 1.15 + icu) 1.16 copy bin/ sbin/ *.so* @rm 1.17 rm $fs/usr/bin/icu-config 1.18 DEPENDS="libicu" 1.19 ;; 1.20 - *-dev) 1.21 + icu-dev) 1.22 copy @std @dev @rm 1.23 + DEPENDS="libicu icu" 1.24 + ;; 1.25 + 1.26 + libicu-full) 1.27 + copy libicuuc.so* libicudata.so* 1.28 + CAT="libs|core libraries" 1.29 + DEPENDS="glibc-base" 1.30 + PROVIDE="libicu" 1.31 + ;; 1.32 + icu-full) 1.33 + copy bin/ sbin/ *.so* @rm 1.34 + rm $fs/usr/bin/icu-config 1.35 + DEPENDS="libicu-full" 1.36 + PROVIDE="icu" 1.37 + ;; 1.38 + icu-full-dev) 1.39 + copy @std @dev @rm 1.40 + DEPENDS="libicu-full icu-full" 1.41 + PROVIDE="icu-dev" 1.42 ;; 1.43 esac 1.44 - 1.45 - case $PACKAGE in 1.46 - *full*) PROVIDE="${PACKAGE/-full/}";; 1.47 - esac 1.48 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/webkitgtk/stuff/patches/icu60.patch Thu Nov 23 12:57:31 2017 +0200 2.3 @@ -0,0 +1,38 @@ 2.4 +--- a/Source/JavaScriptCore/API/JSStringRef.h 2.5 ++++ b/Source/JavaScriptCore/API/JSStringRef.h 2.6 +@@ -32,6 +32,7 @@ 2.7 + #include <stdbool.h> 2.8 + #endif 2.9 + #include <stddef.h> /* for size_t */ 2.10 ++#include <uchar.h> 2.11 + 2.12 + #ifdef __cplusplus 2.13 + extern "C" { 2.14 +@@ -43,7 +44,7 @@ 2.15 + @typedef JSChar 2.16 + @abstract A Unicode character. 2.17 + */ 2.18 +- typedef unsigned short JSChar; 2.19 ++ typedef char16_t JSChar; 2.20 + #else 2.21 + typedef wchar_t JSChar; 2.22 + #endif 2.23 +--- a/Source/WebKit2/Shared/API/c/WKString.h 2.24 ++++ b/Source/WebKit2/Shared/API/c/WKString.h 2.25 +@@ -28,6 +28,7 @@ 2.26 + 2.27 + #include <WebKit2/WKBase.h> 2.28 + #include <stddef.h> 2.29 ++#include <uchar.h> 2.30 + 2.31 + #ifndef __cplusplus 2.32 + #include <stdbool.h> 2.33 +@@ -39,7 +40,7 @@ 2.34 + 2.35 + #if !defined(WIN32) && !defined(_WIN32) \ 2.36 + && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ 2.37 +- typedef unsigned short WKChar; 2.38 ++ typedef char16_t WKChar; 2.39 + #else 2.40 + typedef wchar_t WKChar; 2.41 + #endif