!7 Add yaml file

Merge pull request !7 from 李振华/master
This commit is contained in:
openeuler-ci-bot 2020-05-25 16:02:36 +08:00 committed by Gitee
commit 3d17dab9e2
3 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,26 @@
From a52d7861edfb5956de38ba80015c4dd0b596259b Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 13 Nov 2018 16:00:23 +0100
Subject: [PATCH] Fix compile issue with gcc 9
It appears messenne_twisters in the latest libstdc++ has one more
requirement before it is willing to construct with our
SystemGenerator struct as an sseq provider.
Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
index 23e5e49..03534cf 100644
--- a/src/corelib/global/qrandom.cpp
+++ b/src/corelib/global/qrandom.cpp
@@ -218,6 +218,7 @@
#endif // Q_OS_WINRT
static SystemGenerator &self();
+ typedef quint32 result_type;
void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept);
// For std::mersenne_twister_engine implementations that use something

View File

@ -13,7 +13,7 @@
Name: qt5-qtbase
Summary: Core component of Qt toolkit
Version: 5.11.1
Release: 9
Release: 10
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/
Source0: https://download.qt.io/official_releases/qt/5.11/%{version}/submodules/qtbase-everywhere-src-%{version}.tar.xz
@ -22,6 +22,7 @@ Source2: qconfig-multilib.h
Source3: 10-qt5-check-opengl2.sh
Source4: macros.qt5-qtbase
Patch0000: 0001-Fix-compile-issue-with-gcc-9.patch
Patch0001: qtbase-multilib_optflags.patch
Patch0002: qtbase-opensource-src-5.3.2-QTBUG-35459.patch
Patch0003: tell-the-truth-about-private-api.patch
@ -401,12 +402,14 @@ fi
%changelog
* Mon May 25 2020 lizhenhua <lizhenhua12@huawei.com> - 5.11.1-10
- Fix compile issue with gcc 9
* Wed Dec 25 2019 fengbing <fengbing7@huawei.com> - 5.11.1-9
- Type:cves
- ID:CVE-2018-15518
- SUG:restart
- DESC: fix CVE-2018-15518
* Thu Nov 07 2019 yanzhihua <yanzhihua4@huawei.com> - 5.11.1-8
- Package init

4
qt5-qtbase.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: git
src_repo: https://code.qt.io/qt/qtbase.git
tag_prefix: ^
seperator: .