commit: 4962cfb47fe4a1fa126b892b693433077e3b1460 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Mon Jul 19 20:07:09 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Tue Jul 20 02:43:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4962cfb4
net-im/telegram-desktop: Bump to 2.8.11 Also attempted to fix a build-time hang. Tested and confirmed by at least one user, that's good enough right? Bug: https://bugs.gentoo.org/802624 Thanks-to: Red <redblade7 <AT> runbox.com> Thanks-to: Vlad <@Windows2k@telegram> Closes: https://github.com/gentoo/gentoo/pull/21718 Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> net-im/telegram-desktop/Manifest | 2 +- .../tdesktop-2.8.10-jemalloc-only-telegram.patch | 31 ++++++++++++++++++++++ ....8.10.ebuild => telegram-desktop-2.8.11.ebuild} | 2 ++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index e246987bf0e..8aaae69ec84 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,3 @@ DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14 DIST tdesktop-2.8.1-full.tar.gz 37129127 BLAKE2B 06f2a3050f0e0f321c766c54e19faf3ea172c41088e2ffdbb5928a41ba01de1fc845a84addded17d113316857c68f265642a8ab32feb79a87beef548c739b56c SHA512 df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69 -DIST tdesktop-2.8.10-full.tar.gz 37105631 BLAKE2B 71a08e0d2fda90898e711dd285478e565ddf7f6bd71db8910688c7f0bb550f04136cb3ccec101d5e89860471ffdd7a868dd90a6317924e96c8ad558d4e3079f2 SHA512 910e34718a061d643937393fa105f2236549059eaecc56aab1203a0efa3a7538f7a2d9b432c8b0a9269118ef3bff56dc1edf856476629efe666d16851e68932f +DIST tdesktop-2.8.11-full.tar.gz 37105468 BLAKE2B 1ec5a0003bd1b948b45213509fa0649dfde5ec8e3dff097bf45aa0951c7963930788b0bee853f286d04b008b78704c464b6614b8391350767affebc2623b25af SHA512 a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860 diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch new file mode 100644 index 00000000000..8604acc6a74 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch @@ -0,0 +1,31 @@ +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-2.8.10-full.orig/Telegram/CMakeLists.txt ++++ tdesktop-2.8.10-full/Telegram/CMakeLists.txt +@@ -87,6 +87,7 @@ + PRIVATE + desktop-app::external_glibmm + desktop-app::external_glib ++ desktop-app::external_jemalloc + ) + + if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) +--- tdesktop-2.8.10-full.orig/cmake/options_linux.cmake ++++ tdesktop-2.8.10-full/cmake/options_linux.cmake +@@ -58,11 +58,6 @@ + endif() + endif() + +-target_link_libraries(common_options +-INTERFACE +- desktop-app::external_jemalloc +-) +- + if (DESKTOP_APP_USE_PACKAGED) + find_library(ATOMIC_LIBRARY atomic) + else() diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild similarity index 98% rename from net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild rename to net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild index e738b91f41d..aaa30fc0f33 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild @@ -76,6 +76,8 @@ PATCHES=( "${FILESDIR}/tdesktop-2.8.9-disable-webkit-separately.patch" # Not a proper fix, not upstreamed "${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch" + # Not upstreamed (yet) + "${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch" ) pkg_pretend() {
