From 14625e99cf4ba3f1c508335b223957a032ec4c86 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: May 04 2024 14:30:44 +0000 Subject: Fixed system font patch --- diff --git a/64Gram/0001-lib_ui-disable-open-sans.patch b/64Gram/0001-lib_ui-disable-open-sans.patch new file mode 100644 index 0000000..77b6c41 --- /dev/null +++ b/64Gram/0001-lib_ui-disable-open-sans.patch @@ -0,0 +1,19 @@ +diff --git a/Telegram/lib_ui/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp +index 626ba05..74de003 100644 +--- a/Telegram/lib_ui/ui/style/style_core_font.cpp ++++ b/Telegram/lib_ui/ui/style/style_core_font.cpp +@@ -321,14 +321,8 @@ struct Metrics { + const auto overriden = !monospace && !system && !family.isEmpty(); + if (monospace) { + font.setFamily(MonospaceFont()); +- } else if (system) { + } else if (overriden) { + font.setFamily(family); +- } else { +- font.setFamily("Open Sans"_q); +-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) +- font.setFeature("ss03", true); +-#endif // Qt >= 6.7.0 + } + font.setPixelSize(size); + diff --git a/64Gram/64Gram.spec b/64Gram/64Gram.spec index 2ee8081..ba188db 100644 --- a/64Gram/64Gram.spec +++ b/64Gram/64Gram.spec @@ -12,7 +12,7 @@ Name: 64Gram Version: 1.1.21 -Release: 1%{?dist} +Release: 2%{?dist} # Application and 3rd-party modules licensing: # * Telegram Desktop - GPL-3.0-or-later with OpenSSL exception -- main tarball; @@ -27,6 +27,7 @@ Summary: Unofficial Telegram Desktop client Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz Patch0: 0001-disable-autoupdate.patch Patch1: 0001-Revert-Force-usage-of-GSL-fork-because-of-a-libstdc-.patch +Patch2: 0001-lib_ui-disable-open-sans.patch Patch100: 1000-tgcalls-fix-libyuv-include.patch Patch101: 1000-lib_tl-fix-cstring-include.patch Patch102: 1000-lib_base-update-minizip.patch @@ -224,6 +225,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_metainfodir}/*.metainfo.xml %changelog +* Sat May 04 2024 Zephyr Lykos - 1.1.21-2 +- Fixed a regression where Open Sans is used by default. + * Sat May 04 2024 Zephyr Lykos - 1.1.21-1 - new version