!21 [sync] PR-18: add sw_64 support

From: @openeuler-sync-bot 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl

add-qtscript-support-sw_64.patch

@@ -0,0 +1,37 @@
+From 593752efbbb73ebe368ab2d16ec6f53695398bfb Mon Sep 17 00:00:00 2001
+From: root <root@localhost.localdomain>
+Date: Sun, 10 Nov 2024 13:43:25 +0800
+Subject: [PATCH] add support sw_64
+
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+index 108adfc..38d33c1 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -156,6 +156,11 @@
+ #define WTF_CPU_ALPHA 1
+ #endif
+ 
++/* CPU(SW_64) - SW64 */
++#if defined(__sw_64__)
++#define WTF_CPU_SW_64 1
++#endif
++
+ /* CPU(IA64) - Itanium / IA-64 */
+ #if defined(__ia64__) || defined(__ia64) || defined(_M_IA64)
+ #define WTF_CPU_IA64 1
+@@ -970,7 +975,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(SW_64) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32) || CPU(S390X)
+ #define WTF_USE_JSVALUE32 1
+-- 
+2.33.0
+

qt5-qtscript.spec

@@ -1,47 +1,74 @@
-# spec file for qt5-qtscript
+%if !0%{?bootstrap}
+%ifnarch %{arm}
+%global tests 1
+%endif
+%endif
+
+%ifarch loongarch64
+%define debug_package %{nil}
+%endif
 
 %global qt_module qtscript
 
-Name:    qt5-%{qt_module}
+Name:          qt5-%{qt_module}
-Version: 5.11.1
+Version:       5.15.10
-Release: 5
+Release:       2
-Summary: QtScript component for qt5
+Summary:       QtScript component for qt5
-License: LGPLv2 with exceptions or GPLv3 with exceptions
+License:       LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-URL:     http://www.qt.io
+Url:           http://www.qt.io
 
-%global  major_minor %(echo %{version} | cut -d. -f1-2)
+# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
-Source0: https://download.qt.io/new_archive/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz
+%global majmin %(echo %{version} | cut -d. -f1-2)
+Source0:       https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
 
+
+# add s390(x0 support to Platform.h (taken from webkit)
+Patch100: qtscript-everywhere-src-5.12.1-s390.patch
+Patch101: add-qtscript-support-sw_64.patch
+
+BuildRequires: make
 BuildRequires: gcc-c++
-BuildRequires: qt5-qtbase-devel qt5-qtbase-private-devel
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 
+%if ! 0%{?bootstrap}
+BuildRequires: pkgconfig(Qt5UiTools)
+%endif
+
+%if 0%{?tests}
+BuildRequires: dbus-x11
+BuildRequires: mesa-dri-drivers
+BuildRequires: time
+BuildRequires: xorg-x11-server-Xvfb
+%endif
+
+%description
+%{summary}.
 
 %package devel
 Summary: Development files for %{name}
 Provides: %{name}-private-devel = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
+%description devel
+%{summary}.
 
-%package help
+%package examples
 Summary: Programming examples for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-
+%description examples
-
+%{summary}.
-%description
-This package provides support for qt5 application scripting with ECMAScript
-
-%description devel
-Development files for qt5-qtscript
-
-%description help
-Examples files for %{name}
 
 
 %prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}
+%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
 
 
 %build
+%ifarch loongarch64 sw_64
+export CXXFLAGS="${CXXFLAGS} -fpermissive"
+%endif
 %qmake_qt5
 %make_build
 
@@ -51,6 +78,25 @@ Examples files for %{name}
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" -e "/^QMAKE_PRL_LIBS/d" %{buildroot}%{_qt5_libdir}/*.prl
 rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
 
+%check
+%if 0%{?tests}
+export CTEST_OUTPUT_ON_FAILURE=1
+export PATH=%{buildroot}%{_qt5_bindir}:$PATH
+export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir}
+%make_build -k sub-tests-all ||:
+timeout 180 \
+xvfb-run -a \
+time \
+%make_build check -k -C tests ||:
+if [ "$?" -eq "124" ]; then
+echo 'make check timeout reached!'
+exit 1
+fi
+%endif
+
+
+%ldconfig_scriptlets
+
 %files
 %license LICENSE.LGPL*
 %{_qt5_libdir}/libQt5Script.so.5*
@@ -71,11 +117,26 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 
-%files help
+%files examples
 %{_qt5_examplesdir}/
 
 
 %changelog
+* Thu Mar 06 2025 mahailiang <mahailiang@uniontech.com> - 5.15.10-2
+- add sw_64 support
+
+* Mon Aug 21 2023 huayadong <huayadong@kylinos.cn> - 5.15.10-1
+- update to version 5.15.10-1
+
+* Fri Apr 14 2023 sjxur <sjxur@isoftstone.com> - 5.15.9-1
+- update to 5.15.9
+
+* Fri Mar 3 2023 doupengda <doupengda@loongson.cn> - 5.15.2-2
+- Support loongarch64 build
+
+* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
+- update to upstream version 5.15.2
+
 * Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-5
 - Fix Source0 
 

qt5-qtscript.yaml

@@ -1,4 +1,4 @@
 version_control: git
 src_repo: https://code.qt.io/qt/qtscript.git
-tag_prefix: ^v
+tag_prefix: "^v"
-seperator: .
+separator: "."

qtscript-everywhere-src-5.12.1-s390.patch

@@ -0,0 +1,31 @@
+diff -up qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+--- qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390	2019-01-09 06:59:11.000000000 -0600
++++ qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2019-02-15 08:57:27.684231337 -0600
+@@ -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__) && !defined(__s390x__)
++#define WTF_CPU_S390 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if   defined(__i386__) \
+     || defined(i386)     \
+@@ -960,7 +972,7 @@
+ #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)
+ #define WTF_USE_JSVALUE64 1
+-#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32)
++#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32) || CPU(S390X)
+ #define WTF_USE_JSVALUE32 1
+ #elif OS(WINDOWS) && COMPILER(MINGW)
+ /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg