[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-1-4-g87c3883

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 87c3883c5c9620968aed47ea9591d7a1d099cba2
Author: Fathi Boudra <fabo at kde.org>
Date:   Mon Dec 21 15:20:12 2009 +0100

    Add 93_jsvalue64_on_ia64.diff patch to fix ftbfs on IA64 due to lack of WTF_USE_JSVALUE64.
    Thanks to Scott Kitterman.
---
 debian/changelog                         |    7 ++++++-
 debian/patches/93_jsvalue64_on_ia64.diff |   30 ++++++++++++++++++++++++++++++
 debian/patches/series                    |    2 ++
 3 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a51fb83..84e6cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 qt4-x11 (4:4.6.0-2) UNRELEASED; urgency=low
 
+  [ Modestas Vainius ]
   * Change my email address to @debian.org one.
   * Restore binary compatibility with binaries built with g++-4.3 on armel
     (patch 92_armel_gcc43_valist_compat.diff).
 
- -- Modestas Vainius <modax at debian.org>  Sun, 13 Dec 2009 18:43:29 +0200
+  [ Fathi Boudra ]
+  * Add 93_jsvalue64_on_ia64.diff patch to fix ftbfs on IA64 due to lack of
+    WTF_USE_JSVALUE64. Thanks to Scott Kitterman.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Dec 2009 18:43:29 +0200
 
 qt4-x11 (4:4.6.0-1) experimental; urgency=low
 
diff --git a/debian/patches/93_jsvalue64_on_ia64.diff b/debian/patches/93_jsvalue64_on_ia64.diff
new file mode 100644
index 0000000..5a296fc
--- /dev/null
+++ b/debian/patches/93_jsvalue64_on_ia64.diff
@@ -0,0 +1,30 @@
+author: Scott Kitterman <scott at kitterman.com>
+qt bug: QTBUG-6948
+
+Fails to build on IA64 due to lack of WTF_USE_JSVALUE64
+Added to fix IA64 FTBFS
+
+--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+@@ -347,6 +347,12 @@
+ #define WTF_PLATFORM_X86_64 1
+ #endif
+ 
++/* PLATFORM(IA64) */
++/* a.k.a. Itanium Processor Family, IPF */
++#if defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
++#define WTF_PLATFORM_IA64 1
++#endif
++
+ /* PLATFORM(SH4) */
+ #if defined(__SH4__)
+ #define WTF_PLATFORM_SH4 1
+@@ -726,7 +732,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(IA64)) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS))
+ #define WTF_USE_JSVALUE64 1
+ #elif PLATFORM(ARM) || PLATFORM(PPC64)
+ #define WTF_USE_JSVALUE32 1
diff --git a/debian/patches/series b/debian/patches/series
index 96ea1ba..917a96f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,5 @@
 89_powerpc_opts.diff
 91_s390_-gstabs.diff
 92_armel_gcc43_valist_compat.diff
+93_jsvalue64_on_ia64.diff
+

-- 
Qt 4 Debian packaging