Update to 1.9.4

1 files changed, 65 insertions, 93 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 73622ec7211f..ef22129955dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,37 +6,45 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop9
-pkgver=1.8.15
+pkgver=1.9.3
 pkgrel=1
 pkgdesc='Official Telegram Desktop client (personal build)'
 arch=('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' 'range-v3' 'python' 'libappindicator-gtk3' 'dos2unix')
-optdepends=('libnotify: desktop notifications'
-            'ttf-opensans: default Open Sans font family')
+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'
+)
 provides=('telegram-desktop')
 conflicts=('telegram-desktop')
 source=(
-    "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver"
-    "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"
-    "xxHash::git+https://github.com/Cyan4973/xxHash.git"
-    "rlottie::git+https://github.com/john-preston/rlottie.git"
-    "tg.protocol"
-    "CMakeLists.inj"
-    "libtgvoip.patch"
-
-    "tdesktop.patch"
-    "no-gtk2.patch"
-    "Revert-Disable-DemiBold-fallback-for-Semibold.patch"
-    "tdesktop_lottie_animation_qtdebug.patch"
-    "Revert-Change-some-private-header-includes.patch"
-    "Use-system-wide-font.patch"
+    "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"
 
     "always_delete_for_everyone.patch"
     "always_clear_history_for_everyone.patch"
@@ -46,23 +54,13 @@ source=(
     "dont_pulse_mentions.patch"
     "no_circles.patch"
 )
-sha512sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
-            'b759e45282c7bd04e1fdcbfd0c009773782bebde36d96363db9869a9d78e7fad41314ad311b7afbfa57db4e66c0265da17e9f81f6d62a972466cb71d19d4b47c'
-            'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
-            '218f8711eefb5a8115222e099e6d08fc4079584b3aa3594d05a43390f37d5b51fbf1b64511c3a3e7792ef6c32fa6f4c8a65b6188a9efbd340304602552f3a595'
-            '117b0c2bae3d3d3aa94d41382621be4e05c3314a2831dba59e1bcfb443e7b8ff4bcd0403544fa0cb6def85b444146bf59eef9da25f96b041d3ce8f5429b4a867'
-            'd5cd7ecb5583258462c21a9ae3d4e8ae8c709d47d7ce2c45f8ae23100d24993398b8372021957b9a4607b3988f366e1c0cf64d724d901cb70212665c481217e9'
-            '79fcbee94f09df6b443c2b967afe4cba367985af13004b130da27f7bdf20974f76148a8056e98ce92000fabed80a1ff3cb2d332f6f8c70eed8aa909281533cd5'
-            '087dd821690dfedf1c275f264a0223b123e31ab9ee95050023930470bc9c866958cae00e2fd9132e6f7efbc4f1dfc3fdc20f8fba1fc9472d92bd702eaa60adb0'
-            '2c1bb75449b4634befa3edaac5d20e4b29ede21119549d9a3895dda9d4723f618dd950ee32133e04186fa65d07f80081ba3e3d5585209ba9112aa754d06fbb5c'
+sha512sums=('af8e5d2c74d0b990958edd75a01f40b70bc21c0f69074acfb943f44fdb1f1e84465b461765a1a584513e54ab30045817b42b6839ad16cb4c1043fda89ea600f7'
+            '69fc5b50d2663af0c0bb539a6ac4b3d8996282f1701f484b9d1e29ddbd6eec942c999ee2f77d7effed13d4ecdd62e03e6ff064be0948ff91124962cc17c57143'
+            '5675787e849a811679b24e86b64e651c1aded56853e52c9455d8d914b85c153b63287a0d41aaa4c39c0e805ee1f411132431340d7aba99b11fcd1036e8d37680'
+            '8c3f48536ff3878baa73949057960eb5c8fcf3f152141c42740a7c0f2fc96c1708511a5d4ffe45ae9e20a08f88a3c2c77163a0a2050d7fca4356e4d2a96dfaf1'
+            'd5fa5290b7041cb972c78066ca60d1cbc2bb3de10bf571ca1a639bf05abfa029531ffc0facba0564d39e32f89301960f4879b35bb9ac362ae9264d0a8c5c835c'
+            '41f22a8b63b1929288cca5638c2719ce9754aa4334deb9004370c44f780fb8ac57f2b4075d529c494f4eac49dde22885f0f9efc0911840f79cb5fcf8d737061d'
+            '17d831ce49ef522bae3558c679dda3eb1d84d69be40d9942f1ec2dc9fe32960b1233b072b09c107e5fc704c4a9286010f2cdd5e9830a2bdad97d3cb24b502ebe'
             '83af5f5d18bc26d2de5318b97f31956f34ceb0c14efa8cf36c310a543c8c7d3a448c4c448f2fac1e552b40816273bb5139666ff2fa20e2762148ee69ac20d4cb'
             'd32c2e0544b858842317b704e58016e028555a3baad6b22226e826c11dac8a412c808ffe8a7ea0f3f23c00c591e1a6e652c2ba63d8369491e188560f8296d0cb'
             '91a0edab6408a223db77b75df5a913ffd36efa79340e8d78fa01ac2c3b6e09d5a5fc7fa214ccd40473093809f86b7aef199cebf56a1d5821c20083c4a3e5780b'
@@ -72,25 +70,9 @@ sha512sums=('SKIP'
             '048c6784fb0bb9182d07916fdfab9f9952cdcb1998b0f780ce74bf03b61ae62774611819db7de5fec5019b9158b42c3912ca28797aeca41a881493e5822afcd8')
 
 prepare() {
-    cd "$srcdir/tdesktop"
-    git submodule init
-    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/xxHash.url "$srcdir/xxHash"
-    git config submodule.Telegram/ThirdParty/rlottie.url "$srcdir/rlottie"
-    git submodule update
-
-    dos2unix "$srcdir/tdesktop/.appveyor/install.bat"
+    cd "$srcdir/tdesktop-$pkgver-full"
 
-    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"
+    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"
@@ -99,57 +81,47 @@ prepare() {
     patch -Np1 -i "$srcdir/clicky_sticker_panel.patch"
     patch -Np1 -i "$srcdir/dont_pulse_mentions.patch"
     patch -Np1 -i "$srcdir/no_circles.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"
 }
 
 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,TDESKTOP_FORCE_GTK_FILE_DIALOG"
-    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".
-
-    gyp \
-        -Dapi_id=2040 \
-        -Dapi_hash=b18441a1ff607e10a989891a5462e627 \
-        -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
+    cd "$srcdir/tdesktop-$pkgver-full"
+    mkdir build
+    export CXXFLAGS="$CXXFLAGS -ffile-prefix-map=$srcdir/tdesktop-$pkgver-full="
+    cmake -B build -G Ninja . \
+        -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_DISABLE_CRASH_REPORTS=ON \
+        -DTDESKTOP_DISABLE_AUTOUPDATE=ON \
+        -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
+        -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \
+        -DDESKTOP_APP_SPECIAL_TARGET="" \
+        -DTDESKTOP_FORCE_GTK_FILE_DIALOG=ON
+    ninja -C build
 }
 
 package() {
+    cd "$srcdir/tdesktop-$pkgver-full/"
     install -dm755 "$pkgdir/usr/bin"
-    install -m755 "$srcdir/tdesktop/out/Release/Telegram" "$pkgdir/usr/bin/telegram-desktop"
+    install -m755 "build/bin/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 -m644 "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"
+    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"
 
     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"
 
         install -d "$icon_dir"
-        install -m644 "$srcdir/tdesktop/Telegram/Resources/art/icon${icon_size}.png" "$icon_dir/telegram.png"
+        install -m644 "Telegram/Resources/art/icon${icon_size}.png" "$icon_dir/telegram.png"
     done
 }