Version bump.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 55 insertions, 175 deletions

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index b199f74e7f28..dff1e523cc6e 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.78 2010/02/09 21:11:05 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.79 2010/02/15 15:12:39 spatz Exp $
+
+*qt-webkit-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org>
+  -files/qt-webkit-4.6.0-solaris-jsvalue.patch, qt-webkit-4.6.1.ebuild,
+  +qt-webkit-4.6.2.ebuild, -files/sparc-qt-webkit-sigbus.patch:
+  Version bump, drop failing sparc patch.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-webkit-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch b/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch
deleted file mode 100644
index 1244d48ea251..000000000000
--- a/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-../JavaScriptCore/runtime/JSValue.h:479: error: cast from ‘JSC::JSCell*’
-to ‘int32_t’ loses precision
-
-Fix inspired by:
-http://bugreports.qt.nokia.com/browse/QTBUG-6948
-
-Seems already to have been fixed upstream webkit in a different way
-(PLATFORM(UNIX) iso DARWIN/LINUX/SOLARIS)
-
-
---- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-+++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -709,7 +709,7 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS))
-+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS) || PLATFORM(SOLARIS))
- #define WTF_USE_JSVALUE64 1
- #elif PLATFORM(ARM) || PLATFORM(PPC64)
- #define WTF_USE_JSVALUE32 1
diff --git a/x11-libs/qt-webkit/files/sparc-qt-webkit-sigbus.patch b/x11-libs/qt-webkit/files/sparc-qt-webkit-sigbus.patch
deleted file mode 100644
index 7bb297f988ef..000000000000
--- a/x11-libs/qt-webkit/files/sparc-qt-webkit-sigbus.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-commit 11c220f6d31898a7a1dfafd5d96619fefe6ba597
-Author: Mike Hommey <glandium@debian.org>
-Date:   Sun Jul 6 10:37:28 2008 +0200
-
-    Fixed some alignment problems on sparc
-    
-    (and some that might occur on arm, too).
-    
-    Some compiler warnings about alignment remain, but I don't know if they are
-    a real problem yet.
-
-diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
-index 1ba1290..7f08646 100644
---- a/JavaScriptCore/wtf/FastMalloc.cpp
-+++ b/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -1824,13 +1824,13 @@ static TCMalloc_Central_FreeListPadded central_cache[kNumClasses];
- 
- // Page-level allocator
- static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
--static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
-+static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
- static bool phinited = false;
- 
- // Avoid extra level of indirection by making "pageheap" be just an alias
- // of pageheap_memory.
- typedef union {
--    void* m_memory;
-+    uint64_t* m_memory;
-     TCMalloc_PageHeap* m_pageHeap;
- } PageHeapUnion;
- 
-diff --git a/JavaScriptCore/wtf/ListHashSet.h b/JavaScriptCore/wtf/ListHashSet.h
-index 5aa13cd..ce09222 100644
---- a/JavaScriptCore/wtf/ListHashSet.h
-+++ b/JavaScriptCore/wtf/ListHashSet.h
-@@ -122,7 +122,7 @@ namespace WTF {
-             : m_freeList(pool())
-             , m_isDoneWithInitialFreeList(false)
-         { 
--            memset(m_pool.pool, 0, sizeof(m_pool.pool));
-+            memset(m_pool, 0, sizeof(m_pool));
-         }
- 
-         Node* allocate()
-@@ -166,7 +166,7 @@ namespace WTF {
-         }
- 
-     private:
--        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
-         Node* pastPool() { return pool() + m_poolSize; }
- 
-         bool inPool(Node* node)
-@@ -177,10 +177,7 @@ namespace WTF {
-         Node* m_freeList;
-         bool m_isDoneWithInitialFreeList;
-         static const size_t m_poolSize = 256;
--        union {
--            char pool[sizeof(Node) * m_poolSize];
--            double forAlignment;
--        } m_pool;
-+        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
-     };
- 
-     template<typename ValueArg> struct ListHashSetNode {
-diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
-index d935052..ce44c25 100644
---- a/JavaScriptCore/wtf/Platform.h
-+++ b/JavaScriptCore/wtf/Platform.h
-@@ -172,6 +172,23 @@
- #define WTF_PLATFORM_X86_64 1
- #endif
- 
-+/* PLATFORM(SPARC) */
-+#if   defined(__sparc__) \
-+   || defined(__sparc)
-+#define WTF_PLATFORM_SPARC 1
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#endif
-+
-+/* For undefined platforms */
-+#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
-+#include <sys/param.h>
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#elif  __BYTE_ORDER == __PDP_ENDIAN
-+#define WTF_PLATFORM_MIDDLE_ENDIAN 1
-+#endif
-+#endif
-+
- /* Compiler */
- 
- /* COMPILER(MSVC) */
-diff --git a/JavaScriptCore/wtf/Vector.h b/JavaScriptCore/wtf/Vector.h
-index 41ab32c..671b20b 100644
---- a/JavaScriptCore/wtf/Vector.h
-+++ b/JavaScriptCore/wtf/Vector.h
-@@ -386,8 +386,7 @@ namespace WTF {
-         static const size_t m_inlineBufferSize = inlineCapacity * sizeof(T);
-         T* inlineBuffer() { return reinterpret_cast<T*>(&m_inlineBuffer); }
- 
--        // FIXME: Nothing guarantees this buffer is appropriately aligned to hold objects of type T.
--        char m_inlineBuffer[m_inlineBufferSize];
-+        uint64_t m_inlineBuffer[(m_inlineBufferSize + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
-     };
- 
-     template<typename T, size_t inlineCapacity = 0>
-diff --git a/WebCore/platform/text/AtomicString.cpp b/WebCore/platform/text/AtomicString.cpp
-index d908dca..1460904 100644
---- a/WebCore/platform/text/AtomicString.cpp
-+++ b/WebCore/platform/text/AtomicString.cpp
-@@ -94,7 +94,7 @@ static inline bool equal(StringImpl* string, const UChar* characters, unsigned l
-     if (string->length() != length)
-         return false;
- 
--#if PLATFORM(ARM)
-+#if PLATFORM(ARM) || PLATFORM(SPARC)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
-diff --git a/WebCore/platform/text/StringHash.h b/WebCore/platform/text/StringHash.h
-index 1eba8c7..8e16b51 100644
---- a/WebCore/platform/text/StringHash.h
-+++ b/WebCore/platform/text/StringHash.h
-@@ -46,6 +46,15 @@ namespace WebCore {
-             if (aLength != bLength)
-                 return false;
- 
-+#if PLATFORM(ARM) || PLATFORM(SPARC)
-+            const UChar* aChars = a->characters();
-+            const UChar* bChars = b->characters();
-+            for (unsigned i = 0; i != aLength; ++i)
-+                if (*aChars++ != *bChars++)
-+                    return false;
-+
-+            return true;
-+#else
-             const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters());
-             const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters());
- 
-@@ -58,6 +67,7 @@ namespace WebCore {
-                 return false;
- 
-             return true;
-+#endif
-         }
- 
-         static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); }
diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild
index 53f8421026b8..6c234dd88d36 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild,v 1.2 2010/01/19 16:03:27 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild,v 1.3 2010/02/15 15:12:39 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -27,12 +27,12 @@ tools/"
 QCONFIG_ADD="webkit"
 QCONFIG_DEFINE="QT_WEBKIT"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch
+)
+
 src_prepare() {
 	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
-	if use sparc; then
-		epatch "${FILESDIR}"/sparc-qt-webkit-sigbus.patch
-	fi
-	epatch "${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch
 	qt4-build_src_prepare
 }
 
diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild
new file mode 100644
index 000000000000..5c5b7f272756
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild,v 1.1 2010/02/15 15:12:39 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The Webkit module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="kde"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
+	~x11-libs/qt-dbus-${PV}[aqua=,debug=]
+	~x11-libs/qt-gui-${PV}[aqua=,dbus,debug=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus,debug=]
+		media-sound/phonon[aqua=] ) )
+	kde? ( media-sound/phonon[aqua=] )"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"
+QT4_EXTRACT_DIRECTORIES="
+include/
+src/
+tools/"
+QCONFIG_ADD="webkit"
+QCONFIG_DEFINE="QT_WEBKIT"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch
+)
+
+src_prepare() {
+	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
+	qt4-build_src_prepare
+}
+
+src_configure() {
+	myconf="${myconf} -webkit"
+	qt4-build_src_configure
+}