Update for v1.9.10

4 files changed, 162 insertions, 114 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4276a667ba6b..9a912e99966a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-git
 	pkgdesc = Official Telegram Desktop client (dev branch)
-	pkgver = 1.8.15.r1.g17baac710
+	pkgver = 1.9.10.r4.g1f16d7266
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = i686
@@ -8,39 +8,47 @@ pkgbase = telegram-desktop-git
 	license = GPL3
 	makedepends = cmake
 	makedepends = git
-	makedepends = gyp
-	makedepends = libappindicator-gtk3
+	makedepends = ninja
 	makedepends = python
 	makedepends = range-v3
-	makedepends = dos2unix
+	depends = enchant
 	depends = ffmpeg
 	depends = hicolor-icon-theme
+	depends = lz4
 	depends = minizip
 	depends = openal
-	depends = qt5-base
 	depends = qt5-imageformats
-	depends = openssl
-	optdepends = libnotify: desktop notifications
+	depends = xxhash
+	depends = libappindicator-gtk3
 	optdepends = ttf-opensans: default Open Sans font family
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#branch=dev
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=dev
 	source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip
 	source = variant::git+https://github.com/mapbox/variant
-	source = Catch2::git+https://github.com/catchorg/Catch2.git
 	source = GSL::git+https://github.com/Microsoft/GSL.git
-	source = crl::git+https://github.com/telegramdesktop/crl.git
+	source = Catch::git+https://github.com/philsquared/Catch
 	source = xxHash::git+https://github.com/Cyan4973/xxHash.git
-	source = rlottie::git+https://github.com/john-preston/rlottie.git
-	source = tg.protocol::https://git.archlinux.org/svntogit/community.git/plain/trunk/tg.protocol?h=packages/telegram-desktop
-	source = CMakeLists.inj::https://git.archlinux.org/svntogit/community.git/plain/trunk/CMakeLists.inj?h=packages/telegram-desktop
-	source = libtgvoip.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/libtgvoip.patch?h=packages/telegram-desktop
-	source = tdesktop.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/tdesktop.patch?h=packages/telegram-desktop
-	source = no-gtk2.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/no-gtk2.patch?h=packages/telegram-desktop
-	source = Revert-Disable-DemiBold-fallback-for-Semibold.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/Revert-Disable-DemiBold-fallback-for-Semibold.patch?h=packages/telegram-desktop
-	source = tdesktop_lottie_animation_qtdebug.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/tdesktop_lottie_animation_qtdebug.patch?h=packages/telegram-desktop
-	source = Revert-Change-some-private-header-includes.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/Revert-Change-some-private-header-includes.patch?h=packages/telegram-desktop
-	source = Use-system-wide-font.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/Use-system-wide-font.patch?h=packages/telegram-desktop
+	source = rlottie::git+https://github.com/desktop-app/rlottie.git
+	source = lz4::git+https://github.com/lz4/lz4.git
+	source = lib_crl::git+https://github.com/desktop-app/lib_crl.git
+	source = lib_rpl::git+https://github.com/desktop-app/lib_rpl.git
+	source = lib_base::git+https://github.com/desktop-app/lib_base.git
+	source = codegen::git+https://github.com/desktop-app/codegen.git
+	source = lib_ui::git+https://github.com/desktop-app/lib_ui.git
+	source = lib_rlottie::git+https://github.com/desktop-app/lib_rlottie.git
+	source = lib_lottie::git+https://github.com/desktop-app/lib_lottie.git
+	source = lib_tl::git+https://github.com/desktop-app/lib_tl.git
+	source = lib_spellcheck::git+https://github.com/desktop-app/lib_spellcheck
+	source = lib_storage::git+https://github.com/desktop-app/lib_storage.git
+	source = cmake_helpers::git+https://github.com/desktop-app/cmake_helpers.git
+	source = expected::git+https://github.com/TartanLlama/expected
+	source = tl-cmake::git+https://github.com/TartanLlama/tl-cmake.git
+	source = QR-Code-generator::git+https://github.com/nayuki/QR-Code-generator
+	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
@@ -49,15 +57,24 @@ pkgbase = telegram-desktop-git
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d
-	sha512sums = b759e45282c7bd04e1fdcbfd0c009773782bebde36d96363db9869a9d78e7fad41314ad311b7afbfa57db4e66c0265da17e9f81f6d62a972466cb71d19d4b47c
-	sha512sums = d60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39
-	sha512sums = 218f8711eefb5a8115222e099e6d08fc4079584b3aa3594d05a43390f37d5b51fbf1b64511c3a3e7792ef6c32fa6f4c8a65b6188a9efbd340304602552f3a595
-	sha512sums = 117b0c2bae3d3d3aa94d41382621be4e05c3314a2831dba59e1bcfb443e7b8ff4bcd0403544fa0cb6def85b444146bf59eef9da25f96b041d3ce8f5429b4a867
-	sha512sums = d5cd7ecb5583258462c21a9ae3d4e8ae8c709d47d7ce2c45f8ae23100d24993398b8372021957b9a4607b3988f366e1c0cf64d724d901cb70212665c481217e9
-	sha512sums = 79fcbee94f09df6b443c2b967afe4cba367985af13004b130da27f7bdf20974f76148a8056e98ce92000fabed80a1ff3cb2d332f6f8c70eed8aa909281533cd5
-	sha512sums = 087dd821690dfedf1c275f264a0223b123e31ab9ee95050023930470bc9c866958cae00e2fd9132e6f7efbc4f1dfc3fdc20f8fba1fc9472d92bd702eaa60adb0
-	sha512sums = 2c1bb75449b4634befa3edaac5d20e4b29ede21119549d9a3895dda9d4723f618dd950ee32133e04186fa65d07f80081ba3e3d5585209ba9112aa754d06fbb5c
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = 3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b
+	sha512sums = ca2e7d26867a720f6fcc8b100fa6767f0b95ae9e7b3802c8cfd4fab2a4ed1e3166048d51d3b1c4e607c62524ea77c54196d1649f57d558b8bfb7133e2682c5fc
 
 pkgname = telegram-desktop-git
 
