pesa 15/07/23 20:36:44 Added: 4.10.4-use-correct-icu-typedef.patch Log: Import qtwebkit23-2.3.4 from qt overlay as qtwebkit-4.10.4 (version of the installed library). See bug 388207. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.1 dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch?rev=1.1&content-type=text/plain Index: 4.10.4-use-correct-icu-typedef.patch =================================================================== >From 916f00008b602ae1b260106e7fb1274d2282f61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]> Date: Tue, 3 Sep 2013 16:59:35 +0200 Subject: [PATCH] ICU has defined UChar32 to be an int32_t since 2002 This fixes the build failure of qtwebkit23 on my Gentoo machine. --- Source/WTF/wtf/unicode/qt4/UnicodeQt4.h | 2 +- Source/WTF/wtf/unicode/wchar/UnicodeWchar.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h index a2d1ad4..392d2db 100644 --- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h +++ b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h @@ -69,7 +69,7 @@ typedef uint16_t UChar; #endif #if !USE(ICU_UNICODE) -typedef uint32_t UChar32; +typedef int32_t UChar32; #endif namespace WTF { diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h index 10c2026..db8944e 100644 --- a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h +++ b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h @@ -31,7 +31,7 @@ #include <wtf/unicode/UnicodeMacrosFromICU.h> typedef wchar_t UChar; -typedef uint32_t UChar32; +typedef int32_t UChar32; namespace WTF { namespace Unicode { -- 1.7.1
