From 9ecf2e807ed04ddd26ec24dba3909a21793c8cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E5=BB=BA=E5=85=A8?= Date: Mon, 20 Nov 2023 16:25:23 +0800 Subject: [PATCH] init 5.15.10 --- debian/patches/disable_failing_tests.diff | 58 ------------------- .../patches/disable_v8_sunspider_tests.patch | 24 -------- debian/patches/hppa_stackbase.diff | 20 ------- debian/patches/s390x_jscore.diff | 40 ------------- debian/patches/series | 4 -- debian/source/format | 2 +- 6 files changed, 1 insertion(+), 147 deletions(-) delete mode 100644 debian/patches/disable_failing_tests.diff delete mode 100644 debian/patches/disable_v8_sunspider_tests.patch delete mode 100644 debian/patches/hppa_stackbase.diff delete mode 100644 debian/patches/s390x_jscore.diff delete mode 100644 debian/patches/series diff --git a/debian/patches/disable_failing_tests.diff b/debian/patches/disable_failing_tests.diff deleted file mode 100644 index 2942207..0000000 --- a/debian/patches/disable_failing_tests.diff +++ /dev/null @@ -1,58 +0,0 @@ -Description: disable tests that fail on some Debian architectures -Author: Dmitry Shachnev -Forwarded: not-needed -Last-Update: 2015-02-25 - ---- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp -+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp -@@ -2270,6 +2270,7 @@ - - void tst_QScriptExtQObject::cppConnectAndDisconnect2() - { -+ QSKIP("Fails on some architectures"); - QScriptEngine eng; - QLineEdit edit; - QLineEdit edit2; ---- a/tests/auto/qscriptjstestsuite/skip.txt -+++ b/tests/auto/qscriptjstestsuite/skip.txt -@@ -5,6 +5,8 @@ - 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 ---- a/tests/auto/qscriptv8testsuite/skip.txt -+++ b/tests/auto/qscriptv8testsuite/skip.txt -@@ -3,8 +3,10 @@ - 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 @@ - [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/debian/patches/disable_v8_sunspider_tests.patch b/debian/patches/disable_v8_sunspider_tests.patch deleted file mode 100644 index 07cb0fa..0000000 --- a/debian/patches/disable_v8_sunspider_tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Remove mixedly licensed tests. - The license mix in Qt Script is already quite colorful, and the sunspider - and V8 tests are a further mix of licenses and license-not-specified or - clearly non-DFSG. Currently the easiest way out is to repackage the - tarball not to include those tests. - . - This patch disables the tests provided by the removed sources. -Author: Timo Jyrinki -Forwarded: not-needed - ---- a/tests/benchmarks/script/script.pro.old 2013-01-29 19:03:26.000000000 +0000 -+++ b/tests/benchmarks/script/script.pro 2013-02-11 08:31:02.073365014 +0000 -@@ -5,10 +5,8 @@ - qscriptclass_bytearray \ - qscriptengine \ - qscriptvalue \ -- sunspider \ - qscriptqobject \ -- qscriptvalueiterator \ -- v8 -+ qscriptvalueiterator - - TRUSTED_BENCHMARKS += \ - qscriptclass \ diff --git a/debian/patches/hppa_stackbase.diff b/debian/patches/hppa_stackbase.diff deleted file mode 100644 index 293abf6..0000000 --- a/debian/patches/hppa_stackbase.diff +++ /dev/null @@ -1,20 +0,0 @@ -Description: fix stack base detection on hppa -Author: John David Anglin -Forwarded: not-yet -Last-Update: 2018-12-18 - ---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -@@ -672,7 +672,12 @@ static inline void* currentThreadStackBa - 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/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff deleted file mode 100644 index 642391b..0000000 --- a/debian/patches/s390x_jscore.diff +++ /dev/null @@ -1,40 +0,0 @@ -Description: Add support for s390/s390x architectures -Author: Dan Horák -Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+) -Forwarded: no -Last-Update: 2019-03-26 - ---- - src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - ---- 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/debian/patches/series b/debian/patches/series deleted file mode 100644 index 69ce9f5..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -disable_failing_tests.diff -disable_v8_sunspider_tests.patch -s390x_jscore.diff -hppa_stackbase.diff diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native)