packages/qt5-qtscript
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init to version 5.15.10-1

Browse Source 
(cherry picked from commit 49e31c1a5dec2309d59eb6f2d09b9b0c28b68ce9)
This commit is contained in:
huayadong 2023-08-23 15:55:23 +08:00 committed by openeuler-sync-bot
parent f8d5c5e09f
commit 8702813eaf
4 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
qt5-qtscript.spec
View File

@ -11,20 +11,24 @@
%global qt_module qtscript %global qt_module qtscript
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.15.9 Version: 5.15.10
Release: 1 Release: 1
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/official_releases/qt/%{major_minor}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.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
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: make
BuildRequires: gcc-c++ 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}} %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
@ -32,28 +36,28 @@ BuildRequires: pkgconfig(Qt5UiTools)
%endif %endif
%if 0%{?tests} %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 %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 %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 %description devel
Development files for qt5-qtscript %{summary}.
%description help %package examples
Examples files for %{name} Summary: Programming examples for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples
%{summary}.
%prep %prep
@ -112,11 +116,14 @@ fi
%{_qt5_libdir}/pkgconfig/Qt5*.pc %{_qt5_libdir}/pkgconfig/Qt5*.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri %{_qt5_archdatadir}/mkspecs/modules/*.pri
%files help %files examples
%{_qt5_examplesdir}/ %{_qt5_examplesdir}/
%changelog %changelog
* 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 * Fri Apr 14 2023 sjxur <sjxur@isoftstone.com> - 5.15.9-1
- update to 5.15.9 - update to 5.15.9

BIN
qtscript-everywhere-opensource-src-5.15.10.tar.xz Normal file
View File

Binary file not shown.

19
qtscript-everywhere-src-5.15.9-s390.patch → qtscript-everywhere-src-5.12.1-s390.patch
View File

@ -1,16 +1,6 @@
From 53999f4973ee54a10f360ec40df8d61cc99275ac Mon Sep 17 00:00:00 2001 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
From: sjxur <sjxur@isoftstone.com> --- qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2019-01-09 06:59:11.000000000 -0600
Date: Fri, 14 Apr 2023 10:58:42 +0800 +++ qtscript-everywhere-src-5.12.1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2019-02-15 08:57:27.684231337 -0600
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
@@ -226,6 +226,18 @@ @@ -226,6 +226,18 @@
#define WTF_CPU_SPARC 1 #define WTF_CPU_SPARC 1
#endif #endif
@ -39,6 +29,3 @@ index a4695a2..108adfc 100644
#define WTF_USE_JSVALUE32 1 #define WTF_USE_JSVALUE32 1
#elif OS(WINDOWS) && COMPILER(MINGW) #elif OS(WINDOWS) && COMPILER(MINGW)
/* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg
--
2.39.1

BIN
qtscript-everywhere-src-5.15.9.tar.xz
View File

Binary file not shown.