Package: qt4-x11 Version: 4:4.7.3-5 Severity: important Tags: patch Justification: fails to build from source User: debian-s...@lists.debian.org Usertags: s390x
qt4-x11 fails to build on s390x as the embedded version of webkit doesn't know about this architecture, and therefore default to 32-bit. The small patch below, taken from upstream, fixes the problem. Would it be possible to include it in the next upload. Thanks in advance. diff -Nru qt4-x11-4.7.3/debian/patches/98_webkit_s390x.diff qt4-x11-4.7.3/debian/patches/98_webkit_s390x.diff --- qt4-x11-4.7.3/debian/patches/98_webkit_s390x.diff 1970-01-01 01:00:00.000000000 +0100 +++ qt4-x11-4.7.3/debian/patches/98_webkit_s390x.diff 2011-08-03 13:34:07.000000000 +0200 @@ -0,0 +1,70 @@ +Description: Add support for s390/s390x architectures +Author: Dan Horák <d...@danny.cz> +Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+) +Forwarded: no +Last-Update: 2011-08-03 + +--- + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 14 +++++++++++++- + src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 13 +++++++++++++ + 2 files changed, 26 insertions(+), 1 deletion(-) + +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -189,6 +189,18 @@ + #define WTF_CPU_SPARC 1 + #endif + ++/* CPU(S390X) - S390 64-bit */ ++#if defined(__s390x__) ++#define WTF_CPU_S390X 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++ ++/* CPU(S390) - S390 32-bit */ ++#if defined(__s390__) ++#define WTF_CPU_S390 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++ + /* CPU(X86) - i386 / x86 32-bit */ + #if defined(__i386__) \ + || defined(i386) \ +@@ -870,7 +882,7 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) ++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) + #define WTF_USE_JSVALUE64 1 + #elif CPU(ARM) || CPU(PPC64) + #define WTF_USE_JSVALUE32 1 +--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +@@ -180,6 +180,18 @@ + #define WTF_CPU_SPARC 1 + #endif + ++/* CPU(S390X) - S390 64-bit */ ++#if defined(__s390x__) ++#define WTF_CPU_S390X 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++ ++/* CPU(S390) - S390 32-bit */ ++#if defined(__s390__) ++#define WTF_CPU_S390 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++ + /* CPU(X86) - i386 / x86 32-bit */ + #if defined(__i386__) \ + || defined(i386) \ +@@ -885,6 +897,7 @@ + #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ + || (CPU(IA64) && !CPU(IA64_32)) \ + || CPU(ALPHA) \ ++ || CPU(S390X) \ + || CPU(SPARC64) + #define WTF_USE_JSVALUE64 1 + #elif CPU(ARM) || CPU(PPC64) || CPU(MIPS) diff -Nru qt4-x11-4.7.3/debian/patches/series qt4-x11-4.7.3/debian/patches/series --- qt4-x11-4.7.3/debian/patches/series 2011-06-25 19:04:01.000000000 +0200 +++ qt4-x11-4.7.3/debian/patches/series 2011-08-03 13:33:44.000000000 +0200 @@ -45,6 +45,7 @@ 92_armel_gcc43_valist_compat.diff 94_armv6_uname_entry.diff 96_webkit_no_gc_sections.diff +98_webkit_s390x.diff 99_hppa_bug561203_decrease_failure_rate.diff powerpcspe.diff sh.diff -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: s390x Kernel: Linux 2.6.32-5-s390x (SMP w/3 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110803214335.10276.18508.report...@volta.aurel32.net
