# HG changeset patch # User Aleksej Bobylev # Date 1511434651 -7200 # Node ID 467541fe91e86510c601ae18e747e86d0819355d # Parent 6ba36b73ef4877d358ca132885c018ccaa3fcb92 icu: fix dependencies; webkitgtk: patch for updated icu diff -r 6ba36b73ef48 -r 467541fe91e8 icu/receipt --- a/icu/receipt Wed Nov 22 21:52:02 2017 +0200 +++ b/icu/receipt Thu Nov 23 12:57:31 2017 +0200 @@ -34,22 +34,37 @@ genpkg_rules() { case $PACKAGE in - libicu|libicu-full) + libicu) copy libicuuc.so* libicudata.so* CAT="libs|core libraries" - DEPENDS=" " + DEPENDS="glibc-base" ;; - icu|icu-full) + icu) copy bin/ sbin/ *.so* @rm rm $fs/usr/bin/icu-config DEPENDS="libicu" ;; - *-dev) + icu-dev) copy @std @dev @rm + DEPENDS="libicu icu" + ;; + + libicu-full) + copy libicuuc.so* libicudata.so* + CAT="libs|core libraries" + DEPENDS="glibc-base" + PROVIDE="libicu" + ;; + icu-full) + copy bin/ sbin/ *.so* @rm + rm $fs/usr/bin/icu-config + DEPENDS="libicu-full" + PROVIDE="icu" + ;; + icu-full-dev) + copy @std @dev @rm + DEPENDS="libicu-full icu-full" + PROVIDE="icu-dev" ;; esac - - case $PACKAGE in - *full*) PROVIDE="${PACKAGE/-full/}";; - esac } diff -r 6ba36b73ef48 -r 467541fe91e8 webkitgtk/stuff/patches/icu60.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webkitgtk/stuff/patches/icu60.patch Thu Nov 23 12:57:31 2017 +0200 @@ -0,0 +1,38 @@ +--- a/Source/JavaScriptCore/API/JSStringRef.h ++++ b/Source/JavaScriptCore/API/JSStringRef.h +@@ -32,6 +32,7 @@ + #include + #endif + #include /* for size_t */ ++#include + + #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 +--- a/Source/WebKit2/Shared/API/c/WKString.h ++++ b/Source/WebKit2/Shared/API/c/WKString.h +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + #ifndef __cplusplus + #include +@@ -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 diff -r 6ba36b73ef48 -r 467541fe91e8 webkitgtk/stuff/patches/series --- a/webkitgtk/stuff/patches/series Wed Nov 22 21:52:02 2017 +0200 +++ b/webkitgtk/stuff/patches/series Thu Nov 23 12:57:31 2017 +0200 @@ -1,2 +1,3 @@ # from https://aur.archlinux.org/packages/webkitgtk/ webkitgtk-2.4.9-abs.patch +icu60.patch