Update to 1.9.8

1 files changed, 38 insertions, 63 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ef22129955dc..bb16ae38a3fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,61 +6,32 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop9
-pkgver=1.9.3
+pkgver=1.9.8
 pkgrel=1
 pkgdesc='Official Telegram Desktop client (personal build)'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
-depends=(
-    'enchant'
-    'ffmpeg'
-    'hicolor-icon-theme'
-    'lz4'
-    'minizip'
-    'openal'
-    'qt5-imageformats'
-    'xxhash'
-)
-makedepends=(
-    'cmake'
-    'git'
-    'libappindicator-gtk3'
-    'ninja'
-    'python'
-    'quilt'
-    'range-v3'
-)
-optdepends=(
-    'ttf-opensans: default Open Sans font family'
-    'libappindicator-gtk3: AppIndicator-based tray icon'
-)
+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' 'range-v3')
+optdepends=('ttf-opensans: default Open Sans font family')
 provides=('telegram-desktop')
 conflicts=('telegram-desktop')
-source=(
-    "https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
-    "0001-Dynamic-linking-system-libs.patch"
-    "0002-Dynamic-linking-system-qt.patch"
-    "0004-gtk3.patch"
-    "0005-Use-system-wide-fonts.patch"
-    "0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch"
-    "series"
+source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
+        telegram-desktop.sh
 
-    "always_delete_for_everyone.patch"
-    "always_clear_history_for_everyone.patch"
-    "always_pin_without_notify.patch"
-    "always_send_as_photo_or_album.patch"
-    "clicky_sticker_panel.patch"
-    "dont_pulse_mentions.patch"
-    "no_circles.patch"
-)
-sha512sums=('af8e5d2c74d0b990958edd75a01f40b70bc21c0f69074acfb943f44fdb1f1e84465b461765a1a584513e54ab30045817b42b6839ad16cb4c1043fda89ea600f7'
-            '69fc5b50d2663af0c0bb539a6ac4b3d8996282f1701f484b9d1e29ddbd6eec942c999ee2f77d7effed13d4ecdd62e03e6ff064be0948ff91124962cc17c57143'
-            '5675787e849a811679b24e86b64e651c1aded56853e52c9455d8d914b85c153b63287a0d41aaa4c39c0e805ee1f411132431340d7aba99b11fcd1036e8d37680'
-            '8c3f48536ff3878baa73949057960eb5c8fcf3f152141c42740a7c0f2fc96c1708511a5d4ffe45ae9e20a08f88a3c2c77163a0a2050d7fca4356e4d2a96dfaf1'
-            'd5fa5290b7041cb972c78066ca60d1cbc2bb3de10bf571ca1a639bf05abfa029531ffc0facba0564d39e32f89301960f4879b35bb9ac362ae9264d0a8c5c835c'
-            '41f22a8b63b1929288cca5638c2719ce9754aa4334deb9004370c44f780fb8ac57f2b4075d529c494f4eac49dde22885f0f9efc0911840f79cb5fcf8d737061d'
-            '17d831ce49ef522bae3558c679dda3eb1d84d69be40d9942f1ec2dc9fe32960b1233b072b09c107e5fc704c4a9286010f2cdd5e9830a2bdad97d3cb24b502ebe'
+        "always_delete_for_everyone.patch"
+        "always_clear_history_for_everyone.patch"
+        "always_pin_without_notify.patch"
+        "always_send_as_photo_or_album.patch"
+        "clicky_sticker_panel.patch"
+        "dont_pulse_mentions.patch"
+        "no_circles.patch")
+sha512sums=('5562eb99812a8faec74fe073323d6e04e36311c1e4ce984035212ecfed8bd5d12df92cd0f0022401201136315fb5556971b267b4bf47edf4eeddc9926c7969dc'
+            '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b'
             '83af5f5d18bc26d2de5318b97f31956f34ceb0c14efa8cf36c310a543c8c7d3a448c4c448f2fac1e552b40816273bb5139666ff2fa20e2762148ee69ac20d4cb'
             'd32c2e0544b858842317b704e58016e028555a3baad6b22226e826c11dac8a412c808ffe8a7ea0f3f23c00c591e1a6e652c2ba63d8369491e188560f8296d0cb'
             '91a0edab6408a223db77b75df5a913ffd36efa79340e8d78fa01ac2c3b6e09d5a5fc7fa214ccd40473093809f86b7aef199cebf56a1d5821c20083c4a3e5780b'
@@ -72,15 +43,14 @@ sha512sums=('af8e5d2c74d0b990958edd75a01f40b70bc21c0f69074acfb943f44fdb1f1e84465
 prepare() {
     cd "$srcdir/tdesktop-$pkgver-full"
 
-    QUILT_PATCHES=.. quilt --quiltrc=/dev/null push -a
-
-    patch -Np1 -i "$srcdir/always_delete_for_everyone.patch"
-    patch -Np1 -i "$srcdir/always_clear_history_for_everyone.patch"
-    patch -Np1 -i "$srcdir/always_pin_without_notify.patch"
-    patch -Np1 -i "$srcdir/always_send_as_photo_or_album.patch"
-    patch -Np1 -i "$srcdir/clicky_sticker_panel.patch"
-    patch -Np1 -i "$srcdir/dont_pulse_mentions.patch"
-    patch -Np1 -i "$srcdir/no_circles.patch"
+    local src
+    for src in "${source[@]}"; do
+        src="${src%%::*}"
+        src="${src##*/}"
+        [[ $src = *.patch ]] || continue
+        msg2 "Applying patch $src..."
+        patch -Np1 < "../$src"
+    done
 }
 
 build() {
@@ -88,34 +58,39 @@ build() {
     mkdir build
     export CXXFLAGS="$CXXFLAGS -ffile-prefix-map=$srcdir/tdesktop-$pkgver-full="
     cmake -B build -G Ninja . \
+        -Ddisable_autoupdate=1 \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
         -DTDESKTOP_API_ID=2040 \
         -DTDESKTOP_API_HASH=b18441a1ff607e10a989891a5462e627 \
         -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
-        -DDESKTOP_APP_USE_SYSTEM_LIBS=ON \
+        -DDESKTOP_APP_USE_PACKAGED=ON \
+        -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
         -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
-        -DTDESKTOP_DISABLE_AUTOUPDATE=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" \
         -DTDESKTOP_FORCE_GTK_FILE_DIALOG=ON
     ninja -C build
 }
 
 package() {
-    cd "$srcdir/tdesktop-$pkgver-full/"
     install -dm755 "$pkgdir/usr/bin"
-    install -m755 "build/bin/Telegram" "$pkgdir/usr/bin/telegram-desktop"
+    install -m755 telegram-desktop.sh "$pkgdir/usr/bin/telegram-desktop"
+
+    cd tdesktop-$pkgver-full
+    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"
+    install -m644 lib/xdg/telegramdesktop.desktop "$pkgdir/usr/share/applications/telegramdesktop.desktop"
 
     install -d "$pkgdir/usr/share/kservices5"
-    install -m644 "lib/xdg/tg.protocol" "$pkgdir/usr/share/kservices5/tg.protocol"
+    install -m644 lib/xdg/tg.protocol "$pkgdir/usr/share/kservices5/tg.protocol"
 
     install -d "$pkgdir/usr/share/metainfo/"
-    install -m644 "lib/xdg/telegramdesktop.appdata.xml" "$pkgdir/usr/share/metainfo/telegramdesktop.appdata.xml"
+    install -m644 lib/xdg/telegramdesktop.appdata.xml "$pkgdir/usr/share/metainfo/telegramdesktop.appdata.xml"
 
     local icon_size icon_dir
     for icon_size in 16 32 48 64 128 256 512; do