rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

5.15.7

Browse Source
This commit is contained in:
Jan Grulich 2022-10-31 10:18:17 +01:00
parent d3e89a8f76
commit aa32f1d080
4 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,3 +12,5 @@
/kde-5.15-rollup-20220824.patch.gz /kde-5.15-rollup-20220824.patch.gz
/qtbase-everywhere-opensource-src-5.15.6.tar.xz /qtbase-everywhere-opensource-src-5.15.6.tar.xz
/kde-5.15-rollup-20220920.patch.gz /kde-5.15-rollup-20220920.patch.gz
/qtbase-everywhere-opensource-src-5.15.7.tar.xz
/kde-5.15-rollup-20221031.patch.gz

18
qt5-qtbase.spec
View File

@ -60,8 +60,8 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.15.6 Version: 5.15.7
Release: 2%{?dist} Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -141,13 +141,11 @@ Patch90: %{name}-gcc11.patch
## upstream patches ## upstream patches
# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch # https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
# git diff v5.15.5-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz # git diff v5.15.7-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
# patch100 in lookaside cache due to large'ish size -- rdieter # patch100 in lookaside cache due to large'ish size -- rdieter
Patch100: kde-5.15-rollup-20220920.patch.gz Patch100: kde-5.15-rollup-20221031.patch.gz
# HACK to make 'fedpkg sources' consider it 'used" # HACK to make 'fedpkg sources' consider it 'used"
Source100: kde-5.15-rollup-20220920.patch.gz Source100: kde-5.15-rollup-20221031.patch.gz
# CVS-2021-38593
Patch101: qtbase-everywhere-src-5.15.4-cve-2021-38593.patch
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
# Those themes are there for platform integration. If the required libraries are # Those themes are there for platform integration. If the required libraries are
@ -425,7 +423,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
## upstream patches ## upstream patches
%patch100 -p1 %patch100 -p1
%patch101 -p1
# move some bundled libs to ensure they're not accidentally used # move some bundled libs to ensure they're not accidentally used
pushd src/3rdparty pushd src/3rdparty
@ -587,7 +584,7 @@ translationdir=%{_qt5_translationdir}
Name: Qt5 Name: Qt5
Description: Qt5 Configuration Description: Qt5 Configuration
Version: 5.15.6 Version: 5.15.7
EOF EOF
# rpm macros # rpm macros
@ -1103,6 +1100,9 @@ fi
%changelog %changelog
* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.7-1
- 5.15.7
* Tue Oct 11 2022 Rex Dieter <rdieter@gmail.com> - 5.15.6-2 * Tue Oct 11 2022 Rex Dieter <rdieter@gmail.com> - 5.15.6-2
- make mixing verisons and private api usage a warning instead of fatal error - make mixing verisons and private api usage a warning instead of fatal error

12
qtbase-everywhere-src-5.15.4-cve-2021-38593.patch
View File

@ -1,12 +0,0 @@
diff -up qtbase-everywhere-src-5.15.4/src/gui/painting/qpaintengineex.cpp.me qtbase-everywhere-src-5.15.4/src/gui/painting/qpaintengineex.cpp
--- qtbase-everywhere-src-5.15.4/src/gui/painting/qpaintengineex.cpp.me 2022-05-30 14:21:52.215469841 +0200
+++ qtbase-everywhere-src-5.15.4/src/gui/painting/qpaintengineex.cpp 2022-05-30 14:22:39.552558748 +0200
@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVecto
patternLength *= pw;
if (qFuzzyIsNull(patternLength)) {
pen.setStyle(Qt::NoPen);
- } else if (extent / patternLength > 10000) {
+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) {
// approximate stream of tiny dashes with semi-transparent solid line
pen.setStyle(Qt::SolidLine);
QColor color(pen.color());

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (qtbase-everywhere-opensource-src-5.15.6.tar.xz) = 4fc6973b9250cd78c4797ed9bb58bec949243cc5e8c3a546b5fbe8c6e6480d5e0745d273fac812f9f5f1fcd675cd8b867d47f57563bf6d23118b58032550103f SHA512 (qtbase-everywhere-opensource-src-5.15.7.tar.xz) = 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
SHA512 (kde-5.15-rollup-20220920.patch.gz) = bbfe6a34185f99500ee2ec0c75ae36f007d13cccf03765b49f271ec55bd76b562647a45b400a329af85fd74b22a38223796039ebb6b9b98c0e75ce1a2a81bbd0 SHA512 (kde-5.15-rollup-20221031.patch.gz) = 6384a64a91bcdfc1818816425606e1f93dca5d870dfd492cfa24af92e358237faaf40a889d7c6d7331f3544414b7ef570d282732a2c5233de881f3fdb26173d3