diff --git a/network/chat/telegram-desktop/actions.py b/network/chat/telegram-desktop/actions.py index 4134c1a9b5..c60488c1d3 100644 --- a/network/chat/telegram-desktop/actions.py +++ b/network/chat/telegram-desktop/actions.py @@ -13,6 +13,9 @@ from pisi.actionsapi import get def setup(): + shelltools.copy("../expected-lite-*/*", "cmake/external/glib/cppgir/expected-lite") + shelltools.copy("../cppgir-*/*", "cmake/external/glib/cppgir") + shelltools.export("NINJAJOBS", "-j 4") shelltools.system("patch -p1 < fix-tgcalls-cstdint.patch -d Telegram/ThirdParty/tgcalls") shelltools.system("sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \ diff --git a/network/chat/telegram-desktop/files/tdesktop.patch b/network/chat/telegram-desktop/files/tdesktop.patch index 6104fe8788..ac83000a39 100644 --- a/network/chat/telegram-desktop/files/tdesktop.patch +++ b/network/chat/telegram-desktop/files/tdesktop.patch @@ -1,22 +1,22 @@ -diff -Nuar a/Telegram/lib_lottie/lottie/lottie_emoji.h b/Telegram/lib_lottie/lottie/lottie_emoji.h ---- a/Telegram/lib_lottie/lottie/lottie_emoji.h 2022-07-25 12:46:55.000000000 +0300 -+++ b/Telegram/lib_lottie/lottie/lottie_emoji.h 2022-08-06 15:19:52.852451704 +0300 -@@ -9,6 +9,7 @@ - #include "ui/effects/frame_generator.h" +From 6b0eeb2c15aa278ffa577bcefebcff8f2c98aca9 Mon Sep 17 00:00:00 2001 +From: Ilya Fedin +Date: Thu, 1 Jun 2023 23:18:26 +0400 +Subject: [PATCH] Ensure cppgir is not getting installed - #include -+#include +--- + external/glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) - namespace rlottie { - class Animation; -diff -Nuar a/Telegram/SourceFiles/ffmpeg/ffmpeg_emoji.h b/Telegram/SourceFiles/ffmpeg/ffmpeg_emoji.h ---- a/Telegram/SourceFiles/ffmpeg/ffmpeg_emoji.h 2022-08-05 10:12:48.000000000 +0300 -+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_emoji.h 2022-08-06 15:19:14.286454487 +0300 -@@ -10,6 +10,7 @@ - #include "ui/effects/frame_generator.h" - - #include -+#include - - namespace FFmpeg { +diff --git a/cmake/external/glib/CMakeLists.txt b/cmake/external/glib/CMakeLists.txt +index 66385e3b..20b62a70 100644 +--- a/cmake/external/glib/CMakeLists.txt ++++ b/cmake/external/glib/CMakeLists.txt +@@ -11,7 +11,7 @@ function(add_cppgir) # isolate scope + set(BUILD_TESTING OFF) + set(BUILD_DOC OFF) + set(CMAKE_DISABLE_FIND_PACKAGE_Qt5Core ON) +- add_subdirectory(cppgir) ++ add_subdirectory(cppgir EXCLUDE_FROM_ALL) + endfunction() + add_cppgir() diff --git a/network/chat/telegram-desktop/pspec.xml b/network/chat/telegram-desktop/pspec.xml index 90344c3cae..d818e354ff 100644 --- a/network/chat/telegram-desktop/pspec.xml +++ b/network/chat/telegram-desktop/pspec.xml @@ -13,8 +13,10 @@ telegram Official Telegram Desktop client Telegram is a messaging app with a focus on speed and security, it is super-fast, simple and free. You can use Telegram on all your devices at the same time — your messages sync seamlessly across any number of your phones, tablets or computers. - https://github.com/telegramdesktop/tdesktop/releases/download/v4.8.1/tdesktop-4.8.1-full.tar.gz + https://github.com/telegramdesktop/tdesktop/releases/download/v4.8.3/tdesktop-4.8.3-full.tar.gz + https://gitlab.com/mnauw/cppgir/-/archive/960fe054ffaab7cf55722fea6094c56a8ee8f18e/cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.tar.gz + https://github.com/martinmoene/expected-lite/archive/refs/tags/v0.6.3.tar.gz fix-tgcalls-cstdint.patch @@ -56,7 +58,7 @@ kcoreaddons-devel - + tdesktop.patch @@ -111,6 +113,13 @@ + + 2023-06-10 + 4.8.3 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-06-02 4.8.1