[packages/qt5-qtwebkit] - fix type_must_have_known_encoded_size assertions

baggins baggins at pld-linux.org
Tue Apr 25 14:50:50 CEST 2017


commit 50e4885ea50ae50876099807481f6799daac2693
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Apr 25 14:50:35 2017 +0200

    - fix type_must_have_known_encoded_size assertions

 new-char-types.patch | 35 +++++++++++++++++++++++++++++++++++
 qt5-qtwebkit.spec    |  2 ++
 2 files changed, 37 insertions(+)
---
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index a8ef8d5..1e47a9b 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -33,6 +33,7 @@ Group:		X11/Libraries
 Source0:	http://download.qt.io/official_releases/qt/5.5/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
 # Source0-md5:	681328edb539b8fa3a273b38c90b3e31
 Patch0:		icu59.patch
+Patch1:		new-char-types.patch
 URL:		http://www.qt.io/
 BuildRequires:	OpenGL-devel
 BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
@@ -171,6 +172,7 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
 %prep
 %setup -q -n %{orgname}-opensource-src-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 qmake-qt5 \
diff --git a/new-char-types.patch b/new-char-types.patch
new file mode 100644
index 0000000..a096203
--- /dev/null
+++ b/new-char-types.patch
@@ -0,0 +1,35 @@
+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; };
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/50e4885ea50ae50876099807481f6799daac2693



More information about the pld-cvs-commit mailing list