From 97b7c0d3f9b91119bd5d222e290acd724b5f2c59 Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 26 May 2022 14:03:22 -0400 Subject: [PATCH] Auto sync2gitlab import of qt5-qtscript-5.15.2-2.el8.src.rpm --- .gitignore | 1 + EMPTY | 1 - qt5-qtscript.spec | 400 ++++++++++++++++++++++ qtscript-everywhere-src-5.12.1-s390.patch | 31 ++ sources | 1 + 5 files changed, 433 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 EMPTY create mode 100644 qt5-qtscript.spec create mode 100644 qtscript-everywhere-src-5.12.1-s390.patch create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a388b69 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/qtscript-everywhere-src-5.15.2.tar.xz diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/qt5-qtscript.spec b/qt5-qtscript.spec new file mode 100644 index 0000000..1999964 --- /dev/null +++ b/qt5-qtscript.spec @@ -0,0 +1,400 @@ + +## uncomment to enable bootstrap mode +#global bootstrap 1 + +## currently includes no tests +%if !0%{?bootstrap} +# skip slower archs for now +%ifnarch %{arm} +%global tests 1 +%endif +%endif + +%global qt_module qtscript + +%global build_tests 1 + +Summary: Qt5 - QtScript component +Name: qt5-%{qt_module} +Version: 5.15.2 +Release: 2%{?dist} + +# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details +License: LGPLv2 with exceptions or GPLv3 with exceptions +Url: http://www.qt.io +%global majmin %(echo %{version} | cut -d. -f1-2) +Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz + +# add s390(x0 support to Platform.h (taken from webkit) +Patch100: qtscript-everywhere-src-5.12.1-s390.patch + +BuildRequires: gcc-c++ +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtbase-private-devel +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} + +%if ! 0%{?bootstrap} +# extra examples +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 examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. + +%if 0%{?build_tests} +%package tests +Summary: Unit tests for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 + + +%build +# workaround serious failures when building with f28's gcc8 +# https://bugzilla.redhat.com/show_bug.cgi?id=1551246 +%if 0%{?fedora} > 27 +export CXXFLAGS="$RPM_OPT_FLAGS -O1" +%endif + +%qmake_qt5 + +%make_build + +%if 0%{?build_tests} +make sub-tests %{?_smp_mflags} -k ||: +%endif + +%install +%make_install INSTALL_ROOT=%{buildroot} + +%if 0%{?build_tests} +# Install tests for gating +mkdir -p %{buildroot}%{_qt5_libdir}/qt5 +find ./tests -not -path '*/\.*' -type d | while read LINE +do + mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE" +done +find ./tests -not -path '*/\.*' -not -name '*.h' -not -name '*.cpp' -not -name '*.pro' -not -name 'uic_wrapper.sh' -not -name 'Makefile' -not -name 'target_wrapper.sh' -type f | while read LINE +do + cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/ +done +%endif + +## .prl file love (maybe consider just deleting these -- rex +# nuke dangling reference(s) to %%buildroot, excessive (.la-like) libs +sed -i \ + -e "/^QMAKE_PRL_BUILD_DIR/d" \ + -e "/^QMAKE_PRL_LIBS/d" \ + %{buildroot}%{_qt5_libdir}/*.prl + +## unpackaged files +# .la files, die, die, die. +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} +## do in %%build ? +%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* +%{_qt5_libdir}/libQt5ScriptTools.so.5* + +%files devel +%{_qt5_headerdir}/Qt*/ +%{_qt5_libdir}/libQt5Script.so +%{_qt5_libdir}/libQt5Script.prl +%{_qt5_libdir}/libQt5ScriptTools.so +%{_qt5_libdir}/libQt5ScriptTools.prl +%dir %{_qt5_libdir}/cmake/Qt5Script/ +%{_qt5_libdir}/cmake/Qt5Script/Qt5ScriptConfig*.cmake +%dir %{_qt5_libdir}/cmake/Qt5ScriptTools/ +%{_qt5_libdir}/cmake/Qt5ScriptTools/Qt5ScriptToolsConfig*.cmake +%{_qt5_libdir}/pkgconfig/Qt5*.pc +%{_qt5_archdatadir}/mkspecs/modules/*.pri + +%files examples +%{_qt5_examplesdir}/ + +%if 0%{?build_tests} +%files tests +%{_qt5_libdir}/qt5/tests +%endif + +%changelog +* Wed Apr 28 2021 Jan Grulich - 5.15.2-2 +- Rebuild (binutils) + Resolves: bz#1930051 + +* Sun Apr 04 2021 Jan Grulich - 5.15.2-1 +- 5.15.2 + Resolves: bz#1930051 + +* Mon Nov 18 2019 Jan Grulich - 5.12.5-1 +- 5.12.5 + Resolves: bz#1733147 + +* Mon Dec 10 2018 Jan Grulich - 5.11.1-2 +- Rebuild to fix CET notes + Resolves: bz#1657247 + +* Tue Jul 03 2018 Jan Grulich - 5.11.1-1 +- 5.11.1 + +* Tue Jun 05 2018 Jan Grulich - 5.10.1-4 +- use timeout to avoid hanging tests and disable tests on aarch64 + +* Mon Mar 05 2018 Rex Dieter - 5.10.1-3 +- support %%bootstrap, %%check: add autotests +- build with -O1 to workaround serious autotest/code failures (f28+, #1551246) + +* Mon Mar 05 2018 Rex Dieter - 5.10.1-2 +- BR: gcc-c++, use %%make_build %%make_install %%ldconfig_scriptlets + +* Wed Feb 14 2018 Jan Grulich - 5.10.1-1 +- 5.10.1 + +* Fri Feb 09 2018 Fedora Release Engineering - 5.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Dec 19 2017 Jan Grulich - 5.10.0-1 +- 5.10.0 + +* Thu Nov 23 2017 Jan Grulich - 5.9.3-1 +- 5.9.3 + +* Mon Oct 09 2017 Jan Grulich - 5.9.2-1 +- 5.9.2 + +* Thu Aug 03 2017 Fedora Release Engineering - 5.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 5.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 19 2017 Rex Dieter - 5.9.1-1 +- 5.9.1 + +* Fri Jun 16 2017 Rex Dieter - 5.9.0-2 +- drop shadow/out-of-tree builds (#1456211,QTBUG-37417) + +* Wed May 31 2017 Helio Chissini de Castro - 5.9.0-1 +- Upstream official release + +* Fri May 26 2017 Helio Chissini de Castro - 5.9.0-0.1.rc +- Upstream Release Candidate retagged + +* Tue May 09 2017 Helio Chissini de Castro - 5.9.0-0.beta.3 +- Upstream beta 3 + +* Mon Apr 03 2017 Rex Dieter - 5.8.0-2 +- build docs on all archs + +* Mon Jan 30 2017 Helio Chissini de Castro - 5.8.0-1 +- new upstream version + +* Sat Dec 10 2016 Rex Dieter - 5.7.1-2 +- 5.7.1 dec5 snapshot + +* Wed Nov 09 2016 Helio Chissini de Castro - 5.7.1-1 +- New upstream version + +* Mon Jul 04 2016 Helio Chissini de Castro - 5.7.0-2 +- Compiled with gcc + +* Tue Jun 14 2016 Helio Chissini de Castro - 5.7.0-1 +- Qt 5.7.0 release + +* Thu Jun 09 2016 Helio Chissini de Castro - 5.7.0-0.1 +- Prepare 5.7.0 release + +* Sun Apr 17 2016 Rex Dieter - 5.6.0-4 +- BR: qt5-qtbase-private-devel, -devel: Provides: private-devel + +* Sun Mar 20 2016 Rex Dieter - 5.6.0-3 +- rebuild + +* Fri Mar 18 2016 Rex Dieter - 5.6.0-2 +- rebuild + +* Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 +- 5.6.0 final release + +* Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.9.rc +- Update to final RC + +* Sun Feb 21 2016 Rex Dieter 5.6.0-0.8.rc +- rebuild + +* Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.7 +- Update RC release + +* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.6.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Dec 28 2015 Rex Dieter 5.6.0-0.5.beta +- update source URL, use %%license, BR: cmake + +* Mon Dec 21 2015 Helio Chissini de Castro - 5.6.0-0.4 +- Update to final beta release + +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.3 +- Official beta release + +* Mon Dec 07 2015 Rex Dieter 5.6.0-0.2 +- (re)add bootstrap macro support + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + +* Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 +- Update to final release 5.5.1 + +* Tue Sep 29 2015 Helio Chissini de Castro - 5.5.1-1 +- Update to Qt 5.5.1 RC1 + +* Wed Jul 29 2015 Rex Dieter 5.5.0-3 +- -docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping + +* Thu Jul 16 2015 Rex Dieter 5.5.0-2 +- tighten qtbase dep (#1233829), .spec cosmetics + +* Wed Jul 1 2015 Helio Chissini de Castro 5.5.0-1 +- New final upstream release Qt 5.5.0 + +* Thu Jun 25 2015 Helio Chissini de Castro - 5.5.0-0.2.rc +- Update for official RC1 released packages + +* Wed Jun 17 2015 Daniel Vrátil - 5.5.0-0.1.rc +- Qt 5.5.0 RC1 + +* Thu Jun 04 2015 Jan Grulich - 5.4.2-1 +- 5.4.2 + +* Sat May 02 2015 Kalev Lember - 5.4.1-3 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Feb 27 2015 Rex Dieter - 5.4.1-2 +- rebuild (gcc5) + +* Tue Feb 24 2015 Jan Grulich 5.4.1-1 +- 5.4.1 + +* Mon Feb 16 2015 Rex Dieter 5.4.0-2 +- rebuild (gcc5) + +* Wed Dec 10 2014 Rex Dieter 5.4.0-1 +- 5.4.0 (final) + +* Fri Nov 28 2014 Rex Dieter 5.4.0-0.3.rc +- 5.4.0-rc + +* Mon Nov 03 2014 Rex Dieter 5.4.0-0.2.beta +- out-of-tree build, use %%qmake_qt5, support %%docs macro + +* Sun Oct 19 2014 Rex Dieter 5.4.0-0.1.beta +- 5.4.0-beta + +* Tue Sep 16 2014 Rex Dieter 5.3.2-1 +- 5.3.2 + +* Sun Aug 17 2014 Fedora Release Engineering - 5.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jun 17 2014 Jan Grulich - 5.3.1-1 +- 5.3.1 + +* Sun Jun 08 2014 Fedora Release Engineering - 5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Jan Grulich 5.3.0-1 +- 5.3.0 + +* Wed Feb 05 2014 Rex Dieter 5.2.1-1 +- 5.2.1 + +* Sun Feb 02 2014 Rex Dieter 5.2.0-3 +- Add AArch64 support to qtscript (#1056071) + +* Mon Jan 27 2014 Rex Dieter 5.2.0-2 +- -examples subpkg +- -doc for all archs + +* Thu Dec 12 2013 Rex Dieter 5.2.0-1 +- 5.2.0 + +* Mon Dec 02 2013 Rex Dieter 5.2.0-0.10.rc1 +- 5.2.0-rc1 + +* Mon Nov 25 2013 Rex Dieter 5.2.0-0.5.beta1 +- enable -doc only on primary archs (allow secondary bootstrap) + +* Sun Nov 10 2013 Rex Dieter 5.2.0-0.4.beta1 +- rebuild (arm/qreal) + +* Thu Oct 24 2013 Rex Dieter 5.2.0-0.3.beta1 +- 5.2.0-beta1 + +* Wed Oct 16 2013 Rex Dieter 5.2.0-0.2.alpha +- bootstrap ppc + +* Tue Oct 01 2013 Rex Dieter 5.2.0-0.1.alpha +- 5.2.0-alpha +- -doc subpkg + +* Wed Aug 28 2013 Rex Dieter 5.1.1-1 +- 5.1.1 + +* Wed Aug 28 2013 Rex Dieter 5.0.2-2 +- update Source URL +- %%doc LGPL_EXCEPTION.txt LICENSE.GPL LICENSE.LGPL + +* Thu Apr 11 2013 Rex Dieter 5.0.2-1 +- 5.0.2 + +* Sat Feb 23 2013 Rex Dieter 5.0.1-1 +- first try + diff --git a/qtscript-everywhere-src-5.12.1-s390.patch b/qtscript-everywhere-src-5.12.1-s390.patch new file mode 100644 index 0000000..76a7abb --- /dev/null +++ b/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 diff --git a/sources b/sources new file mode 100644 index 0000000..1afa936 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (qtscript-everywhere-src-5.15.2.tar.xz) = 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32