diff --git a/qt5-qtscript.spec b/qt5-qtscript.spec index 46b3234..4c1ff5e 100644 --- a/qt5-qtscript.spec +++ b/qt5-qtscript.spec @@ -11,20 +11,24 @@ %global qt_module qtscript Name: qt5-%{qt_module} -Version: 5.15.9 +Version: 5.15.10 Release: 1 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 -%global major_minor %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/official_releases/qt/%{major_minor}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz +# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details +%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 -Patch0: qtscript-everywhere-src-5.15.9-s390.patch + +# add s390(x0 support to Platform.h (taken from webkit) +Patch100: qtscript-everywhere-src-5.12.1-s390.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} @@ -32,28 +36,28 @@ BuildRequires: pkgconfig(Qt5UiTools) %endif %if 0%{?tests} -BuildRequires: dbus-x11 mesa-dri-drivers time xorg-x11-server-Xvfb +BuildRequires: dbus-x11 +BuildRequires: mesa-dri-drivers +BuildRequires: time +BuildRequires: xorg-x11-server-Xvfb %endif -%package devel -Summary: Development files for %{name} -Provides: %{name}-private-devel = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel%{?_isa} - -%package help -Summary: Programming examples for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - - %description -This package provides support for qt5 application scripting with ECMAScript +%{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 -Development files for qt5-qtscript +%{summary}. -%description help -Examples files for %{name} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. %prep @@ -112,11 +116,14 @@ fi %{_qt5_libdir}/pkgconfig/Qt5*.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri -%files help +%files examples %{_qt5_examplesdir}/ %changelog +* Mon Aug 21 2023 huayadong - 5.15.10-1 +- update to version 5.15.10-1 + * Fri Apr 14 2023 sjxur - 5.15.9-1 - update to 5.15.9 diff --git a/qtscript-everywhere-opensource-src-5.15.10.tar.xz b/qtscript-everywhere-opensource-src-5.15.10.tar.xz new file mode 100644 index 0000000..0e6009d Binary files /dev/null and b/qtscript-everywhere-opensource-src-5.15.10.tar.xz differ diff --git a/qtscript-everywhere-src-5.15.9-s390.patch b/qtscript-everywhere-src-5.12.1-s390.patch similarity index 62% rename from qtscript-everywhere-src-5.15.9-s390.patch rename to qtscript-everywhere-src-5.12.1-s390.patch index 429f88d..76a7abb 100644 --- a/qtscript-everywhere-src-5.15.9-s390.patch +++ b/qtscript-everywhere-src-5.12.1-s390.patch @@ -1,16 +1,6 @@ -From 53999f4973ee54a10f360ec40df8d61cc99275ac Mon Sep 17 00:00:00 2001 -From: sjxur -Date: Fri, 14 Apr 2023 10:58:42 +0800 -Subject: [PATCH] Support CPU(S390) - ---- - .../javascriptcore/JavaScriptCore/wtf/Platform.h | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index a4695a2..108adfc 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +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 @@ -39,6 +29,3 @@ index a4695a2..108adfc 100644 #define WTF_USE_JSVALUE32 1 #elif OS(WINDOWS) && COMPILER(MINGW) /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg --- -2.39.1 - diff --git a/qtscript-everywhere-src-5.15.9.tar.xz b/qtscript-everywhere-src-5.15.9.tar.xz deleted file mode 100755 index 445e3d9..0000000 Binary files a/qtscript-everywhere-src-5.15.9.tar.xz and /dev/null differ