summaryrefslogtreecommitdiff
path: root/net-im/telegram-desktop
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-02-07 03:23:23 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-02-07 03:23:23 +0000
commitfc0e6a4667fb69a392aa649bf9d6261a30f53373 (patch)
tree81e0142dfcfc0a32ec945aa10dc396ab808c5030 /net-im/telegram-desktop
parent7842f444601c620f190db9801e59c4f11e686f15 (diff)
gentoo auto-resync : 07:02:2023 - 03:23:23
Diffstat (limited to 'net-im/telegram-desktop')
-rw-r--r--net-im/telegram-desktop/Manifest6
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch22
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch33
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch43
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch75
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch55
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch44
7 files changed, 0 insertions, 278 deletions
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 0d6a0e0a65f1..81b39555e077 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,9 +1,3 @@
-AUX tdesktop-3.3.0-fix-enchant.patch 851 BLAKE2B 11993329f16ba959516da010046c9ba0ad6f7a4c4e1ad1e2da436d3df674c0800f4136a57db14899e4ad54b32d4839714b50e82ac07f2a3bfa713d4ec19d3d8c SHA512 2b1074f6bae54ac5b58b85cff93f37c262f67c50fe0af8463d657ae04313197ffa075988590a3fbf70e44b03b618e65d6d6a40de748b98eac6005499aa02292e
-AUX tdesktop-3.5.2-musl.patch 890 BLAKE2B e65419eac920eb7c6929559229e50458fca0e9598b9e173f332b98235dc7d84acd01f5ceb23462b0fb53edbbeec8747e6f27e49cab8bc596b0c1ded205e6358c SHA512 57a811629749c285d3f181ad714afa322e0b65758114283f506319a076aa0410f5e9a75f6fad5642fe5611745c418b404d95a616d53ac8360fbff5cf170627ba
-AUX tdesktop-3.6.0-jemalloc-only-telegram.patch 1375 BLAKE2B 43d5cf05bcb7f66c32cdb9ff3bab04cbf71eba0be79623adeae521549a9d85fe06f0dd964828a4f7f9103eff9aa2bc150c6d41a298edc143367cc9511d95ef5a SHA512 8de226cfbe003899eac26bab9c0440c4e4042a11c985ea8967812961c2e89d6c7cc577bd349f12bb8470e21fdc19a044268d20606a7f1a3b9c9a1e8b9edde488
-AUX tdesktop-3.6.0-support-ffmpeg5.patch 3142 BLAKE2B f05816a8b26c3061c88b8814adc2402981836ab7853be1dad9c4eb74b621e1084a2167ad5ea86d500c98d627317ffd48288bcb4df897f5ca6858516ecf86c8f0 SHA512 811f42f8372102910be20ac92030b98ad98704cb1378a90d17a01b15dc4a9aa8e9b6bb179a9dc4d09687ad7b60030f0f7367f8058674244b080748bf2c913044
-AUX tdesktop-3.6.1-fix-kwayland-5.93.patch 1835 BLAKE2B dbc414e1543be96faff179288eb4bcc4acdfbe280ae51da11d254054adcc00f4c1387cdc9a24e026e06612d55765a1689b4bfc6381349b75053c4156a0cff71f SHA512 82855396f367f3669a34246a031626bba158d5361ec39e728c2d33f0d5b9ff5196c38a33551614848b5d439e25bbe45eb3795eaf7ca7442f5f27ab0bdeb0e72e
-AUX tdesktop-3.6.1-fix-use-after-free.patch 1627 BLAKE2B 867dde2d1d8d6535e2305f841fe97477bd08c37e96684196563f9ce6dbfb12c7b2941ddc3e00182126e24ec08e1692ec201006d2c46548fcbf2f9bae09dca532 SHA512 e52369b6aee6c772bef56b73cf4656813614694af714eb83432ffbe7a2234dde4be9888e927c1304350c5c31a0a9cf37a53ea41df2e9b47a00de6dc4433a1c1b
AUX tdesktop-4.2.4-jemalloc-only-telegram.patch 1309 BLAKE2B c6ed3e2cfcce9540e367fb90fcaacab81fa6dbb150be7207634facfef77361b830175e4e5e2781d884f101833fde022f496b7c39702d97990de4d16585b5c33d SHA512 83d8c3eaafc2947fbe3555d9acf5c78ad07e89009b89f05908dc5cd088652063766c297e4b726ee69423b15804faf79f52815405b09bba554538e664a99ce0e7
AUX tdesktop-4.3.4-qt5-incompatibility-2.patch 1325 BLAKE2B 0a74bb545024dbd4df62d52a7603f7a3b28b827940900f4338d6c05ac148ddaf2dcb6cefb8ff3905c737e7e330b896e493334f1dd114341d6818b1aec6e8469a SHA512 254acfe8b8cec69df629759f025ff1c979f609b0fa591a4137c96e9e726782049e4b6a799755b9e50ffffe6d0a26ca3211d4c12e28c7bacd07605b028235e474
AUX tdesktop-4.4.1-fix-dupe-main-decl.patch 853 BLAKE2B 6a3ce346467a3b6450674a77157f3fa45d9e1991160ce33e9cc58292a8441310468943225d5d5b2ba5e5c23feaba544d52f19c964130a8e8c724a99392072abe SHA512 edaad94a901181f0bca4a64b4ab2277a247073005b351156df02532dfff470a4060e6b709197da0778b5484d39a4c1bc1f75e9df068872d68209dd47eca9ac54
diff --git a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch b/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch
deleted file mode 100644
index 7550828ef59e..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/830180
-
---- tdesktop-3.3.0-full.orig/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp
-+++ tdesktop-3.3.0-full/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp
-@@ -34,7 +34,7 @@
- auto IsHebrew(const QString &word) {
- // Words with mixed scripts will be automatically ignored,
- // so this check should be fine.
-- return ::Spellchecker::WordScript(&word) == QChar::Script_Hebrew;
-+ return ::Spellchecker::WordScript(word) == QChar::Script_Hebrew;
- }
-
- class EnchantSpellChecker {
-@@ -154,7 +154,7 @@
- }
-
- auto EnchantSpellChecker::findSuggestions(const QString &word) {
-- const auto wordScript = ::Spellchecker::WordScript(&word);
-+ const auto wordScript = ::Spellchecker::WordScript(word);
- auto w = word.toStdString();
- std::vector<QString> result;
- if (!_validators.size()) {
diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch
deleted file mode 100644
index 4c34d107913e..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Stub out some glibc-specific functions
-
-This allows support for alternative libcs like musl
-
---- tdesktop-3.5.2-full.orig/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
-+++ tdesktop-3.5.2-full/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
-@@ -22,7 +22,7 @@
-
- #include <sys/utsname.h>
-
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- #include <gnu/libc-version.h>
- #endif // Q_OS_LINUX
-
-@@ -200,7 +200,7 @@
- }
-
- QString GetLibcName() {
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- return "glibc";
- #endif // Q_OS_LINUX
-
-@@ -208,7 +208,7 @@
- }
-
- QString GetLibcVersion() {
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- static const auto result = [&] {
- const auto version = QString::fromLatin1(gnu_get_libc_version());
- return QVersionNumber::fromString(version).isNull() ? QString() : version;
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
deleted file mode 100644
index 18240ce522e2..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Only link jemalloc for the Telegram binary
-
-Some combination of factors is making the different codegen tools hang when
-jemalloc is linked for those, and they're ran under portage's sandbox. Since
-this is only used during build-time, and jemalloc is merely necessary to
-improve runtime memory use, it's unnecessary to use it for anything else.
-
-https://bugs.gentoo.org/802624
-
---- tdesktop-3.6.0-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.6.0-full/Telegram/CMakeLists.txt
-@@ -1376,6 +1376,14 @@
- desktop-app::external_kwayland
- )
- endif()
-+
-+ if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-+ target_link_libraries(Telegram
-+ INTERFACE
-+ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-+ $<LINK_ONLY:desktop-app::external_jemalloc>
-+ )
-+ endif()
- endif()
-
- if (build_macstore)
---- tdesktop-3.6.0-full.orig/cmake/options_linux.cmake
-+++ tdesktop-3.6.0-full/cmake/options_linux.cmake
-@@ -62,14 +62,6 @@
- target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
- endif()
-
--if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-- target_link_libraries(common_options
-- INTERFACE
-- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-- $<LINK_ONLY:desktop-app::external_jemalloc>
-- )
--endif()
--
- target_link_libraries(common_options
- INTERFACE
- ${CMAKE_DL_LIBS}
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch
deleted file mode 100644
index 32959acd5482..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Support FFmpeg 5
-
-I'm not comfortable changing the _durationInMilliseconds formula on older
-versions of ffmpeg. Doing that only for newer versions also reduces the amount
-of testing this patch needs (of which it'll get very minimal amounts, this is a
-job better left for upstream when they get to it).
-
-Also it doesn't compile under ffmpeg 4 if the variables are constants :/
-
---- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp
-+++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp
-@@ -104,7 +104,11 @@
-
- _frame = av_frame_alloc();
-
-+#if LIBAVFORMAT_VERSION_MAJOR >= 59
-+ const AVInputFormat *inputFormat = av_find_input_format(container.c_str());
-+#else
- AVInputFormat *inputFormat = av_find_input_format(container.c_str());
-+#endif
- if (!inputFormat) {
- _didReadToEnd = true;
- return;
-@@ -144,7 +148,11 @@
-
- _streamId = i;
-
-+#if LIBAVFORMAT_VERSION_MAJOR >= 59
-+ _durationInMilliseconds = inStream->duration * 1000 / 48000;
-+#else
- _durationInMilliseconds = (int)((inStream->duration + inStream->first_dts) * 1000 / 48000);
-+#endif
-
- if (inStream->metadata) {
- AVDictionaryEntry *entry = av_dict_get(inStream->metadata, "TG_META", nullptr, 0);
---- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp
-+++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp
-@@ -32,7 +32,11 @@
- AudioStreamingPartPersistentDecoderState(AVCodecParameters const *codecParameters, AVRational timeBase) :
- _codecParameters(codecParameters),
- _timeBase(timeBase) {
-+#ifdef LIBAVCODEC_VERSION_MAJOR >= 59
-+ const AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id);
-+#else
- AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id);
-+#endif
- if (codec) {
- _codecContext = avcodec_alloc_context3(codec);
- int ret = avcodec_parameters_to_context(_codecContext, codecParameters);
---- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp
-+++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp
-@@ -280,7 +280,11 @@
-
- int ret = 0;
-
-+#if LIBAVFORMAT_VERSION_MAJOR >= 59
-+ const AVInputFormat *inputFormat = av_find_input_format(container.c_str());
-+#else
- AVInputFormat *inputFormat = av_find_input_format(container.c_str());
-+#endif
- if (!inputFormat) {
- _didReadToEnd = true;
- return;
-@@ -323,7 +327,11 @@
- }
-
- if (videoCodecParameters && videoStream) {
-+#if LIBAVCODEC_VERSION_MAJOR >= 59
-+ const AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id);
-+#else
- AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id);
-+#endif
- if (codec) {
- _codecContext = avcodec_alloc_context3(codec);
- ret = avcodec_parameters_to_context(_codecContext, videoCodecParameters);
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch
deleted file mode 100644
index e818ffe46456..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fix compatibility with kwayland-5.93.0
-
-The header files were moved, the include directory wasn't being added correctly.
-
-https://bugs.gentoo.org/837569
-
---- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
-+++ tdesktop-3.6.1-full/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
-@@ -9,10 +9,10 @@
-
- #include "base/platform/base_platform_info.h"
-
--#include <connection_thread.h>
--#include <registry.h>
--#include <surface.h>
--#include <plasmashell.h>
-+#include <KWayland/Client/connection_thread.h>
-+#include <KWayland/Client/registry.h>
-+#include <KWayland/Client/surface.h>
-+#include <KWayland/Client/plasmashell.h>
-
- using namespace KWayland::Client;
-
---- tdesktop-3.6.1-full.orig/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
-+++ tdesktop-3.6.1-full/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
-@@ -13,11 +13,11 @@
- #include <QtCore/QPointer>
- #include <QtGui/QWindow>
-
--#include <connection_thread.h>
--#include <registry.h>
--#include <surface.h>
--#include <xdgforeign.h>
--#include <idleinhibit.h>
-+#include <KWayland/Client/connection_thread.h>
-+#include <KWayland/Client/registry.h>
-+#include <KWayland/Client/surface.h>
-+#include <KWayland/Client/xdgforeign.h>
-+#include <KWayland/Client/idleinhibit.h>
-
- using namespace KWayland::Client;
-
---- tdesktop-3.6.1-full.orig/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
-+++ tdesktop-3.6.1-full/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
-@@ -24,8 +24,8 @@
- #include <private/qwaylandwindow_p.h>
- #include <private/qwaylandshellsurface_p.h>
-
--#include <connection_thread.h>
--#include <registry.h>
-+#include <KWayland/Client/connection_thread.h>
-+#include <KWayland/Client/registry.h>
-
- Q_DECLARE_METATYPE(QMargins);
-
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch
deleted file mode 100644
index 5a8e6ceedd66..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Do not capture buttons in AccountsList that belong to inner VerticalLayout widget
- This fixes a use-after-free error (double destruction) in the main menu right after account switching.
-Bug-Debian: https://bugs.debian.org/1008156
-Bug-Ubuntu: https://launchpad.net/bugs/1967673
-Forwarded: https://github.com/telegramdesktop/tdesktop/pull/24301
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: Sat, 09 Apr 2022 13:47:55 +0300
-
---- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/settings/settings_information.cpp
-+++ tdesktop-3.6.1-full/Telegram/SourceFiles/settings/settings_information.cpp
-@@ -78,9 +78,7 @@
- int _outerIndex = 0;
-
- Ui::SlideWrap<Ui::SettingsButton> *_addAccount = nullptr;
-- base::flat_map<
-- not_null<Main::Account*>,
-- base::unique_qptr<Ui::SettingsButton>> _watched;
-+ base::flat_map<not_null<Main::Account*>, Ui::SettingsButton*> _watched;
-
- base::unique_qptr<Ui::PopupMenu> _contextMenu;
- std::unique_ptr<Ui::VerticalLayoutReorder> _reorder;
-@@ -730,7 +728,7 @@
- order.reserve(inner->count());
- for (auto i = 0; i < inner->count(); i++) {
- for (const auto &[account, button] : _watched) {
-- if (button.get() == inner->widgetAt(i)) {
-+ if (button == inner->widgetAt(i)) {
- order.push_back(account->session().uniqueId());
- }
- }
-@@ -769,11 +767,11 @@
- account,
- std::move(activate));
- };
-- button.reset(inner->add(MakeAccountButton(
-+ button = inner->add(MakeAccountButton(
- inner,
- _controller,
- account,
-- std::move(callback))));
-+ std::move(callback)));
- }
- }
- inner->resizeToWidth(_outer->width());