@@ 1,123 0,0 @@
-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,7 +39,9 @@ class InstanceImpl;
- class InstanceV2Impl;
- class InstanceV2ReferenceImpl;
-+#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP
- class InstanceImplLegacy;
- void SetLegacyGlobalServerConfig(const std::string &serverConfig);
-+#endif
- } // namespace tgcalls
- 
- namespace Calls {
-@@ -56,6 +58,8 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>();
- const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>();
- const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>();
-+#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
-


@@ 1,34 1,41 @@
-From a5c42e07ae223d440ff11347e0cf1fd58fd383df Mon Sep 17 00:00:00 2001
-From: Nicholas Guriev <nicholas@guriev.su>
-Date: Sat, 26 Aug 2023 18:23:53 +0300
-Subject: [PATCH 1/2] Look for system-wide cppgir before fallback to the
- bundled copy
+Upstream-status: https://github.com/desktop-app/cmake_helpers/pull/305
+
+From fa47432aeccb2cf657a79f8e1a3af1ef0663b4c6 Mon Sep 17 00:00:00 2001
+From: dan <i@dan.games>
+Date: Sun, 12 Oct 2025 18:45:40 +0800
+Subject: [PATCH] Look for system-wide cppgir before fallback to the bundled
+ copy.
 
-Closes: #282
 ---
- external/glib/CMakeLists.txt        | 4 +++-
- external/glib/generate_cppgir.cmake | 7 ++++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
+ external/glib/CMakeLists.txt        |  7 ++++---
+ external/glib/generate_cppgir.cmake | 16 +++++++++++-----
+ 2 files changed, 15 insertions(+), 8 deletions(-)
 
 diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt
-index 3c6fe4be..c862705f 100644
+index 9b80f23..1a2e9b7 100644
 --- a/external/glib/CMakeLists.txt
 +++ b/external/glib/CMakeLists.txt
-@@ -13,9 +13,11 @@ function(add_cppgir) # isolate scope
-     set(BUILD_EXAMPLES OFF)
-     add_subdirectory(cppgir EXCLUDE_FROM_ALL)
- endfunction()
--add_cppgir()
+@@ -21,14 +21,15 @@ INTERFACE
+     GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_56
+ )
  
- include(generate_cppgir.cmake)
+-block()
++include(generate_cppgir.cmake)
++
 +if (NOT CppGir_FOUND)
-+    add_cppgir()
+     set(BUILD_TESTING OFF)
+     set(BUILD_DOC OFF)
+     set(BUILD_EXAMPLES OFF)
+     add_subdirectory(cppgir EXCLUDE_FROM_ALL)
+-endblock()
 +endif()
- generate_cppgir(external_glib Gio-2.0)
  
- find_package(PkgConfig REQUIRED)
+-include(generate_cppgir.cmake)
+ 
+ if (DESKTOP_APP_GLIB2_gio-unix-2.0_VERSION VERSION_GREATER_EQUAL 2.86)
+     generate_cppgir(external_glib GioUnix-2.0)
 diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake
-index c15d3f9e..9b0a5ac8 100644
+index c4475c6..012fd52 100644
 --- a/external/glib/generate_cppgir.cmake
 +++ b/external/glib/generate_cppgir.cmake
 @@ -4,6 +4,8 @@


@@ 40,42 47,7 @@ index c15d3f9e..9b0a5ac8 100644
  function(generate_cppgir target_name gir)
      set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir)
  
-@@ -17,6 +19,9 @@ function(generate_cppgir target_name gir)
-         ${cppgir_loc}/data/cppgir.ignore
-         ${cppgir_loc}/data/cppgir_unix.ignore
-     )
-+    if (CppGir_FOUND)
-+        set(ignore_files)  # rely on default ignore list
-+    endif()
- 
-     set(gir_path)
-     if (IS_ABSOLUTE "${gir}")
-@@ -33,7 +38,7 @@ function(generate_cppgir target_name gir)
-         --class
-         --class-full
-         --expected
--        --ignore
-+        "$<$<BOOL:${ignore_files}>:--ignore>"
-         "$<JOIN:${ignore_files},:>"
-         --output
-         ${gen_dst}
-
-From eed39522952c15f448c54290454806dd011c4996 Mon Sep 17 00:00:00 2001
-From: Nicholas Guriev <nicholas@guriev.su>
-Date: Sat, 26 Aug 2023 18:23:53 +0300
-Subject: [PATCH 2/2] Look for system-wide cppgir before fallback to the
- bundled copy
-
-Closes: #282
----
- external/glib/generate_cppgir.cmake | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake
-index 9b0a5ac8..2ad82277 100644
---- a/external/glib/generate_cppgir.cmake
-+++ b/external/glib/generate_cppgir.cmake
-@@ -15,11 +15,12 @@ function(generate_cppgir target_name gir)
+@@ -13,10 +15,14 @@ function(generate_cppgir target_name gir)
  
      set(gen_timestamp ${gen_dst}/${target_name}_cppgir.timestamp)
  


@@ 83,13 55,28 @@ index 9b0a5ac8..2ad82277 100644
 -        ${cppgir_loc}/data/cppgir.ignore
 -        ${cppgir_loc}/data/cppgir_unix.ignore
 -    )
--    if (CppGir_FOUND)
 +    if (NOT CppGir_FOUND)
 +        set(ignore_files
 +            ${cppgir_loc}/data/cppgir.ignore
 +            ${cppgir_loc}/data/cppgir_unix.ignore
 +        )
 +    else()
-         set(ignore_files)  # rely on default ignore list
-     endif()
++        set(ignare_files) # rely on default ignore list
++    endif()
  
+     add_custom_command(
+     OUTPUT
+@@ -28,7 +34,7 @@ function(generate_cppgir target_name gir)
+         --class
+         --class-full
+         --expected
+-        --ignore
++        "$<$<BOOL:${ignore_files}>:--ignore>"
+         "$<JOIN:${ignore_files},:>"
+         --output
+         ${gen_dst}
+
+base-commit: c7e0493dea2b870fb1b8e26604201fdb9e8c1ee5
+-- 
+2.49.0
+