import qt5-qtscript-5.12.5-1.el8
This commit is contained in:
CentOS Sources
parent
8864bc235c
commit
1e2a0142a1
|
|
@ -1 +1 @@
|
|||
SOURCES/qtscript-everywhere-src-5.11.1.tar.xz
|
||||
SOURCES/qtscript-everywhere-src-5.12.5.tar.xz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3bfe48cda8c8a78c7ad1348cd7f01d56fcce6686 SOURCES/qtscript-everywhere-src-5.11.1.tar.xz
|
||||
b0ea73055dea6f2173e4547b5759435f6070b24e SOURCES/qtscript-everywhere-src-5.12.5.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -up qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
||||
--- qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2015-06-29 15:05:58.000000000 -0500
|
||||
+++ qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2015-07-16 09:57:18.963167137 -0500
|
||||
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
|
||||
|
|
@ -20,12 +20,12 @@ diff -up qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCor
|
|||
/* CPU(X86) - i386 / x86 32-bit */
|
||||
#if defined(__i386__) \
|
||||
|| defined(i386) \
|
||||
@@ -950,7 +962,7 @@
|
||||
@@ -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)
|
||||
#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)
|
||||
+#elif CPU(ARM) || CPU(PPC64) || CPU(S390X)
|
||||
-#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
|
||||
|
|
@ -5,17 +5,19 @@
|
|||
## currently includes no tests
|
||||
%if !0%{?bootstrap}
|
||||
# skip slower archs for now
|
||||
%ifnarch %{arm} aarch64
|
||||
%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.11.1
|
||||
Release: 2%{?dist}
|
||||
Version: 5.12.5
|
||||
Release: 1%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
|
|
@ -24,7 +26,7 @@ Url: http://www.qt.io
|
|||
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)
|
||||
Patch0: qtscript-opensource-src-5.5.0-s390.patch
|
||||
Patch100: qtscript-everywhere-src-5.12.1-s390.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
|
|
@ -60,11 +62,17 @@ 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
|
||||
%setup -q -n %{qt_module}-everywhere-src-%{version}
|
||||
|
||||
%patch0 -p1 -b .s390
|
||||
%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -78,10 +86,26 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O1"
|
|||
|
||||
%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 \
|
||||
|
|
@ -135,8 +159,16 @@ fi
|
|||
%files examples
|
||||
%{_qt5_examplesdir}/
|
||||
|
||||
%if 0%{?build_tests}
|
||||
%files tests
|
||||
%{_qt5_libdir}/qt5/tests
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Nov 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
|
||||
- 5.12.5
|
||||
Resolves: bz#1733147
|
||||
|
||||
* Mon Dec 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2
|
||||
- Rebuild to fix CET notes
|
||||
Resolves: bz#1657247
|
||||
|
|
|
|||
Loading…
Reference in New Issue