Telegram: bump version, switch to ffmpeg6

This commit is contained in:
Gerasim Troeglazov
2024-08-18 21:26:54 +10:00
parent e27f8f9772
commit 9cdb9f8f2e
4 changed files with 204 additions and 155 deletions

View File

@@ -1,4 +1,4 @@
From 054fda7d59820ba7dbd4208e915b5c964b9afbc7 Mon Sep 17 00:00:00 2001
From 92f9d1c2f09560fe521d6a302327205d209376da Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 1 Aug 2024 22:40:58 +1000
Subject: Add haiku support

View File

@@ -1,4 +1,4 @@
From 485b4a6cff6e0d207a18d117ebe699fc3532daf5 Mon Sep 17 00:00:00 2001
From 4b87233d217e6ee5015a888e1e72c3850d6a090e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 1 Aug 2024 22:42:14 +1000
Subject: Add haiku support
@@ -138,7 +138,7 @@ index 0000000..e5f8b64
+
+resource("BEOS:default_shortcut") "S";
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 8923211..b893e29 100644
index 4dafca5..e23089e 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -93,6 +93,15 @@ PRIVATE
@@ -157,7 +157,7 @@ index 8923211..b893e29 100644
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1600,6 +1609,16 @@ if (NOT build_winstore)
@@ -1608,6 +1617,16 @@ if (NOT build_winstore)
)
endif()
@@ -174,7 +174,7 @@ index 8923211..b893e29 100644
if (DESKTOP_APP_USE_PACKAGED)
remove_target_sources(Telegram ${src_loc}
platform/mac/mac_iconv_helper.c
@@ -1763,7 +1782,7 @@ else()
@@ -1771,7 +1790,7 @@ else()
set(bundle_identifier "com.tdesktop.Telegram")
endif()
set(bundle_entitlements "Telegram.entitlements")
@@ -681,7 +681,7 @@ index 0000000..21935f0
+} // namespace Notifications
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 32437fb..add9ffe 100644
index b49cef3..02f9e05 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -28,6 +28,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -729,7 +729,7 @@ index 32437fb..add9ffe 100644
using namespace gi::repository;
namespace GObject = gi::repository::GObject;
@@ -550,6 +581,10 @@ bool AutostartSupported() {
@@ -551,6 +582,10 @@ bool AutostartSupported() {
}
void AutostartToggle(bool enabled, Fn<void(bool)> done) {
@@ -740,7 +740,7 @@ index 32437fb..add9ffe 100644
if (KSandbox::isFlatpak()) {
PortalAutostart(enabled, done);
return;
@@ -577,6 +612,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
@@ -578,6 +613,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
if (done) {
done(enabled && success);
}
@@ -748,7 +748,7 @@ index 32437fb..add9ffe 100644
}
bool AutostartSkip() {
@@ -638,7 +674,11 @@ QString psAppDataPath() {
@@ -639,7 +675,11 @@ QString psAppDataPath() {
}
}
@@ -760,7 +760,7 @@ index 32437fb..add9ffe 100644
}
void psDoCleanup() {
@@ -748,6 +788,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
@@ -749,6 +789,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
}
options.push_back(std::move(command));
};
@@ -768,7 +768,7 @@ index 32437fb..add9ffe 100644
add("unity-control-center", "sound");
add("kcmshell6", "kcm_pulseaudio");
add("kcmshell5", "kcm_pulseaudio");
@@ -757,7 +798,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
@@ -758,7 +799,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
add("mate-volume-control");
add("pavucontrol-qt");
add("pavucontrol");
@@ -1121,10 +1121,10 @@ index d4c3f30..22fb3d6 100644
#include "webrtc/webrtc_device_common.h"
diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
index a8406e1..3eb0414 100644
index 37561e9..52243d2 100644
--- a/cmake/external/CMakeLists.txt
+++ b/cmake/external/CMakeLists.txt
@@ -18,7 +18,7 @@ if (add_cld3_library)
@@ -19,7 +19,7 @@ if (add_cld3_library)
add_checked_subdirectory(cld3)
endif()
add_checked_subdirectory(crash_reports)
@@ -1137,7 +1137,7 @@ index a8406e1..3eb0414 100644
2.45.2
From 8a5f208920708d6dc37fceb04ec1e6d8efd503b7 Mon Sep 17 00:00:00 2001
From f887e6763db929968ecd7a8ad0ef3dfd88ba6b9c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 2 Aug 2024 23:06:18 +1000
Subject: Use singleheader ada library

View File

@@ -5,7 +5,7 @@ COPYRIGHT="2013-2024 Telegram"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz"
CHECKSUM_SHA256="e03b7a0715e302c71de40771dd32e17c1bcfbea5b716972612cebafd4a114d0d"
CHECKSUM_SHA256="b7ef049f64aa7015753c3be158e1a38dafd5e4b58d69bed16aee2402d11ef394"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
SOURCE_URI_2="https://github.com/ada-url/ada/releases/download/v2.9.0/singleheader.zip"
@@ -79,7 +79,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
qt6_tools${secondaryArchSuffix}_devel
devel:libabsl_strings$secondaryArchSuffix >= 2301.0.0
devel:libavcodec$secondaryArchSuffix >= 58
devel:libavcodec$secondaryArchSuffix >= 60
devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0
devel:libboost_regex$secondaryArchSuffix >= 1.83.0
devel:libboost_system$secondaryArchSuffix >= 1.83.0