Unverified Commit 193d4343 authored by abkein's avatar abkein
Browse files

kotatogram-desktop: restore tg_owt patches for older version 

The tg_owt override in kotatogram-desktop uses version 0-unstable-2024-06-15,
which requires two patches that were recently removed from telegram-desktop's
tg_owt definition after being fixed upstream in newer versions.

This restores the patches locally for kotatogram-desktop:
- abseil-202508.patch: fixes build with abseil 202508
- cstring-includes.patch: fixes build with glibc (missing <cstring> includes)
parent 85874be5

pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/cstring-includes.patch

0 → 100644
+74 −0
Original line number Diff line number Diff line 
diff --git a/src/api/video/nv12_buffer.cc b/src/api/video/nv12_buffer.cc

index ca9dcd867..89d28f23c 100644

--- a/src/api/video/nv12_buffer.cc

+++ b/src/api/video/nv12_buffer.cc

@@ -16,6 +16,8 @@

 #include "third_party/libyuv/include/libyuv/convert.h"

 #include "third_party/libyuv/include/libyuv/scale.h"



+#include <cstring>

+

 namespace webrtc {



 namespace {

diff --git a/src/audio/utility/channel_mixer.cc b/src/audio/utility/channel_mixer.cc

index 0f1e66387..33b771b0c 100644

--- a/src/audio/utility/channel_mixer.cc

+++ b/src/audio/utility/channel_mixer.cc

@@ -15,6 +15,8 @@

 #include "rtc_base/logging.h"

 #include "rtc_base/numerics/safe_conversions.h"



+#include <cstring>

+

 namespace webrtc {



 ChannelMixer::ChannelMixer(ChannelLayout input_layout,

diff --git a/src/modules/audio_processing/aec3/alignment_mixer.cc b/src/modules/audio_processing/aec3/alignment_mixer.cc

index 7f076dea8..ffd7242b5 100644

--- a/src/modules/audio_processing/aec3/alignment_mixer.cc

+++ b/src/modules/audio_processing/aec3/alignment_mixer.cc

@@ -10,6 +10,7 @@

 #include "modules/audio_processing/aec3/alignment_mixer.h"



 #include <algorithm>

+#include <cstring>



 #include "rtc_base/checks.h"



diff --git a/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc

index 7ef1a030e..5b9ab7137 100644

--- a/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc

+++ b/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc

@@ -18,6 +18,7 @@

 #include <spa/param/video/format-utils.h>

 #include <sys/mman.h>



+#include <cstring>

 #include <vector>



 #include "absl/memory/memory.h"

diff --git a/src/modules/video_coding/utility/ivf_file_reader.cc b/src/modules/video_coding/utility/ivf_file_reader.cc

index 4c08ca613..f82f2bfcb 100644

--- a/src/modules/video_coding/utility/ivf_file_reader.cc

+++ b/src/modules/video_coding/utility/ivf_file_reader.cc

@@ -10,6 +10,7 @@



 #include "modules/video_coding/utility/ivf_file_reader.h"



+#include <cstring>

 #include <string>

 #include <vector>



diff --git a/src/net/dcsctp/packet/bounded_byte_writer.h b/src/net/dcsctp/packet/bounded_byte_writer.h

index d754549e4..bf5e3ed42 100644

--- a/src/net/dcsctp/packet/bounded_byte_writer.h

+++ b/src/net/dcsctp/packet/bounded_byte_writer.h

@@ -12,6 +12,7 @@

 #define NET_DCSCTP_PACKET_BOUNDED_BYTE_WRITER_H_



 #include <algorithm>

+#include <cstring>



 #include "api/array_view.h"

 
 No newline at end of file

pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ let 
    };



    patches = [

      # fix build with latest glibc

      # upstream PR: https://github.com/desktop-app/tg_owt/pull/172

      ./cstring-includes.patch

      (fetchpatch {

        url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT";

        decode = "base64 -d";