Date: Tuesday, December 11, 2018 @ 20:08:01 Author: farseerfc Revision: 415526
upgpkg: telegram-desktop 1.5.1-2 telegram-desktop 1.5.1-2 revert SemiBold font fallback Added: telegram-desktop/trunk/Use-system-wide-font.patch telegram-desktop/trunk/demibold.patch Modified: telegram-desktop/trunk/PKGBUILD ----------------------------+ PKGBUILD | 10 ++++++++-- Use-system-wide-font.patch | 34 ++++++++++++++++++++++++++++++++++ demibold.patch | 27 +++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-12-11 19:53:28 UTC (rev 415525) +++ PKGBUILD 2018-12-11 20:08:01 UTC (rev 415526) @@ -6,7 +6,7 @@ pkgname=telegram-desktop pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/" @@ -27,6 +27,8 @@ "tdesktop.patch" "no-gtk2.patch" "libtgvoip.patch" + "demibold.patch" + "Use-system-wide-font.patch" ) sha512sums=('SKIP' 'SKIP' @@ -39,7 +41,9 @@ 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' 'd85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2' 'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5' - 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39') + 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' + '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0' + 'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653') prepare() { cd "$srcdir/tdesktop" @@ -54,6 +58,8 @@ patch -Np1 -i "$srcdir/tdesktop.patch" patch -Np1 -i "$srcdir/no-gtk2.patch" + patch -R -Np1 -i "$srcdir/demibold.patch" + patch -Np1 -i "$srcdir/Use-system-wide-font.patch" cd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "$srcdir/libtgvoip.patch" Added: Use-system-wide-font.patch =================================================================== --- Use-system-wide-font.patch (rev 0) +++ Use-system-wide-font.patch 2018-12-11 20:08:01 UTC (rev 415526) @@ -0,0 +1,34 @@ +Description: Remove links to packaged Open Sans font + This makes Telegram Desktop use system-wide fonts. + Warnings about non-existent fonts in resources are also disabled. +Author: Nicholas Guriev <guriev...@ya.ru> +Bug-Debian: https://bugs.debian.org/890341 +Last-Update: Sat, 31 Mar 2018 14:36:39 +0300 + +--- a/Telegram/Resources/qrc/telegram.qrc ++++ b/Telegram/Resources/qrc/telegram.qrc +@@ -42,9 +42,6 @@ + <file alias="js/script.js">../export_html/js/script.js</file> + </qresource> + <qresource prefix="/gui"> +- <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file> +- <file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file> +- <file alias="fonts/OpenSans-Semibold.ttf">../fonts/OpenSans-Semibold.ttf</file> + <file alias="art/bg.jpg">../art/bg.jpg</file> + <file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file> + <file alias="art/logo_256.png">../art/logo_256.png</file> +--- a/Telegram/SourceFiles/ui/twidget.cpp ++++ b/Telegram/SourceFiles/ui/twidget.cpp +@@ -70,9 +70,9 @@ void Start() { + } + Started = true; + +- auto regular = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Regular.ttf"), qsl("Open Sans")); +- auto bold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Bold.ttf"), qsl("Open Sans"), style::internal::FontBold); +- auto semibold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Semibold.ttf"), qsl("Open Sans Semibold")); ++ auto regular = ValidateFont(qsl("Open Sans")); ++ auto bold = ValidateFont(qsl("Open Sans"), style::internal::FontBold); ++ auto semibold = ValidateFont(qsl("Open Sans Semibold")); + + #ifdef Q_OS_WIN + // Attempt to workaround a strange font bug with Open Sans Semibold not loading. Added: demibold.patch =================================================================== --- demibold.patch (rev 0) +++ demibold.patch 2018-12-11 20:08:01 UTC (rev 415526) @@ -0,0 +1,27 @@ +commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf +Author: John Preston <johnprestonm...@gmail.com> +Date: Wed Dec 5 14:42:19 2018 +0400 + + Disable DemiBold fallback for Semibold. + + This reverts changes from commit 089c4ceb30. + + There were complaints that Persian font becomes unreadable :( + +diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp +index a2ab5f89f..d268a71e1 100644 +--- a/Telegram/SourceFiles/ui/style/style_core_font.cpp ++++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp +@@ -58,9 +58,9 @@ FontData::FontData(int size, uint32 flags, int family, Font *other) + + f.setPixelSize(size); + if (_flags & FontBold) { +- f.setBold(_flags & FontBold); +- } else if (fontFamilies[family] == "Open Sans Semibold") { +- f.setWeight(QFont::DemiBold); ++ f.setBold(true); ++ //} else if (fontFamilies[family] == "Open Sans Semibold") { ++ // f.setWeight(QFont::DemiBold); + } + f.setItalic(_flags & FontItalic); + f.setUnderline(_flags & FontUnderline);