commit: 020ea1d221e2956779d185f3bd9ff63d330ff8f8 Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com> AuthorDate: Sat Mar 7 16:14:04 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Mon Mar 16 16:34:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=020ea1d2
[dev-qt/qtwebkit23] add support for building with libxml2[icu] Add a patch to let it build when libxml2 is compiled with icu support enabled. This solves conflicts with, e.g., chromium depending on libxml2[icu] .../qtwebkit23-2.3.4-use-correct-typedef.patch | 40 ++++++++++++++++++++++ dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 8 ++--- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebkit23/files/qtwebkit23-2.3.4-use-correct-typedef.patch b/dev-qt/qtwebkit23/files/qtwebkit23-2.3.4-use-correct-typedef.patch new file mode 100644 index 0000000..3e48162 --- /dev/null +++ b/dev-qt/qtwebkit23/files/qtwebkit23-2.3.4-use-correct-typedef.patch @@ -0,0 +1,40 @@ +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 + diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild index 10d51a26..05e60bf 100644 --- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild +++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild @@ -14,13 +14,11 @@ SRC_URI="http://dev.gentoo.org/~kensington/distfiles/qtwebkit23-2.3.4.tar.xz"; LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="4" KEYWORDS="~amd64" - IUSE="+gstreamer" -# libxml2[!icu] is needed for bugs 407315 and 411091 -# https://bugs.webkit.org/show_bug.cgi?id=82824 + RDEPEND=" >=dev-db/sqlite-3.8.3:3 - dev-libs/libxml2:2[-icu] + dev-libs/libxml2:2 dev-libs/libxslt dev-qt/qtcore:4[ssl] dev-qt/qtdeclarative:4 @@ -62,6 +60,8 @@ src_prepare() { sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die sed -i -e "/QMAKE_CXXFLAGS_RELEASE/d" Source/WTF/WTF.pro Source/JavaScriptCore/Target.pri || die + + epatch "${FILESDIR}"/${PN}-2.3.4-use-correct-typedef.patch } src_compile() {
