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

!18 add double-conversion support riscv

Browse Source 
From: @riscv-spare
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-02-01 10:39:02 +08:00 committed by Gitee
commit 4d2c79b3d5
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qt5-qtbase.spec
View File

@ -13,7 +13,7 @@
Name: qt5-qtbase Name: qt5-qtbase
Summary: Core component of Qt toolkit Summary: Core component of Qt toolkit
Version: 5.11.1 Version: 5.11.1
Release: 12 Release: 13
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/ Url: http://qt-project.org/
Source0: https://download.qt.io/new_archive/qt/5.11/%{version}/submodules/qtbase-everywhere-src-%{version}.tar.xz Source0: https://download.qt.io/new_archive/qt/5.11/%{version}/submodules/qtbase-everywhere-src-%{version}.tar.xz
@ -34,7 +34,7 @@ Patch0008: qt5-qtbase-cxxflag.patch
Patch0009: qt5-qtbase-5.9.1-firebird.patch Patch0009: qt5-qtbase-5.9.1-firebird.patch
Patch0010: qtbase-everywhere-src-5.11.1-python3.patch Patch0010: qtbase-everywhere-src-5.11.1-python3.patch
Patch0011: qt5-qtbase-glibc.patch Patch0011: qt5-qtbase-glibc.patch
Patch0012: qtbase5-double-conversion-add-riscv.patch
Patch6000: CVE-2018-15518.patch Patch6000: CVE-2018-15518.patch
Patch6001: CVE-2015-9541.patch Patch6001: CVE-2015-9541.patch
@ -403,6 +403,9 @@ fi
%changelog %changelog
* Sat Nov 28 2020 liyuanrong <liyuanrong1@huawei.com> - 5.11.1-13
- add double conversion support riscv
* Mon Sep 21 2020 wutao <wutao61@huawei.com> - 5.11.1-12 * Mon Sep 21 2020 wutao <wutao61@huawei.com> - 5.11.1-12
- fix CVE-2015-9541 - fix CVE-2015-9541

14
qtbase5-double-conversion-add-riscv.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
index 20bfd36..fe6cb4c 100644
--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
@@ -65,7 +65,8 @@
defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
defined(__SH4__) || defined(__alpha__) || \
defined(_MIPS_ARCH_MIPS32R2) || \
- defined(__AARCH64EL__)
+ defined(__AARCH64EL__) || \
+ defined(__riscv)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
#if defined(_WIN32)