update to upstream version 5.15.2

qt5-qtscript.spec

@@ -1,20 +1,35 @@
-# spec file for qt5-qtscript
+%if !0%{?bootstrap}
+%ifnarch %{arm}
+%global tests 1
+%endif
+%endif
 
 %global qt_module qtscript
 
 Name:          qt5-%{qt_module}
-Version: 5.11.1
-Release: 5
+Version:       5.15.2
+Release:       1
 Summary:       QtScript component for qt5
 License:       LGPLv2 with exceptions or GPLv3 with exceptions
-URL:     http://www.qt.io
+Url:           http://www.qt.io
 
 %global  major_minor %(echo %{version} | cut -d. -f1-2)
-Source0: https://download.qt.io/new_archive/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz
+Source0:       https://download.qt.io/official_releases/qt/%{major_minor}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
 
+Patch0:        qtscript-everywhere-src-5.12.1-s390.patch
+
+BuildRequires: make
 BuildRequires: gcc-c++
 BuildRequires: qt5-qtbase-devel qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 
+%if ! 0%{?bootstrap}
+BuildRequires: pkgconfig(Qt5UiTools)
+%endif
+
+%if 0%{?tests}
+BuildRequires: dbus-x11 mesa-dri-drivers time xorg-x11-server-Xvfb
+%endif
 
 %package devel
 Summary:       Development files for %{name}
@@ -38,7 +53,7 @@ Examples files for %{name}
 
 
 %prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}
+%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
 
 
 %build
@@ -51,6 +66,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*
@@ -76,6 +110,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
 
 
 %changelog
+* 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
-seperator: .
+tag_prefix: "^v"
+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