!4 add option -no-webkit

Merge pull request !4 from syyhao/next
This commit is contained in:
openeuler-ci-bot 2020-01-15 07:07:55 +08:00 committed by Gitee
commit 3f1ce8128e

View File

@ -13,7 +13,7 @@
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.7 Version: 4.8.7
Release: 45 Release: 46
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/
@ -169,7 +169,7 @@ export QTDIR=$PWD
-platform %{platform} -no-rpath -gtkstyle -cups -shared -release -fontconfig -largefile -no-separate-debug-info \ -platform %{platform} -no-rpath -gtkstyle -cups -shared -release -fontconfig -largefile -no-separate-debug-info \
-no-phonon -no-pch -sm -stl -glib -xkb -xshape -xinerama -xinput -xcursor -xfixes -xrandr -xrender -system-libmng \ -no-phonon -no-pch -sm -stl -glib -xkb -xshape -xinerama -xinput -xcursor -xfixes -xrandr -xrender -system-libmng \
-system-libjpeg -system-libtiff -system-zlib -icu -openssl-linked -xmlpatterns -dbus-linked -graphicssystem raster \ -system-libjpeg -system-libtiff -system-zlib -icu -openssl-linked -xmlpatterns -dbus-linked -graphicssystem raster \
-webkit -plugin-sql-ibase -plugin-sql-mysql -plugin-sql-psql -plugin-sql-odbc -plugin-sql-sqlite -plugin-sql-tds -system-sqlite -webkit -plugin-sql-ibase -plugin-sql-mysql -plugin-sql-psql -plugin-sql-odbc -plugin-sql-sqlite -plugin-sql-tds -system-sqlite %{!?webkit:-no-webkit }
make clean -C qmake make clean -C qmake
%make_build -C qmake \ %make_build -C qmake \
@ -443,6 +443,9 @@ fi
%{_qt4_prefix}/examples/ %{_qt4_prefix}/examples/
%changelog %changelog
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:4.8.7-46
- add option %{!?webkit:-no-webkit }
* Wed Dec 25 2019 zhouyihang<zhouyihang1@huawei.com> - 1:4.8.7-45 * Wed Dec 25 2019 zhouyihang<zhouyihang1@huawei.com> - 1:4.8.7-45
- Type:cves - Type:cves
- ID:CVE-2018-19870 CVE-2018-19873 - ID:CVE-2018-19870 CVE-2018-19873