diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-12-13 14:06:09 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-12-13 14:06:09 -0300 |
| commit | af4050cb37150deeba8fa86f5556c5110a309eae (patch) | |
| tree | 5d0f8398244bf765932ced9a9a7943e6a814b6df | |
| parent | aa89ed63ac58f7305e55ecbf815fb0ab6f40f199 (diff) | |
| download | qtscript-af4050cb37150deeba8fa86f5556c5110a309eae.tar.gz | |
Refresh s390x_jscore.diff.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/s390x_jscore.diff | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 54a92ce..26d2305 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ qtscript-opensource-src (5.2.0+dfsg-1) UNRELEASED; urgency=low [ Lisandro Damián Nicanor Pérez Meyer ] * New upstream release. * Bump build dependencies. + * Refresh s390x_jscore.diff. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 13 Dec 2013 13:54:36 -0300 diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff index ce84462..4020a3e 100644 --- a/debian/patches/s390x_jscore.diff +++ b/debian/patches/s390x_jscore.diff @@ -2,7 +2,7 @@ Description: Add support for s390/s390x architectures 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: 2011-08-03 +Last-Update: 2013-12-14 --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 14 +++++++++++++- @@ -10,7 +10,7 @@ Last-Update: 2011-08-03 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -189,6 +189,18 @@ +@@ -189,6 +189,19 @@ #define WTF_CPU_SPARC 1 #endif @@ -26,15 +26,16 @@ Last-Update: 2011-08-03 +#define WTF_CPU_BIG_ENDIAN 1 +#endif + ++ /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ -@@ -876,7 +888,7 @@ +@@ -896,7 +909,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) +-#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) #define WTF_USE_JSVALUE64 1 #elif CPU(ARM) || CPU(PPC64) #define WTF_USE_JSVALUE32 1 |