user/telegram: Bump to 1.9.19

4 files changed, 13 insertions, 53 deletions

diff --git a/user/telegram/APKBUILD b/user/telegram/APKBUILD
index 1f36cb942..994ed5559 100644
--- a/user/telegram/APKBUILD
+++ b/user/telegram/APKBUILD
@@ -1,20 +1,20 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=telegram
-pkgver=1.9.6
+pkgver=1.9.19
 pkgrel=0
 pkgdesc="Telegram messaging app"
 url="https://telegram.org/"
 arch="all"
 options="!check"  # No test suite.
 license="GPL-3.0-only WITH OpenSSL-exception"
-depends=""
-makedepends="cmake enchant-dev ffmpeg-dev lz4-dev minizip-dev openal-soft-dev openssl-dev opus-dev pulseaudio-dev python3 qt5-qtbase-dev range-v3 xxhash-dev xz-dev zlib-dev"
+depends="qt5-qtimageformats"
+makedepends="cmake enchant-dev ffmpeg-dev hunspell-dev libdbusmenu-qt-dev
+	lz4-dev minizip-dev openal-soft-dev openssl-dev opus-dev pulseaudio-dev
+	python3 qt5-qtbase-dev range-v3 xxhash-dev xz-dev zlib-dev"
 subpackages=""
-source="https://github.com/telegramdesktop/tdesktop/releases/download/v1.9.6/tdesktop-$pkgver-full.tar.gz
+source="https://github.com/telegramdesktop/tdesktop/releases/download/v$pkgver/tdesktop-$pkgver-full.tar.gz
 	endian.patch
-	headers.patch
-	ppc.patch
 	"
 builddir="$srcdir/tdesktop-$pkgver-full"
 
@@ -35,7 +35,10 @@ build() {
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
 		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF \
+		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF \
 		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \
 		-DTDESKTOP_API_ID="${TELEGRAM_API_ID}" \
 		-DTDESKTOP_API_HASH="${TELEGRAM_API_HASH}" \
 		-DTDESKTOP_DISABLE_GTK_INTEGRATION=ON \
@@ -48,16 +51,13 @@ build() {
 }
 
 package() {
-	install -D -m755 "$builddir"/bin/Telegram "$pkgdir"/usr/bin/telegram-desktop
+	install -D -m755 "$builddir"/bin/telegram-desktop "$pkgdir"/usr/bin/telegram-desktop
 	install -D -m644 "$builddir"/lib/xdg/telegramdesktop.desktop "$pkgdir"/usr/share/applications/telegramdesktop.desktop
-	install -D -m644 "$builddir"/lib/xdg/tg.protocol "$pkgdir"/usr/share/kservices5/tg.protocol
 	for _icon in 16 32 48 64 128 256 512; do
 		install -D -m644 "$builddir"/Telegram/Resources/art/icon$_icon.png \
 			"$pkgdir"/usr/share/icons/hicolor/${_icon}x${_icon}/apps/telegram.png
 	done
 }
 
-sha512sums="12446b8c467226b7ebfb96d3e8cdc77fbaeb9de6065e43e2de727564735f3047f2810d20bb12649eaffb41c09d2295a7918d041058ab1f96ba3dcdcf019d857e  tdesktop-1.9.6-full.tar.gz
-f39b541c915830adf359d864e197f773822f9925817664a596b595ef31b0c2d0d7f073284c45fb1236b61565e2d7959e030783b7a8350399513ff13f9c27aa2a  endian.patch
-9b9a9b623edcce37339e52e3e306a7106b6289749fca1b2dc7450c299da1a6f8d3f3f12b4973ecfbf3797f75ba88cf7f644adee896b053a683df4e4754d5d057  headers.patch
-685142055710f5a499d1f7c72a57c9c979dedce91c078204a6880080473db989e690d1bd1cce916e0a2cebb285741570665b4940ca7a5a36eecdd54eb39e8003  ppc.patch"
+sha512sums="29070c6e1d813943d5062dc1703f383a18323b5698fbc4e6f2c89b33366da9da5d1ec84dc29950288e7e7d112024de2924244ec9c800d59d4b210e6288c7291d  tdesktop-1.9.19-full.tar.gz
+c478bd59187493d60172d805ca19e9e09fa2c81b87d5dbbd5f3cd9aae0f207b463d127e06f2053f7b7b6ac00b3191d59e36ec6c5453a1da4d6535d1caad27242  endian.patch"
diff --git a/user/telegram/endian.patch b/user/telegram/endian.patch
index 81cfd8859..40a3b4478 100644
--- a/user/telegram/endian.patch
+++ b/user/telegram/endian.patch
@@ -11,7 +11,7 @@ diff --git Telegram/SourceFiles/config.h Telegram/SourceFiles/config.h
 index fb7b54e4d..6a873fbd7 100644
 --- a/Telegram/SourceFiles/config.h
 +++ b/Telegram/SourceFiles/config.h
-@@ -177,7 +177,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb";
+@@ -162,7 +162,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb";
  #endif // TDESKTOP_API_ID && TDESKTOP_API_HASH
  
  #if Q_BYTE_ORDER == Q_BIG_ENDIAN
diff --git a/user/telegram/headers.patch b/user/telegram/headers.patch
deleted file mode 100644
index dece8ec21..000000000
--- a/user/telegram/headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Should send this one upstream; it would work with glibc as well.
-
---- tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp.old	2020-01-21 12:16:27.000000000 +0000
-+++ tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp	2020-01-22 17:44:42.185530350 +0000
-@@ -6,6 +6,7 @@
- 
- #include "AudioPulse.h"
- #include <dlfcn.h>
-+#include <libgen.h>
- #include "../../logging.h"
- 
- #define DECLARE_DL_FUNCTION(name) typeof(name)* AudioPulse::_import_##name=NULL
diff --git a/user/telegram/ppc.patch b/user/telegram/ppc.patch
deleted file mode 100644
index 0a09150eb..000000000
--- a/user/telegram/ppc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From af5f8d19f0fdded987beee4568f02cc8dcbd20f4 Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Thu, 2 Jan 2020 12:58:45 +0100
-Subject: [PATCH] PowerPC support
-
----
- base/build_config.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Telegram/lib_base/base/build_config.h Telegram/lib_base/base/build_config.h
-index a02c9b0..b3f4860 100644
---- a/Telegram/lib_base/base/build_config.h
-+++ b/Telegram/lib_base/base/build_config.h
-@@ -46,9 +46,9 @@
- #define ARCH_CPU_X86_FAMILY 1
- #define ARCH_CPU_X86 1
- #define ARCH_CPU_32_BITS 1
--#elif defined(__aarch64__)
-+#elif defined(__aarch64__) || defined(__powerpc64__)
- #define ARCH_CPU_64_BITS 1
--#elif defined(_M_ARM) || defined(__arm__)
-+#elif defined(_M_ARM) || defined(__arm__) || defined(__powerpc__)
- #define ARCH_CPU_32_BITS 1
- #else
- #error Please add support for your architecture in base/build_config.h
--- 
-2.24.1
-