[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD Use-system-wide-font.patch)

[Jiachen Yang]

    Date: Tuesday, December 11, 2018 @ 16:30:17
  Author: farseerfc
Revision: 415393

upgpkg: telegram-desktop 1.5.0-3

telegram-desktop: revert Use-system-wide-font patch for bold fonts without ttf-opensans

Modified:
  telegram-desktop/trunk/PKGBUILD
Deleted:
  telegram-desktop/trunk/Use-system-wide-font.patch

----------------------------+
 PKGBUILD                   |    7 ++-----
 Use-system-wide-font.patch |   34 ----------------------------------
 2 files changed, 2 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-11 16:29:03 UTC (rev 415392)
+++ PKGBUILD	2018-12-11 16:30:17 UTC (rev 415393)
@@ -6,7 +6,7 @@
 
 pkgname=telegram-desktop
 pkgver=1.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -27,7 +27,6 @@
     "tdesktop.patch"
     "no-gtk2.patch"
     "libtgvoip.patch"
-    "Use-system-wide-font.patch"
 )
 sha512sums=('SKIP'
             'SKIP'
@@ -40,8 +39,7 @@
             'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e'
             'd85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2'
             'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5'
-            'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
-            'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653')
+            'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39')
 
 prepare() {
     cd "$srcdir/tdesktop"
@@ -55,7 +53,6 @@
     git submodule update
 
     patch -Np1 -i "$srcdir/tdesktop.patch"
-    patch -Np1 -i "$srcdir/Use-system-wide-font.patch"
     patch -Np1 -i "$srcdir/no-gtk2.patch"
 
     cd "Telegram/ThirdParty/libtgvoip"

Deleted: Use-system-wide-font.patch
===================================================================
--- Use-system-wide-font.patch	2018-12-11 16:29:03 UTC (rev 415392)
+++ Use-system-wide-font.patch	2018-12-11 16:30:17 UTC (rev 415393)
@@ -1,34 +0,0 @@
-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-ns at 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.