Date: Friday, September 23, 2022 @ 01:54:25 Author: farseerfc Revision: 1309129
upgpkg: telegram-desktop 4.2.0-1 Modified: telegram-desktop/trunk/PKGBUILD Deleted: telegram-desktop/trunk/fix-tgcalls-cstdint.patch ---------------------------+ PKGBUILD | 19 ++++++++++++++----- fix-tgcalls-cstdint.patch | 12 ------------ 2 files changed, 14 insertions(+), 17 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-23 01:53:51 UTC (rev 1309128) +++ PKGBUILD 2022-09-23 01:54:25 UTC (rev 1309129) @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase <[email protected]> # Contributor: hexchain <[email protected]> pkgname=telegram-desktop -pkgver=4.1.1 +pkgver=4.2.0 pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -14,17 +14,26 @@ 'extra-cmake-modules' 'wayland-protocols' 'plasma-wayland-protocols' 'libtg_owt') optdepends=('webkit2gtk: embedded browser features' 'xdg-desktop-portal: desktop integration') +_kcoreaddons_version="5.98.0" source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"; - fix-tgcalls-cstdint.patch + "https://invent.kde.org/frameworks/kcoreaddons/-/archive/v$_kcoreaddons_version/kcoreaddons-v$_kcoreaddons_version.tar.gz"; + "bundle-kcoreaddons.patch::https://github.com/desktop-app/cmake_helpers/compare/b9f1b60...ilya-fedin:cmake_helpers:6bcdd3fa3618038b1824a2f772543d9db48e8b27.patch"; ) -sha512sums=('3240b9f81c3901997b1ea13fd7db7b8598b31c0faa68a2f711909ed11f33345db5a45ac99c0be77f1caeb1f571093ea42b1dbc7e7bb15e989c8756805c2ec887' - 'ba24a2f1524010b4891764aacee2e27a5ebae44cf7626ab2aaf9e6c48b0f8088bf920886ceeb497b3c463fa0c3b885dd63db273d4c29cab6c96c8193c0c5c888') +sha512sums=('47d1e618a03f3b870b5aff81bc71793bcdd3fec91bb1263a65e0a935867ade4bc3de29f9f01ddce3837e7239e17a88caba6afc2b49b3181dd8cd6eeca597d6f2' + 'd84f0d0c29f819488fd7632df28b8a9da5fb3a0724652529d3f8a59b62ea12f5f0a1755b346d2d8b015ec492dd0fead8b74199f9a7e7ada26d45b8fd7ada21c8' + '1edd0fc0a19de5cab558dd5721aa111ff9cb8f9bc24bad338173c696fc0c010a62eba1584d6deaad8940217b1725d15741cd55f546433bd62cccd0850036bce3') prepare() { + mv "$srcdir/kcoreaddons-v$_kcoreaddons_version" "tdesktop-$pkgver-full/Telegram/ThirdParty/kcoreaddons" cd tdesktop-$pkgver-full rm -rf Telegram/ThirdParty/libtgvoip/webrtc_dsp/absl - patch -Np1 -i "$srcdir"/fix-tgcalls-cstdint.patch -d Telegram/ThirdParty/tgcalls + + # Using ilya-fedin/cmake_helpers bundled-kcoreaddons branch for now: https://github.com/telegramdesktop/tdesktop/issues/25073 + patch -Np1 -i "$srcdir"/bundle-kcoreaddons.patch -d cmake + + # Upstream suggested sed headers: https://github.com/telegramdesktop/tdesktop/issues/25073#issuecomment-1253908867 + find . -type f \( -iname '*.h' -or -iname '*.cpp' \) -print0 | xargs -0 sed -i 's/<KUrlMimeData>/<kurlmimedata.h>/g;s/<KShell>/<kshell.h>/g;s/<KSandbox>/<ksandbox.h>/g' } build() { Deleted: fix-tgcalls-cstdint.patch =================================================================== --- fix-tgcalls-cstdint.patch 2022-09-23 01:53:51 UTC (rev 1309128) +++ fix-tgcalls-cstdint.patch 2022-09-23 01:54:25 UTC (rev 1309129) @@ -1,12 +0,0 @@ -diff --git a/tgcalls/utils/gzip.h b/tgcalls/utils/gzip.h -index a3f3ea2..7ae5cc5 100644 ---- a/tgcalls/utils/gzip.h -+++ b/tgcalls/utils/gzip.h -@@ -3,6 +3,7 @@ - - #include <absl/types/optional.h> - #include <vector> -+#include <cstdint> - - namespace tgcalls { -
