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

Fathi Boudra fabo at alioth.debian.org
Thu Jan 7 09:18:52 UTC 2010


The following commit has been merged in the experimental-snapshots branch:
commit c9c9fb3aae6fc852e0ba44124e755d8286dcc10f
Author: Fathi Boudra <fabo at kde.org>
Date:   Thu Jan 7 10:18:29 2010 +0100

    Add debian/patches/95_sparc_platform_definition.diff patch to fix build for
    32-bit sparc machines.
---
 debian/changelog                                 |    2 +
 debian/patches/95_sparc_platform_definition.diff |   23 ++++++++++++++++++++++
 debian/patches/series                            |    1 +
 3 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1e7091..6545bfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ qt4-x11 (4:4.6.0-2) UNRELEASED; urgency=low
   * Add 94_fix_crash_in_qdbuspendingreply_qdbusreply.diff patch to fix a crash
     in QDBusPendingReply/QDBusReply in case of unconnected calls.
     (Closes: #560838)
+  * Add debian/patches/95_sparc_platform_definition.diff patch to fix build for
+    32-bit sparc machines.
   * Update debian/rules:
     - Use linux-g++-64 as platform_arg on required architectures (amd64, ia64
       and sparc64).
diff --git a/debian/patches/95_sparc_platform_definition.diff b/debian/patches/95_sparc_platform_definition.diff
new file mode 100644
index 0000000..0c5216b
--- /dev/null
+++ b/debian/patches/95_sparc_platform_definition.diff
@@ -0,0 +1,23 @@
+Description: Build fix for 32-bit Sparc machines: these machines are big-endian.
+Origin: http://trac.webkit.org/changeset/51183/trunk/JavaScriptCore/wtf/Platform.h
+Forwarded: not-needed
+
+--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+@@ -218,6 +218,16 @@
+ #define WTF_PLATFORM_BIG_ENDIAN 1
+ #endif
+ 
++/* PLATFORM(SPARC32) */
++#if defined(__sparc) && !defined(__arch64__) || defined(__sparcv8)
++#define WTF_PLATFORM_SPARC32 1
++#define WTF_PLATFORM_BIG_ENDIAN 1
++#endif
++
++#if PLATFORM(SPARC32) || PLATFORM(SPARC64)
++#define WTF_PLATFORM_SPARC
++#endif
++
+ /* PLATFORM(PPC64) */
+ #if   defined(__ppc64__) \
+    || defined(__PPC64__)
diff --git a/debian/patches/series b/debian/patches/series
index d48feac..bc2c17f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,3 +36,4 @@
 92_armel_gcc43_valist_compat.diff
 93_jsvalue64_on_ia64.diff
 94_fix_crash_in_qdbuspendingreply_qdbusreply.diff
+95_sparc_platform_definition.diff

-- 
Qt 4 Debian packaging



More information about the pkg-kde-commits mailing list