packages/qt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modify

Browse Source
This commit is contained in:
yanglijin 2020-03-19 02:12:57 -04:00
parent 3f1ce8128e
commit d42089f214
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qt.spec
View File

@ -13,7 +13,7 @@
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.7 Version: 4.8.7
Release: 46 Release: 47
Summary: A software toolkit for developing applications Summary: A software toolkit for developing applications
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
URL: http://qt-project.org/ URL: http://qt-project.org/
@ -71,7 +71,7 @@ Patch39: qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
Patch40: qt-aarch64.patch Patch40: qt-aarch64.patch
Patch41: qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch Patch41: qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch
Patch42: qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch Patch42: qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch
Patch43: stack-protector.patch
Patch6000: CVE-2018-19869.patch Patch6000: CVE-2018-19869.patch
Patch6001: CVE-2018-19872.patch Patch6001: CVE-2018-19872.patch
Patch6002: CVE-2018-19871.patch Patch6002: CVE-2018-19871.patch
@ -443,6 +443,9 @@ fi
%{_qt4_prefix}/examples/ %{_qt4_prefix}/examples/
%changelog %changelog
* Thu Mar 19 2020 yanglijin <yanglijin@huawei.com> - 1:4.8.7-47
- add stack protector
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:4.8.7-46 * Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:4.8.7-46
- add option %{!?webkit:-no-webkit } - add option %{!?webkit:-no-webkit }

13
stack-protector.patch Normal file
View File

@ -0,0 +1,13 @@
--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri.org 2020-03-18 22:33:46.363443747 -0400
+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri 2020-03-18 21:20:59.517087778 -0400
@@ -61,8 +61,8 @@ contains(JAVASCRIPTCORE_JIT,no) {
# Rules when JIT enabled (not disabled)
!contains(DEFINES, ENABLE_JIT=0) {
linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
- QMAKE_CXXFLAGS += -fno-stack-protector
- QMAKE_CFLAGS += -fno-stack-protector
+ #QMAKE_CXXFLAGS += -fno-stack-protector
+ #QMAKE_CFLAGS += -fno-stack-protector
}
}