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

Merge branch 'f37' into f36

This commit is contained in:
Jan Grulich 2023-01-10 08:39:23 +01:00
parent 8fc6b116e1 ec29ebd55b
commit 9c531f88df
4 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -14,3 +14,5 @@
/kde-5.15-rollup-20220920.patch.gz
/qtbase-everywhere-opensource-src-5.15.7.tar.xz
/kde-5.15-rollup-20221031.patch.gz
/qtbase-everywhere-opensource-src-5.15.8.tar.xz
/kde-5.15-rollup-20230105.patch.gz

24
qt5-qtbase.spec
View File

@ -60,8 +60,8 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.7
Release: 1%{?dist}
Version: 5.15.8
Release: 2%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -141,11 +141,13 @@ Patch90: %{name}-gcc11.patch
## upstream patches
# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
# git diff v5.15.7-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
# git diff v5.15.8-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: kde-5.15-rollup-20221031.patch.gz
Patch100: kde-5.15-rollup-20230105.patch.gz
# HACK to make 'fedpkg sources' consider it 'used"
Source100: kde-5.15-rollup-20221031.patch.gz
Source100: kde-5.15-rollup-20230105.patch.gz
Patch101: qtbase-5.15.8-fix-missing-qtsan-include.patch
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
# Those themes are there for platform integration. If the required libraries are
@ -423,6 +425,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
## upstream patches
%patch100 -p1
%patch101 -p1
# move some bundled libs to ensure they're not accidentally used
pushd src/3rdparty
@ -584,7 +587,7 @@ translationdir=%{_qt5_translationdir}
Name: Qt5
Description: Qt5 Configuration
Version: 5.15.7
Version: 5.15.8
EOF
# rpm macros
@ -1100,6 +1103,15 @@ fi
%changelog
* Thu Jan 05 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-2
- Correctly install qtsan header file
* Thu Jan 05 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-1
- 5.15.8
* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 5.15.7-2
- Rebuild for ICU 72
* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.7-1
- 5.15.7

40
qtbase-5.15.8-fix-missing-qtsan-include.patch Normal file
View File

File diff suppressed because one or more lines are too long

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (qtbase-everywhere-opensource-src-5.15.7.tar.xz) = 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
SHA512 (kde-5.15-rollup-20221031.patch.gz) = 6384a64a91bcdfc1818816425606e1f93dca5d870dfd492cfa24af92e358237faaf40a889d7c6d7331f3544414b7ef570d282732a2c5233de881f3fdb26173d3
SHA512 (qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
SHA512 (kde-5.15-rollup-20230105.patch.gz) = 837987cbb0e31179170c938fb0fb0e431e41273be53b737fa183aeb114eca2c8c36cba5ce65c51c145e7f43c2fd8789a3a8156d61b7127dc08929802fbb848c8