Merge pull request #12029 from Rmys/master

tdesktop-4.8.3

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/' \

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 <fedin-ilja2010@ya.ru>
+Date: Thu, 1 Jun 2023 23:18:26 +0400
+Subject: [PATCH] Ensure cppgir is not getting installed
 
- #include <QtGui/QImage>
-+#include <memory>
+---
+ 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 <QtGui/QImage>
-+#include <memory>
-
- 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()
 

network/chat/telegram-desktop/pspec.xml

@@ -13,8 +13,10 @@
         <Icon>telegram</Icon>
         <Summary>Official Telegram Desktop client</Summary>
         <Description>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.</Description>
-        <Archive sha1sum="46528a452f501682a95c5e22eb8b5acd338eba9d" type="targz">https://github.com/telegramdesktop/tdesktop/releases/download/v4.8.1/tdesktop-4.8.1-full.tar.gz</Archive>
+        <Archive sha1sum="c270accd7ce6b0d82a1a5bd34aa72ebc4d6fa48f" type="targz">https://github.com/telegramdesktop/tdesktop/releases/download/v4.8.3/tdesktop-4.8.3-full.tar.gz</Archive>
 
+        <Archive sha1sum="fcede0f13c0b6982172820cd072883cfc3a9af95" type="targz">https://gitlab.com/mnauw/cppgir/-/archive/960fe054ffaab7cf55722fea6094c56a8ee8f18e/cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.tar.gz</Archive>
+        <Archive sha1sum="9aab506bc8de752492cfd6a7d7215ef60cc5ae29" type="targz">https://github.com/martinmoene/expected-lite/archive/refs/tags/v0.6.3.tar.gz</Archive>
         <AdditionalFiles>
             <AdditionalFile target="fix-tgcalls-cstdint.patch" permission="0644">fix-tgcalls-cstdint.patch</AdditionalFile>
         </AdditionalFiles>
@@ -56,7 +58,7 @@
             <Dependency>kcoreaddons-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">tdesktop.patch</Patch> -->
+            <Patch level="1">tdesktop.patch</Patch>
 <!--             <Patch level="1">fix-tgcalls-cstdint.patch</Patch> -->
         </Patches>
     </Source>
@@ -111,6 +113,13 @@
     </Package>
 
     <History>
+        <Update release="28">
+            <Date>2023-06-10</Date>
+            <Version>4.8.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="27">
             <Date>2023-06-02</Date>
             <Version>4.8.1</Version>