* gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove deleted patch. * gnu/packages/telegram.scm (libyuv-for-telegram-desktop, cmake-helpers-for-telegram-desktop, codegen-for-telegram-desktop, lib-base-for-telegram-desktop, lib-crl-for-telegram-desktop, lib-lottie-for-telegram-desktop, lib-rpl-for-telegram-desktop, lib-spellcheck-for-telegram-desktop, lib-ui-for-telegram-desktop, lib-webrtc-for-telegram-desktop, lib-webview-for-telegram-desktop, tgcalls-for-telegram-desktop): Bump to submodule checkout. (webrtc-for-telegram-desktop): Bump to submodule checkout. [patches]: Remove patch. [snippet]: Unbundle abseil-cpp and crc32c [inputs]: Add crc32c and glibmm-next. Replace glib with glib-next. (cld3-for-telegram-desktop): New variable. (telegram-desktop): Update to 4.8.1 [snippet]: Add cld3 as a submodule. [arguments]<phases>: Add cld3 as a submodule. [native-inputs]: Replace glib with glib-next [inputs]: Add crc32c, kimageformats, plasma-wayland-protocols, protobuf, qtdeclarative-5 and wayland-protocols. Replace glib with glib-next and glibmm-2.64 with glibmm-next. * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Update patch. Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
		
			
				
	
	
		
			125 lines
		
	
	
	
		
			4.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			125 lines
		
	
	
	
		
			4.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From 322d2c452bf1a4df7b9fe161d4991a347043550c Mon Sep 17 00:00:00 2001
 | |
| From: Klemens Nanni <klemens@posteo.de>
 | |
| Date: Wed, 2 Mar 2022 01:07:48 +0100
 | |
| Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP
 | |
| 
 | |
| Originally from Alt Linux[0], OpenBSD has so far adapted the removal of
 | |
| tgvoip in the official net/tdesktop build.
 | |
| 
 | |
| tgcalls provides everything needed for calls;  audio/video/desktop
 | |
| sharing calls have been working fine across different operating systems
 | |
| and telegram desktop/mobile versions without problems.
 | |
| 
 | |
| 0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1
 | |
| ---
 | |
|  Telegram/CMakeLists.txt                   | 6 +++---
 | |
|  Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++
 | |
|  Telegram/cmake/lib_tgcalls.cmake          | 4 ++++
 | |
|  Telegram/cmake/telegram_options.cmake     | 8 ++++++++
 | |
|  4 files changed, 21 insertions(+), 3 deletions(-)
 | |
| 
 | |
| diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
 | |
| index 008c71b15..291305909 100644
 | |
| --- a/Telegram/CMakeLists.txt
 | |
| +++ b/Telegram/CMakeLists.txt
 | |
| @@ -26,7 +26,9 @@ get_filename_component(res_loc Resources REALPATH)
 | |
|  include(cmake/telegram_options.cmake)
 | |
|  include(cmake/lib_ffmpeg.cmake)
 | |
|  include(cmake/lib_stripe.cmake)
 | |
| -include(cmake/lib_tgvoip.cmake)
 | |
| +if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP)
 | |
| +    include(cmake/lib_tgvoip.cmake)
 | |
| +endif()
 | |
|  include(cmake/lib_tgcalls.cmake)
 | |
|  include(cmake/td_export.cmake)
 | |
|  include(cmake/td_mtproto.cmake)
 | |
| @@ -49,9 +51,7 @@ set_target_properties(Telegram PROPERTIES AUTOMOC ON)
 | |
|  
 | |
|  target_link_libraries(Telegram
 | |
|  PRIVATE
 | |
| -    tdesktop::lib_tgcalls_legacy
 | |
|      tdesktop::lib_tgcalls
 | |
| -    tdesktop::lib_tgvoip
 | |
|  
 | |
|      # Order in this list defines the order of include paths in command line.
 | |
|      # We need to place desktop-app::external_minizip this early to have its
 | |
| diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
 | |
| index 5fe9ac677..bebf48e70 100644
 | |
| --- a/Telegram/SourceFiles/calls/calls_call.cpp
 | |
| +++ b/Telegram/SourceFiles/calls/calls_call.cpp
 | |
| @@ -39,8 +39,10 @@ class InstanceImpl;
 | |
|  class InstanceV2Impl;
 | |
|  class InstanceV2ReferenceImpl;
 | |
|  class InstanceV2_4_0_0Impl;
 | |
| +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP
 | |
|  class InstanceImplLegacy;
 | |
|  void SetLegacyGlobalServerConfig(const std::string &serverConfig);
 | |
| +#endif
 | |
|  } // namespace tgcalls
 | |
|  
 | |
|  namespace Calls {
 | |
| @@ -56,7 +58,9 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>();
 | |
|  const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>();
 | |
|  const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>();
 | |
|  const auto RegisterV240 = tgcalls::Register<tgcalls::InstanceV2_4_0_0Impl>();
 | |
| +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP
 | |
|  const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>();
 | |
| +#endif
 | |
|  
 | |
|  [[nodiscard]] base::flat_set<int64> CollectEndpointIds(
 | |
|  		const QVector<MTPPhoneConnection> &list) {
 | |
| @@ -1332,7 +1336,9 @@ Call::~Call() {
 | |
|  }
 | |
|  
 | |
|  void UpdateConfig(const std::string &data) {
 | |
| +#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP
 | |
|  	tgcalls::SetLegacyGlobalServerConfig(data);
 | |
| +#endif
 | |
|  }
 | |
|  
 | |
|  } // namespace Calls
 | |
| diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake
 | |
| index 94cfdb856..9ac4fe479 100644
 | |
| --- a/Telegram/cmake/lib_tgcalls.cmake
 | |
| +++ b/Telegram/cmake/lib_tgcalls.cmake
 | |
| @@ -268,6 +268,10 @@ PRIVATE
 | |
|      ${tgcalls_loc}
 | |
|  )
 | |
|  
 | |
| +if (TDESKTOP_DISABLE_LEGACY_TGVOIP)
 | |
| +    return()
 | |
| +endif()
 | |
| +
 | |
|  add_library(lib_tgcalls_legacy STATIC)
 | |
|  init_target(lib_tgcalls_legacy)
 | |
|  
 | |
| diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake
 | |
| index a5a6d9405..2eb9953f2 100644
 | |
| --- a/Telegram/cmake/telegram_options.cmake
 | |
| +++ b/Telegram/cmake/telegram_options.cmake
 | |
| @@ -4,7 +4,9 @@
 | |
|  # For license and copyright information please follow this link:
 | |
|  # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 | |
|  
 | |
| +option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF)
 | |
|  option(TDESKTOP_API_TEST "Use test API credentials." OFF)
 | |
| +
 | |
|  set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.")
 | |
|  set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.")
 | |
|  
 | |
| @@ -36,6 +38,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "")
 | |
|      " ")
 | |
|  endif()
 | |
|  
 | |
| +if (TDESKTOP_DISABLE_LEGACY_TGVOIP)
 | |
| +    target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP)
 | |
| +else()
 | |
| +    target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip)
 | |
| +endif()
 | |
| +
 | |
|  if (DESKTOP_APP_DISABLE_AUTOUPDATE)
 | |
|      target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_AUTOUPDATE)
 | |
|  endif()
 | |
| -- 
 | |
| 2.39.2
 | |
| 
 |