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

This commit is contained in:
Jan Grulich 2023-11-09 12:54:48 +01:00
parent a44bfe9ca5
commit 469e3a8860

View File

@ -38,7 +38,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase Name: qt6-qtbase
Summary: Qt6 - QtBase components Summary: Qt6 - QtBase components
Version: 6.6.0 Version: 6.6.0
Release: 5%{?dist} Release: 6%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://qt-project.org/ Url: http://qt-project.org/
@ -91,7 +91,8 @@ Patch58: qtbase-libglvnd.patch
Patch59: qtbase-libxkbcommon-1.6.0.patch Patch59: 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 # Bug 1954359 - Many emoji don't show up in Qt apps because qt does not handle 'emoji' font family
Patch60: qtbase-cache-emoji-font.patch # FIXME: this change seems to completely break font rendering for some people
# Patch60: qtbase-cache-emoji-font.patch
%if 0%{?fedora} < 39 %if 0%{?fedora} < 39
# Latest QGnomePlatform needs to be specified to be used # Latest QGnomePlatform needs to be specified to be used
@ -836,6 +837,9 @@ make check -k ||:
%changelog %changelog
* Thu Nov 09 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.0-6
- Revert: Fix Qt not showing up emoji by handling emoji font family
* Tue Nov 07 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.0-5 * Tue Nov 07 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.0-5
- Fix Qt not showing up emoji by handling emoji font family - Fix Qt not showing up emoji by handling emoji font family