Date: Wednesday, April 26, 2017 @ 12:25:34
Author: arojas
Revision: 294748
Fix patch
Modified:
qt5-webkit/trunk/PKGBUILD
qt5-webkit/trunk/qt5-webkit-icu59.patch
------------------------+
PKGBUILD | 2 +-
qt5-webkit-icu59.patch | 37 ++++++++++++++++++++++++++++++++++++-
2 files changed, 37 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-04-26 12:21:41 UTC (rev 294747)
+++ PKGBUILD 2017-04-26 12:25:34 UTC (rev 294748)
@@ -19,7 +19,7 @@
source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}-final/qtwebkit-opensource-src-${pkgver}.tar.xz";
qt5-webkit-icu59.patch)
md5sums=('60a6935aca4a7c553d0ec4646ceed3b4'
- '245b9d4edeecba9bd09a10a8c8ecf4b2')
+ 'f6c74b0196a698cc1c5a34c695b22715')
prepare() {
mkdir -p build
Modified: qt5-webkit-icu59.patch
===================================================================
--- qt5-webkit-icu59.patch 2017-04-26 12:21:41 UTC (rev 294747)
+++ qt5-webkit-icu59.patch 2017-04-26 12:25:34 UTC (rev 294748)
@@ -1,4 +1,39 @@
---- qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h.orig
2015-10-13 06:37:10.000000000 +0200
+diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
+index ead844f..e62cfd4 100644
+--- a/Source/WTF/wtf/Compiler.h
++++ b/Source/WTF/wtf/Compiler.h
+@@ -61,6 +61,7 @@
+ #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR
__has_feature(has_trivial_destructor)
+ #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums)
+ #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS
__has_feature(cxx_reference_qualified_functions)
++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES
!defined(_LIBCPP_HAS_NO_UNICODE_CHARS)
+
+ #endif
+
+@@ -142,6 +143,7 @@
+ #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
+ #endif
+ #if GCC_VERSION_AT_LEAST(4, 5, 0)
++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1
+ #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1
+ #endif
+ #if GCC_VERSION_AT_LEAST(4, 6, 0)
+diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
+index b9e46bc..876fa45 100644
+--- a/Source/WTF/wtf/TypeTraits.h
++++ b/Source/WTF/wtf/TypeTraits.h
+@@ -75,6 +75,10 @@ namespace WTF {
+ #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
+ template<> struct IsInteger<wchar_t> { static const bool value
= true; };
+ #endif
++#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES)
++ template<> struct IsInteger<char16_t> { static const bool value
= true; };
++ template<> struct IsInteger<char32_t> { static const bool value
= true; };
++#endif
+
+ template<typename T> struct IsFloatingPoint { static const bool value
= false; };
+ template<> struct IsFloatingPoint<float> { static const bool value
= true; };
+---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>
