[arch-commits] Commit in telegram-desktop/trunk (2 files)

[Sven-Hendrik Haase]

    Date: Sunday, January 26, 2020 @ 03:29:44
  Author: svenstaro
Revision: 555629

upgpkg: telegram-desktop 1.9.8-2: Clean up some stuff as many things have been upstreamed

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

----------------------------------+
 0005-Use-system-wide-fonts.patch |   59 -------------------------------------
 PKGBUILD                         |   55 +++++-----------------------------
 2 files changed, 9 insertions(+), 105 deletions(-)

Deleted: 0005-Use-system-wide-fonts.patch
===================================================================
--- 0005-Use-system-wide-fonts.patch	2020-01-26 02:18:06 UTC (rev 555628)
+++ 0005-Use-system-wide-fonts.patch	2020-01-26 03:29:44 UTC (rev 555629)
@@ -1,59 +0,0 @@
-Do not force custom fontconfig configuration.
-Index: tdesktop-1.9.4-full/Telegram/lib_ui/fonts/fonts.qrc
-===================================================================
---- tdesktop-1.9.4-full.orig/Telegram/lib_ui/fonts/fonts.qrc
-+++ tdesktop-1.9.4-full/Telegram/lib_ui/fonts/fonts.qrc
-@@ -1,10 +1,4 @@
- <RCC>
-   <qresource prefix="/gui/fonts">
--    <file>DAOpenSansRegular.ttf</file>
--    <file>DAOpenSansRegularItalic.ttf</file>
--    <file>DAOpenSansBold.ttf</file>
--    <file>DAOpenSansBoldItalic.ttf</file>
--    <file>DAOpenSansSemibold.ttf</file>
--    <file>DAOpenSansSemiboldItalic.ttf</file>
-   </qresource>
- </RCC>
-Index: tdesktop-1.9.4-full/Telegram/lib_ui/ui/style/style_core_font.cpp
-===================================================================
---- tdesktop-1.9.4-full.orig/Telegram/lib_ui/ui/style/style_core_font.cpp
-+++ tdesktop-1.9.4-full/Telegram/lib_ui/ui/style/style_core_font.cpp
-@@ -94,12 +94,12 @@ enum {
- 	FontTypesCount,
- };
- QString FontTypeNames[FontTypesCount] = {
--	"DAOpenSansRegular",
--	"DAOpenSansRegularItalic",
--	"DAOpenSansBold",
--	"DAOpenSansBoldItalic",
--	"DAOpenSansSemibold",
--	"DAOpenSansSemiboldItalic",
-+	"Open Sans",
-+	"Open Sans",
-+	"Open Sans",
-+	"Open Sans",
-+	"Open Sans Semibold",
-+	"Open Sans Semibold",
- };
- int32 FontTypeFlags[FontTypesCount] = {
- 	0,
-@@ -135,7 +135,7 @@ void StartFonts() {
- 	for (auto i = 0; i != FontTypesCount; ++i) {
- 		const auto name = FontTypeNames[i];
- 		const auto flags = FontTypeFlags[i];
--		areGood[i] = LoadCustomFont(":/gui/fonts/" + name + ".ttf", name, flags);
-+		areGood[i] = ValidateFont(name, flags);
- 		Overrides[i] = name;
- #ifdef Q_OS_WIN
- 		// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
-Index: tdesktop-1.9.4-full/Telegram/lib_ui/qt_conf/linux.qrc
-===================================================================
---- tdesktop-1.9.4-full.orig/Telegram/lib_ui/qt_conf/linux.qrc
-+++ tdesktop-1.9.4-full/Telegram/lib_ui/qt_conf/linux.qrc
-@@ -3,6 +3,5 @@
-     <file alias="qt.conf">qt_linux.conf</file>
-   </qresource>
-   <qresource prefix="/fc">
--    <file>fc-custom.conf</file>
-   </qresource>
- </RCC>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-26 02:18:06 UTC (rev 555628)
+++ PKGBUILD	2020-01-26 03:29:44 UTC (rev 555629)
@@ -6,58 +6,22 @@
 
 pkgname=telegram-desktop
 pkgver=1.9.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
-depends=(
-    'enchant'
-    'ffmpeg'
-    'hicolor-icon-theme'
-    'lz4'
-    'minizip'
-    'openal'
-    'qt5-imageformats'
-    'xxhash'
-    'libappindicator-gtk3'
-)
+depends=('enchant' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
+         'qt5-imageformats' 'xxhash' 'libappindicator-gtk3')
 # for libappindicator-gtk3 see https://bugs.archlinux.org/task/65080
 
-makedepends=(
-    'cmake'
-    'git'
-    'ninja'
-    'python'
-    'quilt'
-    'range-v3'
-)
-optdepends=(
-    'ttf-opensans: default Open Sans font family'
-)
-source=(
-    "https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
-    telegram-desktop.sh
-    0005-Use-system-wide-fonts.patch
-    #"gcc9-cpp2a.patch::https://github.com/desktop-app/cmake_helpers/commit/67cf2a5abdb01658c1cf852b29e25808dcc02c56.patch"
-    series
-)
+makedepends=('cmake' 'git' 'ninja' 'python' 'quilt' 'range-v3')
+optdepends=('ttf-opensans: default Open Sans font family')
+source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
+        telegram-desktop.sh)
 sha512sums=('5562eb99812a8faec74fe073323d6e04e36311c1e4ce984035212ecfed8bd5d12df92cd0f0022401201136315fb5556971b267b4bf47edf4eeddc9926c7969dc'
-            '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b'
-            'e12021af0c95c967f80240abd683bf197f3c4f8f21315b48c5dadeb399dc39cd1e352352daba1c30691c6d1c6e66078af95b9262e8fe0c2174709fcb1a8a3f5d'
-            'bff9dea22b659f37a5e3508e5da381f2cffcc83f4f0aa85d0ef9a9ff5666acb36af70a6396aa9d9610626cf8c81fb4fefb63ee511f94bf58c1c9830d93853ffe')
+            '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b')
 
-prepare() {
-    cd tdesktop-$pkgver-full
-
-    QUILT_PATCHES=.. quilt --quiltrc=/dev/null push -a
-
-    mkdir build
-
-    #cd cmake
-    #patch -Np1 -i "$srcdir/gcc9-cpp2a.patch"
-}
-
 build() {
     cd tdesktop-$pkgver-full
 
@@ -66,8 +30,7 @@
         -Ddisable_autoupdate=1 \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
-        -DTDESKTOP_API_ID=17349 \
-        -DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb \
+        -DTDESKTOP_API_TEST=ON \
         -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
         -DDESKTOP_APP_USE_PACKAGED=ON \
         -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \