Update version

4 files changed, 7 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a912e99966a..4b94d22f536c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-git
 	pkgdesc = Official Telegram Desktop client (dev branch)
-	pkgver = 1.9.10.r4.g1f16d7266
+	pkgver = 1.9.21.r5.g13e8b60d6
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = i686
@@ -20,6 +20,8 @@ pkgbase = telegram-desktop-git
 	depends = qt5-imageformats
 	depends = xxhash
 	depends = libappindicator-gtk3
+	depends = microsoft-gsl
+	depends = tl-expected
 	optdepends = ttf-opensans: default Open Sans font family
 	provides = telegram-desktop
 	conflicts = telegram-desktop
@@ -48,7 +50,6 @@ pkgbase = telegram-desktop-git
 	source = lib_qr::git+https://github.com/desktop-app/lib_qr.git
 	source = libdbusmenu-qt::git+https://github.com/desktop-app/libdbusmenu-qt.git
 	source = telegram-desktop.sh::https://git.archlinux.org/svntogit/community.git/plain/trunk/telegram-desktop.sh?h=packages/telegram-desktop
-	source = packaged-gsl-option.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -74,7 +75,6 @@ pkgbase = telegram-desktop-git
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = 3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b
-	sha512sums = ca2e7d26867a720f6fcc8b100fa6767f0b95ae9e7b3802c8cfd4fab2a4ed1e3166048d51d3b1c4e607c62524ea77c54196d1649f57d558b8bfb7133e2682c5fc
 
 pkgname = telegram-desktop-git
 
diff --git a/.gitignore b/.gitignore
index 0ec4cc7df699..05c6d4d4c97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!packaged-gsl-option.patch
diff --git a/PKGBUILD b/PKGBUILD
index 173b191bf903..9fe09fd74f58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,14 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-git
-pkgver=1.9.10.r4.g1f16d7266
+pkgver=1.9.21.r5.g13e8b60d6
 pkgrel=1
 pkgdesc="Official Telegram Desktop client (dev branch)"
 arch=('i686' 'x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
 depends=('enchant' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
-         'qt5-imageformats' 'xxhash' 'libappindicator-gtk3')
+         'qt5-imageformats' 'xxhash' 'libappindicator-gtk3' 'microsoft-gsl' 'tl-expected')
 makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3')
 optdepends=('ttf-opensans: default Open Sans font family')
 provides=("${pkgname%-git}")
@@ -42,8 +42,7 @@ source=("tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=dev"
         "QR-Code-generator::git+https://github.com/nayuki/QR-Code-generator"
         "lib_qr::git+https://github.com/desktop-app/lib_qr.git"
         "libdbusmenu-qt::git+https://github.com/desktop-app/libdbusmenu-qt.git"
-        "telegram-desktop.sh::https://git.archlinux.org/svntogit/community.git/plain/trunk/telegram-desktop.sh?h=packages/telegram-desktop"
-        "packaged-gsl-option.patch")
+        "telegram-desktop.sh::https://git.archlinux.org/svntogit/community.git/plain/trunk/telegram-desktop.sh?h=packages/telegram-desktop")
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -68,8 +67,7 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b'
-            'ca2e7d26867a720f6fcc8b100fa6767f0b95ae9e7b3802c8cfd4fab2a4ed1e3166048d51d3b1c4e607c62524ea77c54196d1649f57d558b8bfb7133e2682c5fc')
+            '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b')
 pkgver() {
     cd "$srcdir/tdesktop"
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
@@ -101,12 +99,6 @@ prepare() {
     git config submodule.Telegram/lib_qr.url "$srcdir/lib_qr"
     git config submodule.Telegram/ThirdParty/libdbusmenu-qt.url "$srcdir/libdbusmenu-qt"
     git submodule update
-    
-    cd "$srcdir/tdesktop/cmake"
-    if patch -Np1 --dry-run --silent -i "$srcdir/packaged-gsl-option.patch"
-    then
-        patch -Np1 -i "$srcdir/packaged-gsl-option.patch"
-    fi
 }
 
 build() {
@@ -121,8 +113,6 @@ build() {
         -DDESKTOP_APP_USE_PACKAGED=ON \
         -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
         -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \
-        -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF \
-        -DDESKTOP_APP_USE_PACKAGED_GSL=OFF \
         -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
         -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
         -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \
diff --git a/packaged-gsl-option.patch b/packaged-gsl-option.patch
deleted file mode 100644
index 7ffb5c5f4f88..000000000000
--- a/packaged-gsl-option.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/external/gsl/CMakeLists.txt b/external/gsl/CMakeLists.txt
-index aa8b09a..b190a3d 100644
---- a/external/gsl/CMakeLists.txt
-+++ b/external/gsl/CMakeLists.txt
-@@ -7,7 +7,7 @@
- add_library(external_gsl INTERFACE IMPORTED GLOBAL)
- add_library(desktop-app::external_gsl ALIAS external_gsl)
- 
--if (DESKTOP_APP_USE_PACKAGED)
-+if (DESKTOP_APP_USE_PACKAGED_GSL)
-     find_path(GSL_INCLUDE_DIRS gsl/gsl)
- 
-     if (NOT GSL_INCLUDE_DIRS)
-diff --git a/variables.cmake b/variables.cmake
-index c288f51..8723d52 100644
---- a/variables.cmake
-+++ b/variables.cmake
-@@ -25,6 +25,7 @@ option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${DE
- option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
- option(DESKTOP_APP_USE_PACKAGED_EXPECTED "Find expected using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
- option(DESKTOP_APP_USE_PACKAGED_VARIANT "Find mapbox-variant using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
-+option(DESKTOP_APP_USE_PACKAGED_GSL "Find GSL using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
- option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
- 
- option(DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS "Enable IPO build optimizations." OFF)