diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-10-11 20:52:07 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-10-11 20:52:07 -0300 |
| commit | 647672c3d00e76942adaef7ce77d502926a9b394 (patch) | |
| tree | 4ab4f6d758f66f82cd5519e24c90ec2490169bda | |
| parent | c1f59fe7cc7d24bf33ccd355435368fc12f1b9cb (diff) | |
| download | qt4-x11-647672c3d00e76942adaef7ce77d502926a9b394.tar.gz | |
take back s390x_jscore.diff to it's original state.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/s390x_jscore.diff | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 5c07b01..efb7f38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ qt4-x11 (4:4.8.5+git121-g2a9ea11+dfsg1-2) UNRELEASED; urgency=low [ Lisandro Damián Nicanor Pérez Meyer ] * Remove Fix_JavaScriptCore_ftbfs_on_mips64_el.patch, it makes 32 bits platforms FTBFS. + * Take back s390x_jscore.diff to it's original state. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 11 Oct 2013 20:44:03 -0300 diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff index 118c157..96ec0f4 100644 --- a/debian/patches/s390x_jscore.diff +++ b/debian/patches/s390x_jscore.diff @@ -1,10 +1,8 @@ Description: Add support for s390/s390x architectures - Patch modified to also apply againt the MIPS64 patch. Author: Dan Horák <dan@danny.cz> Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+) Forwarded: no -Last-Update: 2013-10-09 -Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> +Last-Update: 2011-08-03 --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 14 +++++++++++++- @@ -31,12 +29,12 @@ Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ -@@ -881,7 +893,7 @@ +@@ -873,7 +885,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) || CPU(MIPS64) -+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(S390X) +-#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 |