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

Revert: Fix Qt not showing up emoji by handling emoji font family

Browse Source
This commit is contained in:
Jan Grulich 2023-11-09 12:52:32 +01:00
parent 69a1492416
commit a660cb2e27
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qt5-qtbase.spec
View File

@ -57,7 +57,7 @@
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.11
Release: 4%{?dist}
Release: 5%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -140,7 +140,7 @@ Patch61: qtbase-5.15.10-work-around-pyside2-brokenness.patch
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
# Patch63: qtbase-cache-emoji-font.patch
# gcc-11
Patch90: %{name}-gcc11.patch
@ -460,7 +460,8 @@ Qt5 libraries used for drawing widgets and OpenGL items.
%endif
%patch -P61 -p1
%patch -P62 -p1 -b .libxkbcommon-1.6.0
%patch -P63 -p1 -b .cache-emoji-font
# FIXME seems to break text rendering completely for some people
# %patch -P63 -p1 -b .cache-emoji-font
%patch -P90 -p1 -b .gcc11
@ -1175,6 +1176,9 @@ fi
%changelog
* Thu Nov 09 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.11-5
- Revert: Fix Qt not showing up emoji by handling emoji font family
* Tue Nov 07 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.11-4
- Fix Qt not showing up emoji by handling emoji font family