diff --git a/.gitignore b/.gitignore
index 05c6d4d4c97b..0ec4cc7df699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
+!packaged-gsl-option.patch
diff --git a/PKGBUILD b/PKGBUILD
index 10c37292d27e..173b191bf903 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,35 +6,44 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-git
-pkgver=1.8.15.r1.g17baac710
+pkgver=1.9.10.r4.g1f16d7266
 pkgrel=1
 pkgdesc="Official Telegram Desktop client (dev branch)"
 arch=('i686' 'x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
-depends=('ffmpeg' 'hicolor-icon-theme' 'minizip' 'openal' 'qt5-base' 'qt5-imageformats' 'openssl')
-makedepends=('cmake' 'git' 'gyp' 'libappindicator-gtk3' 'python' 'range-v3' 'dos2unix')
-optdepends=('libnotify: desktop notifications'
-            'ttf-opensans: default Open Sans font family')
+depends=('enchant' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
+         'qt5-imageformats' 'xxhash' 'libappindicator-gtk3')
+makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3')
+optdepends=('ttf-opensans: default Open Sans font family')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=("tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=dev"
         "libtgvoip::git+https://github.com/telegramdesktop/libtgvoip"
         "variant::git+https://github.com/mapbox/variant"
-        "Catch2::git+https://github.com/catchorg/Catch2.git"
         "GSL::git+https://github.com/Microsoft/GSL.git"
-        "crl::git+https://github.com/telegramdesktop/crl.git"
+        "Catch::git+https://github.com/philsquared/Catch"
         "xxHash::git+https://github.com/Cyan4973/xxHash.git"
-        "rlottie::git+https://github.com/john-preston/rlottie.git"
-        "tg.protocol::https://git.archlinux.org/svntogit/community.git/plain/trunk/tg.protocol?h=packages/telegram-desktop"
-        "CMakeLists.inj::https://git.archlinux.org/svntogit/community.git/plain/trunk/CMakeLists.inj?h=packages/telegram-desktop"
-        "libtgvoip.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/libtgvoip.patch?h=packages/telegram-desktop"
-        "tdesktop.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/tdesktop.patch?h=packages/telegram-desktop"
-        "no-gtk2.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/no-gtk2.patch?h=packages/telegram-desktop"
-        "Revert-Disable-DemiBold-fallback-for-Semibold.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/Revert-Disable-DemiBold-fallback-for-Semibold.patch?h=packages/telegram-desktop"
-        "tdesktop_lottie_animation_qtdebug.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/tdesktop_lottie_animation_qtdebug.patch?h=packages/telegram-desktop"
-        "Revert-Change-some-private-header-includes.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/Revert-Change-some-private-header-includes.patch?h=packages/telegram-desktop"
-        "Use-system-wide-font.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/Use-system-wide-font.patch?h=packages/telegram-desktop")
+        "rlottie::git+https://github.com/desktop-app/rlottie.git"
+        "lz4::git+https://github.com/lz4/lz4.git"
+        "lib_crl::git+https://github.com/desktop-app/lib_crl.git"
+        "lib_rpl::git+https://github.com/desktop-app/lib_rpl.git"
+        "lib_base::git+https://github.com/desktop-app/lib_base.git"
+        "codegen::git+https://github.com/desktop-app/codegen.git"
+        "lib_ui::git+https://github.com/desktop-app/lib_ui.git"
+        "lib_rlottie::git+https://github.com/desktop-app/lib_rlottie.git"
+        "lib_lottie::git+https://github.com/desktop-app/lib_lottie.git"
+        "lib_tl::git+https://github.com/desktop-app/lib_tl.git"
+        "lib_spellcheck::git+https://github.com/desktop-app/lib_spellcheck"
+        "lib_storage::git+https://github.com/desktop-app/lib_storage.git"
+        "cmake_helpers::git+https://github.com/desktop-app/cmake_helpers.git"
+        "expected::git+https://github.com/TartanLlama/expected"
+        "tl-cmake::git+https://github.com/TartanLlama/tl-cmake.git"
+        "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")
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -43,15 +52,24 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
-            'b759e45282c7bd04e1fdcbfd0c009773782bebde36d96363db9869a9d78e7fad41314ad311b7afbfa57db4e66c0265da17e9f81f6d62a972466cb71d19d4b47c'
-            'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
-            '218f8711eefb5a8115222e099e6d08fc4079584b3aa3594d05a43390f37d5b51fbf1b64511c3a3e7792ef6c32fa6f4c8a65b6188a9efbd340304602552f3a595'
-            '117b0c2bae3d3d3aa94d41382621be4e05c3314a2831dba59e1bcfb443e7b8ff4bcd0403544fa0cb6def85b444146bf59eef9da25f96b041d3ce8f5429b4a867'
-            'd5cd7ecb5583258462c21a9ae3d4e8ae8c709d47d7ce2c45f8ae23100d24993398b8372021957b9a4607b3988f366e1c0cf64d724d901cb70212665c481217e9'
-            '79fcbee94f09df6b443c2b967afe4cba367985af13004b130da27f7bdf20974f76148a8056e98ce92000fabed80a1ff3cb2d332f6f8c70eed8aa909281533cd5'
-            '087dd821690dfedf1c275f264a0223b123e31ab9ee95050023930470bc9c866958cae00e2fd9132e6f7efbc4f1dfc3fdc20f8fba1fc9472d92bd702eaa60adb0'
-            '2c1bb75449b4634befa3edaac5d20e4b29ede21119549d9a3895dda9d4723f618dd950ee32133e04186fa65d07f80081ba3e3d5585209ba9112aa754d06fbb5c')
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b'
+            'ca2e7d26867a720f6fcc8b100fa6767f0b95ae9e7b3802c8cfd4fab2a4ed1e3166048d51d3b1c4e607c62524ea77c54196d1649f57d558b8bfb7133e2682c5fc')
 pkgver() {
     cd "$srcdir/tdesktop"
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
@@ -63,75 +81,62 @@ prepare() {
     git config submodule.Telegram/ThirdParty/libtgvoip.url "$srcdir/libtgvoip"
     git config submodule.Telegram/ThirdParty/variant.url "$srcdir/variant"
     git config submodule.Telegram/ThirdParty/GSL.url "$srcdir/GSL"
-    git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch2"
-    git config submodule.Telegram/ThirdParty/crl.url "$srcdir/crl"
+    git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch"
     git config submodule.Telegram/ThirdParty/xxHash.url "$srcdir/xxHash"
     git config submodule.Telegram/ThirdParty/rlottie.url "$srcdir/rlottie"
+    git config submodule.Telegram/ThirdParty/lz4.url "$srcdir/lz4"
+    git config submodule.Telegram/lib_crl.url "$srcdir/lib_crl"
+    git config submodule.Telegram/lib_rpl.url "$srcdir/lib_rpl"
+    git config submodule.Telegram/lib_base.url "$srcdir/lib_base"
+    git config submodule.Telegram/codegen.url "$srcdir/codegen"
+    git config submodule.Telegram/lib_ui.url "$srcdir/lib_ui"
+    git config submodule.Telegram/lib_rlottie.url "$srcdir/lib_rlottie"
+    git config submodule.Telegram/lib_lottie.url "$srcdir/lib_lottie"
+    git config submodule.Telegram/lib_tl.url "$srcdir/lib_tl"
+    git config submodule.Telegram/lib_spellcheck.url "$srcdir/lib_spellcheck"
+    git config submodule.Telegram/lib_storage.url "$srcdir/lib_storage"
+    git config submodule.cmake.url "$srcdir/cmake_helpers"
+    git config submodule.Telegram/ThirdParty/expected.url "$srcdir/expected"
+    git config submodule.Telegram/ThirdParty/QR.url "$srcdir/QR-Code-generator"
+    git config submodule.Telegram/lib_qr.url "$srcdir/lib_qr"
+    git config submodule.Telegram/ThirdParty/libdbusmenu-qt.url "$srcdir/libdbusmenu-qt"
     git submodule update
     
-    rm -rf Telegram/SourceFiles/qt_functions.cpp
-
-    dos2unix "$srcdir/tdesktop/.appveyor/install.bat"
-
-    patch -Np1 -i "$srcdir/tdesktop.patch"
-    patch -Np1 -i "$srcdir/no-gtk2.patch"
-    patch -Np1 -i "$srcdir/Revert-Disable-DemiBold-fallback-for-Semibold.patch"
-    patch -Np1 -i "$srcdir/tdesktop_lottie_animation_qtdebug.patch"
-    patch -Np1 -i "$srcdir/Revert-Change-some-private-header-includes.patch"
-    patch -Np1 -i "$srcdir/Use-system-wide-font.patch"
-
-    unix2dos "$srcdir/tdesktop/.appveyor/install.bat"
-
-    # disable static-qt for rlottie
-    sed "/RLOTTIE_WITH_STATIC_QT/d" -i "$srcdir/tdesktop/Telegram/gyp/lib_rlottie.gyp"
-
-    cd "$srcdir/tdesktop"
-    cd "Telegram/ThirdParty/libtgvoip"
-    patch -Np1 -i "$srcdir/libtgvoip.patch"
+    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() {
     cd "$srcdir/tdesktop"
-    export LANG=en_US.UTF-8
-    export GYP_DEFINES="TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME,TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION"
-    export EXTRA_FLAGS="-Winvalid-pch"
-    export CPPFLAGS="$CPPFLAGS $EXTRA_FLAGS"
-    export CXXFLAGS="$CXXFLAGS $EXTRA_FLAGS"
-
-    # Telegram requires us to set API_ID and API_HASH for some reason but they do not provide a way to receive a pair
-    # See https://github.com/telegramdesktop/tdesktop/commit/65b2db216033aa08b7bc846df27843e566f08981 and
-    # https://github.com/telegramdesktop/tdesktop/issues/4717
-    # The official API_ID seems to be 2040 while the API_HASH is "b18441a1ff607e10a989891a5462e627".
-    # We're going to use the defaults for now but might at some point use the official ones from the official binaries as noted above.
-
-    gyp \
-        -Dapi_id=17349 \
-        -Dapi_hash=344583e45741c457fe1862106095a5eb \
-        -Dbuild_defines=${GYP_DEFINES} \
-        -Gconfig=Release \
-        --depth=Telegram/gyp --generator-output=../.. -Goutput_dir=out Telegram/gyp/Telegram.gyp --format=cmake
-    NUM=$((`wc -l < out/Release/CMakeLists.txt` - 2))
-    sed -i "$NUM r ../CMakeLists.inj" out/Release/CMakeLists.txt
-    cd "$srcdir/tdesktop/out/Release"
-    cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -UTDESKTOP_OFFICIAL_TARGET 
-    make
+    export CXXFLAGS="$CXXFLAGS -ffile-prefix-map=$srcdir/tdesktop="
+    cmake -B build -G Ninja . \
+        -Ddisable_autoupdate=1 \
+        -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DTDESKTOP_API_TEST=ON \
+        -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
+        -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 \
+        -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
+        -DDESKTOP_APP_SPECIAL_TARGET="" \
+        -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop"
+    ninja -C build
 }
 
 package() {
-    install -dm755 "$pkgdir/usr/bin"
-    install -m755 "$srcdir/tdesktop/out/Release/Telegram" "$pkgdir/usr/bin/telegram-desktop"
-
-    install -d "$pkgdir/usr/share/applications"
-    install -m644 "$srcdir/tdesktop/lib/xdg/telegramdesktop.desktop" "$pkgdir/usr/share/applications/telegramdesktop.desktop"
-
-    install -d "$pkgdir/usr/share/kservices5"
-    install -m644 "$srcdir/tg.protocol" "$pkgdir/usr/share/kservices5/tg.protocol"
-
-    local icon_size icon_dir
-    for icon_size in 16 32 48 64 128 256 512; do
-        icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
+    cd "$srcdir/tdesktop"
+    ninja -C build install
 
-        install -d "$icon_dir"
-        install -m644 "$srcdir/tdesktop/Telegram/Resources/art/icon${icon_size}.png" "$icon_dir/telegram.png"
-    done
+    mv "$pkgdir/usr/bin/telegram-desktop"{,-bin}
+    install -dm755 "$pkgdir/usr/bin"
+    install -m755 "$srcdir/telegram-desktop.sh" "$pkgdir/usr/bin/telegram-desktop"
 }
diff --git a/packaged-gsl-option.patch b/packaged-gsl-option.patch
new file mode 100644
index 000000000000..7ffb5c5f4f88
--- /dev/null
+++ b/packaged-gsl-option.patch
@@ -0,0 +1,25 @@
+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)