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

KDE/Qt patchset collection respin

Browse Source
This commit is contained in:
Jan Grulich 2023-11-27 10:57:41 +01:00
parent 3ce2391866
commit 4de0d2acf2
4 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -24,3 +24,4 @@
/kde-5.15-rollup-20230613.patch.gz
/qtbase-everywhere-opensource-src-5.15.11.tar.xz
/kde-5.15-rollup-20231006.patch.gz
/kde-5.15-rollup-20231127.patch.gz

13
qt5-qtbase.spec
View File

@ -57,7 +57,7 @@
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.11
Release: 6%{?dist}
Release: 7%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -136,9 +136,6 @@ Patch60: qtbase-opensource-src-5.9.0-mysql.patch
# this workaround is acceptable, if not nice.
Patch61: qtbase-5.15.10-work-around-pyside2-brokenness.patch
# fix build against libxkbcommon 1.6.0
Patch62: qtbase-libxkbcommon-1.6.0.patch
# Bug 1954359 - Many emoji don't show up in Qt apps because qt does not handle 'emoji' font family
# Patch63: qtbase-cache-emoji-font.patch
@ -149,9 +146,9 @@ Patch90: %{name}-gcc11.patch
# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
# git diff v5.15.11-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-20231006.patch.gz
Patch100: kde-5.15-rollup-20231127.patch.gz
# HACK to make 'fedpkg sources' consider it 'used"
Source100: kde-5.15-rollup-20231006.patch.gz
Source100: kde-5.15-rollup-20231127.patch.gz
Patch101: qtbase-5.15.10-fix-missing-qtsan-include.patch
# Workaround for font rendering issue with cjk-vf-fonts
@ -464,7 +461,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
%patch -P60 -p1 -b .mysql
%endif
%patch -P61 -p1
%patch -P62 -p1 -b .libxkbcommon-1.6.0
# FIXME seems to break text rendering completely for some people
# %patch -P63 -p1 -b .cache-emoji-font
@ -1186,6 +1182,9 @@ fi
%changelog
* Mon Nov 27 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.11-7
- KDE/Qt patchset collection respin
* Tue Nov 14 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.11-6
- Backport another upstream (Qt6) fixes and improvements to QGtk3Theme

24
qtbase-libxkbcommon-1.6.0.patch
View File

@ -1,24 +0,0 @@
diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
index 9aa8f10c..0473feed 100644
--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
@@ -273,10 +273,15 @@ static constexpr const auto KeyTbl = qMakeArray(
Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+ // These were removed in libxkbcommon 1.6.0
+ // XK_dead_lowline
+ Xkb2Qt<0xfe90, Qt::Key_Dead_Lowline>,
+ // XK_dead_aboveverticalline
+ Xkb2Qt<0xfe91, Qt::Key_Dead_Aboveverticalline>,
+ // XK_dead_belowverticalline
+ Xkb2Qt<0xfe92, Qt::Key_Dead_Belowverticalline>,
+ // XK_dead_longsolidusoverlay
+ Xkb2Qt<0xfe93, Qt::Key_Dead_Longsolidusoverlay>,
// Special keys from X.org - This include multimedia keys,
// wireless/bluetooth/uwb keys, special launcher keys, etc.

1
sources
View File

@ -1,2 +1,3 @@
SHA512 (qtbase-everywhere-opensource-src-5.15.11.tar.xz) = 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f
SHA512 (kde-5.15-rollup-20231006.patch.gz) = 234267395354784408288b5e99e061c3cd42ffc9b880579372d74aab38f82f0b41488eeca4aff5fffbb2cca2da83189f57ee32efeea78d978308b60e57cffa6d
SHA512 (kde-5.15-rollup-20231127.patch.gz) = 01da34d1a87952edd025c5ccf2e61a8cdb8ea356d51c8a150057557f3eaf2a961e11aa5aebf3b93c4220a7f4bcbe6da9339a328a37161c4574e3d4fc7287f18a