net-im/telegram-desktop: Fix jemalloc linkage

Updated patch allows for jemalloc to be linked properly

Closes: https://bugs.gentoo.org/906302
Thanks-to: Михаил <spike@lmu.name>
Signed-off-by: Esteve Varela Colominas <esteve.varela@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31044
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 45 insertions, 2 deletions

diff --git a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
new file mode 100644
index 000000000000..d56bacea69f8
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
@@ -0,0 +1,43 @@
+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-4.2.4-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-4.2.4-full/Telegram/CMakeLists.txt
+@@ -1478,6 +1478,14 @@
+             desktop-app::external_wayland_client
+         )
+     endif()
++
++    if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
++        target_link_libraries(Telegram
++        PRIVATE
++            $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
++            $<LINK_ONLY:desktop-app::external_jemalloc>
++        )
++    endif()
+ endif()
+ 
+ if (build_macstore)
+--- tdesktop-4.2.4-full.orig/cmake/options_linux.cmake
++++ tdesktop-4.2.4-full/cmake/options_linux.cmake
+@@ -78,14 +78,6 @@
+     )
+ 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()
+-
+ if (DESKTOP_APP_USE_ALLOCATION_TRACER)
+     target_link_options(common_options
+     INTERFACE
diff --git a/net-im/telegram-desktop/telegram-desktop-4.6.5-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild
index f50292ef176a..a0dc810ebc7f 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.6.5-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild
@@ -84,7 +84,7 @@ BDEPEND="
 # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 PATCHES=(
-	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch"
 	"${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch"
 )
 
diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild
index 349592fc763a..dee0c3c1cc2f 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.8.1-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild
@@ -85,7 +85,7 @@ BDEPEND="
 # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 PATCHES=(
-	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch"
 	"${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch"
 )