summaryrefslogtreecommitdiff
path: root/net-im/telegram-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'net-im/telegram-desktop')
-rw-r--r--net-im/telegram-desktop/Manifest2
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch33
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch71
3 files changed, 0 insertions, 106 deletions
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 6fa03e2e9bd8..f39edf795ac7 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,6 +1,4 @@
AUX tdesktop-3.3.0-fix-enchant.patch 851 BLAKE2B 11993329f16ba959516da010046c9ba0ad6f7a4c4e1ad1e2da436d3df674c0800f4136a57db14899e4ad54b32d4839714b50e82ac07f2a3bfa713d4ec19d3d8c SHA512 2b1074f6bae54ac5b58b85cff93f37c262f67c50fe0af8463d657ae04313197ffa075988590a3fbf70e44b03b618e65d6d6a40de748b98eac6005499aa02292e
-AUX tdesktop-3.5.2-jemalloc-only-telegram.patch 1032 BLAKE2B 8220f745febaec55b85f64e25a860f9cfee57bf07496e0bf496857686c5bf7bdfb9c9ede94f9374dea677f1516e8dff39cae5b3a993d1c0fe32d34cf0c91015e SHA512 156a62d5d2145559828466e4c09c23cf8a0cd0cb9d844c27d50945135d854a2e0af45cb3e0dc675e21f74dc2f323574a785e259e86f4120d055aa0e34fd20ea9
-AUX tdesktop-3.5.2-jemalloc-optional.patch 2924 BLAKE2B fa0c124fc38d83434eff5c2e03f815d9e32b3af62782401251905db293d8016618f9c51b333a7a4e86e9d529a1e8747495b982ad9e5d6c19c2d9c63b39391461 SHA512 de836736fdc5bcd2f581cd43223dff9ffe82042440e44f6038d2d0278fa94777054badd2870deb1f7c8285a35a5f01cfeccbd76701aeaf5ca9a573d8fbc9ed31
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
diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch
deleted file mode 100644
index 4f5c7017e6ac..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,33 +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.
-
---- tdesktop-3.5.2-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt
-@@ -1357,6 +1357,12 @@
- desktop-app::external_kwayland
- )
- endif()
-+
-+ target_link_libraries(Telegram
-+ PRIVATE
-+ desktop-app::linux_jemalloc_helper
-+ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-+ )
- endif()
-
- if (build_macstore)
---- tdesktop-3.5.2-full.orig/cmake/options_linux.cmake
-+++ tdesktop-3.5.2-full/cmake/options_linux.cmake
-@@ -64,8 +64,6 @@
-
- target_link_libraries(common_options
- INTERFACE
-- desktop-app::linux_jemalloc_helper
-- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
- ${CMAKE_DL_LIBS}
- )
-
diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch
deleted file mode 100644
index bd3595858c20..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Optionally disable jemalloc
-
-Telegram upstream heavily insists you use the jemalloc allocator. This is due
-to the high memory usage resulting from the glibc allocator. It is unknown why
-this affects telegram the way it does, but upstream solved the issue by using a
-different allocator. Initially they used mallocng, now jemalloc.
-
-However, other libcs don't necessarily need this, and as such this should be
-optional. As mallocng is a fork of musl's allocator, and this was used before
-the switch to jemalloc, the musl allocator should still be OK.
-
-Please warn glibc users about disabling jemalloc, don't report bugs about
-memory usage upstream unless you're using jemalloc.
-
-Related info:
-https://github.com/telegramdesktop/tdesktop/issues/16084
-https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
-
---- tdesktop-3.5.2-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt
-@@ -1358,11 +1358,13 @@
- )
- endif()
-
-- target_link_libraries(Telegram
-- PRIVATE
-- desktop-app::linux_jemalloc_helper
-- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-- )
-+ if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-+ target_link_libraries(Telegram
-+ PRIVATE
-+ desktop-app::linux_jemalloc_helper
-+ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-+ )
-+ endif()
- endif()
-
- if (build_macstore)
---- tdesktop-3.5.2-full.orig/cmake/CMakeLists.txt
-+++ tdesktop-3.5.2-full/cmake/CMakeLists.txt
-@@ -5,7 +5,7 @@
- # https://github.com/desktop-app/legal/blob/master/LEGAL
-
- add_subdirectory(external)
--if (LINUX)
-+if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
- add_subdirectory(linux_jemalloc_helper)
- endif()
- if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED)
---- tdesktop-3.5.2-full.orig/cmake/external/CMakeLists.txt
-+++ tdesktop-3.5.2-full/cmake/external/CMakeLists.txt
-@@ -37,7 +37,7 @@
- add_checked_subdirectory(hunspell)
- endif()
- add_checked_subdirectory(iconv)
--if (LINUX)
-+if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
- add_checked_subdirectory(jemalloc)
- endif()
- add_checked_subdirectory(jpeg)
---- tdesktop-3.5.2-full.orig/cmake/variables.cmake
-+++ tdesktop-3.5.2-full/cmake/variables.cmake
-@@ -26,6 +26,7 @@
- option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled patched ones." OFF)
- option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bundled patched one." OFF)
- option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." OFF)
-+option(DESKTOP_APP_DISABLE_JEMALLOC "Disable use of the jemalloc allocator (Linux only)." OFF)
- option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
- option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
- option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)