From 7835d7ac027df5a92b991b82e0806930b46847c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E5=BB=BA=E5=85=A8?= Date: Tue, 21 Nov 2023 10:02:38 +0800 Subject: [PATCH] add patches --- debian/changelog | 6 ++ debian/patches/0006-add-patches.patch | 137 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 144 insertions(+) create mode 100644 debian/patches/0006-add-patches.patch diff --git a/debian/changelog b/debian/changelog index 3a39477..c08a5fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qtscript-opensource-src (5.15.10+dfsg-2ok1.2) nile; urgency=medium + + * add patches. + + -- renjianquan Tue, 21 Nov 2023 10:01:59 +0800 + qtscript-opensource-src (5.15.10+dfsg-2ok1.1) nile; urgency=medium * Upload to unstable. diff --git a/debian/patches/0006-add-patches.patch b/debian/patches/0006-add-patches.patch new file mode 100644 index 0000000..717ae7a --- /dev/null +++ b/debian/patches/0006-add-patches.patch @@ -0,0 +1,137 @@ +From: =?utf-8?b?5Lu75bu65YWo?= +Date: Tue, 21 Nov 2023 10:02:38 +0800 +Subject: add patches + +--- + .../javascriptcore/JavaScriptCore/runtime/Collector.cpp | 5 +++++ + .../javascriptcore/JavaScriptCore/wtf/Platform.h | 14 +++++++++++++- + tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp | 1 + + tests/auto/qscriptjstestsuite/skip.txt | 2 ++ + tests/auto/qscriptv8testsuite/skip.txt | 16 ++-------------- + tests/benchmarks/script/script.pro | 4 +--- + 6 files changed, 24 insertions(+), 18 deletions(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp +index e8f78ee..d965834 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp +@@ -672,7 +672,12 @@ static inline void* currentThreadStackBase() + pthread_attr_destroy(&sattr); + stackThread = thread; + } ++#if defined(__hppa__) ++ // Stack grows up. ++ return static_cast(stackBase); ++#else + return static_cast(stackBase) + stackSize; ++#endif + #else + #error Need a way to get the stack base on this platform + #endif +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index a4695a2..4bf2a5d 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/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/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp +index 9d6c2fb..019773a 100644 +--- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp ++++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp +@@ -2270,6 +2270,7 @@ void tst_QScriptExtQObject::cppConnectAndDisconnect() + + void tst_QScriptExtQObject::cppConnectAndDisconnect2() + { ++ QSKIP("Fails on some architectures"); + QScriptEngine eng; + QLineEdit edit; + QLineEdit edit2; +diff --git a/tests/auto/qscriptjstestsuite/skip.txt b/tests/auto/qscriptjstestsuite/skip.txt +index c007041..3f3362f 100644 +--- a/tests/auto/qscriptjstestsuite/skip.txt ++++ b/tests/auto/qscriptjstestsuite/skip.txt +@@ -5,6 +5,8 @@ regress-322135-01.js | asserts + regress-322135-02.js | asserts + regress-322135-03.js | takes forever + regress-322135-04.js | takes forever ++ecma/Expressions/11.4.7-02.js | Fails on some architectures ++ecma/TypeConversion/9.3.1-3.js | Fails on some architectures + ecma_3/Array/regress-387501.js | Produces wrong error message + ecma_3/RegExp/regress-375715-04.js | bug + ecma_3/RegExp/regress-289669.js | Can fail due to relying on wall-clock time +diff --git a/tests/auto/qscriptv8testsuite/skip.txt b/tests/auto/qscriptv8testsuite/skip.txt +index bbcdef8..128f157 100644 +--- a/tests/auto/qscriptv8testsuite/skip.txt ++++ b/tests/auto/qscriptv8testsuite/skip.txt +@@ -3,8 +3,10 @@ debug-* | not applicable + mirror-* | not applicable + array-concat | Hangs on JSC backend + array-splice | Hangs on JSC backend ++smi-negative-zero | Unresolved failures + sparse-array-reverse | Hangs on JSC backend + string-case | V8-specific behavior? (Doesn't pass on SpiderMonkey either) ++to-precision | Unresolved failures + + [Q_OS_WINCE] + deep-recursion | Demands too much memory on WinCE +@@ -19,18 +21,4 @@ unicode-test | Demands too much memory on Symbian + [Q_CC_INTEL] + math-min-max | Unresolved failures with intel compiler + negate-zero | Unresolved failures with intel compiler +-smi-negative-zero | Unresolved failures with intel compiler + str-to-num | Unresolved failures with intel compiler +-to-precision | Unresolved failures with intel compiler +- +-[Q_OS_MAC] +-smi-negative-zero | Unresolved failures on Mac OS X (Cocoa) +-to-precision | Unresolved failures on Mac OS X (Cocoa) +- +-[Q_OS_WIN] +-to-precision | Unresolved failures on Windows +-smi-negative-zero | Unresolved failure on Windows 8 (QTBUG-41321) +- +-[Q_OS_LINUX] +-smi-negative-zero | Unresolved sign failure for Ubuntu 11.10 x64 (QTBUG-23463) +-to-precision | Unresolved failure on Ubuntu 11.10 x64 (QTBUG-23463) +diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro +index 80278d0..49e06a9 100644 +--- a/tests/benchmarks/script/script.pro ++++ b/tests/benchmarks/script/script.pro +@@ -5,10 +5,8 @@ SUBDIRS = \ + qscriptclass_bytearray \ + qscriptengine \ + qscriptvalue \ +- sunspider \ + qscriptqobject \ +- qscriptvalueiterator \ +- v8 ++ qscriptvalueiterator + + TRUSTED_BENCHMARKS += \ + qscriptclass \ diff --git a/debian/patches/series b/debian/patches/series index 3eed577..fa380f3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ disable_v8_sunspider_tests.patch s390x_jscore.diff hppa_stackbase.diff 0005-init-5.15.10.patch +0006-add-patches.patch