Date: Thursday, January 23, 2020 @ 15:33:36 Author: farseerfc Revision: 554983
upgpkg: telegram-desktop 1.9.7-1: telegram-desktop 1.9.7 release Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/series Deleted: telegram-desktop/trunk/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch ----------------------------------------------------------+ 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch | 25 ------------- PKGBUILD | 19 +++++---- series | 1 3 files changed, 11 insertions(+), 34 deletions(-) Deleted: 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch =================================================================== --- 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch 2020-01-23 15:33:15 UTC (rev 554982) +++ 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch 2020-01-23 15:33:36 UTC (rev 554983) @@ -1,25 +0,0 @@ -From b7effa2fd838afc049ec5cc00df3bd0810a95da4 Mon Sep 17 00:00:00 2001 -From: Jiachen YANG <farsee...@gmail.com> -Date: Fri, 4 Oct 2019 16:59:26 +0900 -Subject: [PATCH 3/6] Revert "Disable DemiBold fallback for Semibold." - -This reverts commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf. ---- - Telegram/lib_ui/ui/style/style_core_font.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/Telegram/lib_ui/ui/style/style_core_font.cpp -+++ b/Telegram/lib_ui/ui/style/style_core_font.cpp -@@ -225,9 +225,9 @@ - - f.setPixelSize(size); - if (_flags & FontBold) { -- f.setBold(true); -- //} else if (fontFamilies[family] == "Open Sans Semibold") { -- // f.setWeight(QFont::DemiBold); -+ f.setBold(_flags & FontBold); -+ } else if (fontFamilies[family] == "Open Sans Semibold") { -+ f.setWeight(QFont::DemiBold); - } - f.setItalic(_flags & FontItalic); - f.setUnderline(_flags & FontUnderline); Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-01-23 15:33:15 UTC (rev 554982) +++ PKGBUILD 2020-01-23 15:33:36 UTC (rev 554983) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.9.4 -pkgrel=2 +pkgver=1.9.7 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/" @@ -39,14 +39,13 @@ "https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz" telegram-desktop.sh 0005-Use-system-wide-fonts.patch - 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch + #"gcc9-cpp2a.patch::https://github.com/desktop-app/cmake_helpers/commit/67cf2a5abdb01658c1cf852b29e25808dcc02c56.patch" series ) -sha512sums=('0967f60dd978a5fc5ec2501a22e8865afd4ddeaacfd1b0acfb133cd511767ff1c6f03a099aef3de03b0f837c8eccac1caea14c395ee54c8d3ab5b35de7551745' +sha512sums=('7fd2e2ab8813fad187ca711aafc42c1ad76102ee23ce2dbfa4ccc6898b80a152ecbdf842a175b67db05937c099ddf45889ad493a5bac91da9331ee645bb691bf' '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b' 'e12021af0c95c967f80240abd683bf197f3c4f8f21315b48c5dadeb399dc39cd1e352352daba1c30691c6d1c6e66078af95b9262e8fe0c2174709fcb1a8a3f5d' - '41f22a8b63b1929288cca5638c2719ce9754aa4334deb9004370c44f780fb8ac57f2b4075d529c494f4eac49dde22885f0f9efc0911840f79cb5fcf8d737061d' - 'd66adb920b318520146cf7a29f13e28e16c0cfb28f4d27ef743a8d7acea4b45b5c62e7dfc3928ec23a97b12dd42845f311aaa7c317df632f7926bdd5bfb8f2b3') + 'bff9dea22b659f37a5e3508e5da381f2cffcc83f4f0aa85d0ef9a9ff5666acb36af70a6396aa9d9610626cf8c81fb4fefb63ee511f94bf58c1c9830d93853ffe') prepare() { cd tdesktop-$pkgver-full @@ -54,6 +53,9 @@ QUILT_PATCHES=.. quilt --quiltrc=/dev/null push -a mkdir build + + #cd cmake + #patch -Np1 -i "$srcdir/gcc9-cpp2a.patch" } build() { @@ -73,7 +75,8 @@ -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \ -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \ -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \ - -DDESKTOP_APP_SPECIAL_TARGET="" + -DDESKTOP_APP_SPECIAL_TARGET="" \ + -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" ninja -C build } @@ -82,7 +85,7 @@ install -m755 telegram-desktop.sh "$pkgdir/usr/bin/telegram-desktop" cd tdesktop-$pkgver-full - install -m755 build/bin/Telegram "$pkgdir/usr/bin/telegram-desktop-bin" + install -m755 build/bin/telegram-desktop "$pkgdir/usr/bin/telegram-desktop-bin" install -d "$pkgdir/usr/share/applications" install -m644 lib/xdg/telegramdesktop.desktop "$pkgdir/usr/share/applications/telegramdesktop.desktop" Modified: series =================================================================== --- series 2020-01-23 15:33:15 UTC (rev 554982) +++ series 2020-01-23 15:33:36 UTC (rev 554983) @@ -1,2 +1 @@ 0005-Use-system-wide-fonts.patch -0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch