From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 631EA15810D for ; Tue, 16 May 2023 17:07:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8178EE0875; Tue, 16 May 2023 17:07:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62817E0875 for ; Tue, 16 May 2023 17:07:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61A3C340DD1 for ; Tue, 16 May 2023 17:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7BFCA61 for ; Tue, 16 May 2023 17:07:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1684256836.ce4cbbe6125f6444606f3c3df4c82c93e17a8e64.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/, net-im/telegram-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch net-im/telegram-desktop/telegram-desktop-4.6.5-r1.ebuild net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild net-im/telegram-desktop/telegram-desktop-4.8.1-r1.ebuild net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild X-VCS-Directories: net-im/telegram-desktop/ net-im/telegram-desktop/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ce4cbbe6125f6444606f3c3df4c82c93e17a8e64 X-VCS-Branch: master Date: Tue, 16 May 2023 17:07:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8042672a-3607-45a6-9ef3-1daa43dff656 X-Archives-Hash: f1db520ad8960253e5b87b4e09dd257c commit: ce4cbbe6125f6444606f3c3df4c82c93e17a8e64 Author: Esteve Varela Colominas gmail com> AuthorDate: Mon May 15 14:20:02 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 16 17:07:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce4cbbe6 net-im/telegram-desktop: Fix jemalloc linkage Updated patch allows for jemalloc to be linked properly Closes: https://bugs.gentoo.org/906302 Thanks-to: Михаил lmu.name> Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31044 Signed-off-by: Sam James gentoo.org> .../tdesktop-4.2.4-jemalloc-only-telegram-r1.patch | 43 ++++++++++++++++++++++ ...-r1.ebuild => telegram-desktop-4.6.5-r2.ebuild} | 2 +- ...-r1.ebuild => telegram-desktop-4.8.1-r2.ebuild} | 2 +- 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 ++ $ ++ $ ++ ) ++ 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 +- $ +- $ +- ) +-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 similarity index 99% rename from net-im/telegram-desktop/telegram-desktop-4.6.5-r1.ebuild rename to 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 similarity index 99% rename from net-im/telegram-desktop/telegram-desktop-4.8.1-r1.ebuild rename to 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" )