[neon/qt/qbs/Neon/release] debian: Copy a patch from qtscript to add s390x support.

[Dmitry Shachnev]

Git commit f9bc560c98cdd5632698997d9237269b10009183 by Dmitry Shachnev.
Committed on 29/11/2022 at 16:48.
Pushed by carlosdem into branch 'Neon/release'.

Copy a patch from qtscript to add s390x support.

M  +2    -0    debian/changelog
A  +36   -0    debian/patches/s390x_jscore.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qbs/commit/f9bc560c98cdd5632698997d9237269b10009183

diff --git a/debian/changelog b/debian/changelog
index 8350a20..08933f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.24.0+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Copy a patch from qtscript to add s390x support.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Nov 2022 19:44:45 +0300
 
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
new file mode 100644
index 0000000..f0700bd
--- /dev/null
+++ b/debian/patches/s390x_jscore.diff
@@ -0,0 +1,36 @@
+Description: add support for s390/s390x architectures to qtscript
+Author: Dan Horák <dan at danny.cz>
+Origin: https://trac.webkit.org/changeset/71844/webkit/
+Forwarded: no
+Last-Update: 2022-11-29
+
+--- a/src/shared/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/shared/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -226,6 +226,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)     \
+@@ -958,7 +970,7 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64)
++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64) || CPU(S390X)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32)
+ #define WTF_USE_JSVALUE32 1
diff --git a/debian/patches/series b/debian/patches/series
index 05f46c4..d0f6390 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff
 asan_atomic.diff
+s390x_jscore.diff