[packages/qt5-qtwebkit] - fix building with icu 59

baggins baggins at pld-linux.org
Mon Apr 24 12:29:17 CEST 2017


commit 370e02b1d7bc4cd9a58120a807129c8ad1b08cc0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 24 12:29:11 2017 +0200

    - fix building with icu 59

 icu59.patch       | 38 ++++++++++++++++++++++++++++++++++++++
 qt5-qtwebkit.spec |  2 ++
 2 files changed, 40 insertions(+)
---
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index be8f594..a8ef8d5 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -32,6 +32,7 @@ License:	LGPL v2+
 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
 URL:		http://www.qt.io/
 BuildRequires:	OpenGL-devel
 BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
@@ -169,6 +170,7 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
 
 %prep
 %setup -q -n %{orgname}-opensource-src-%{version}
+%patch0 -p1
 
 %build
 qmake-qt5 \
diff --git a/icu59.patch b/icu59.patch
new file mode 100644
index 0000000..a7c190e
--- /dev/null
+++ b/icu59.patch
@@ -0,0 +1,38 @@
+--- 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>
+ #endif
+ #include <stddef.h> /* for size_t */
++#include <uchar.h>
+ 
+ #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
+--- qtwebkit-opensource-src-5.5.1/Source/WebKit2/Shared/API/c/WKString.h.orig	2015-10-13 06:37:12.000000000 +0200
++++ qtwebkit-opensource-src-5.5.1/Source/WebKit2/Shared/API/c/WKString.h	2017-04-24 12:27:33.432011867 +0200
+@@ -31,6 +31,7 @@
+ #ifndef __cplusplus
+ #include <stdbool.h>
+ #endif
++#include <uchar.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -38,7 +39,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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/370e02b1d7bc4cd9a58120a807129c8ad1b08cc0



More information about the pld-cvs-commit mailing list