From 900988746a1a7412b5d0f0025e9f892233a417ff Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Apr 2024 06:32:47 +0100 Subject: gentoo auto-resync : 11:04:2024 - 06:32:47 --- net-im/Manifest.gz | Bin 9414 -> 9418 bytes net-im/telegram-desktop/Manifest | 3 + .../tdesktop-4.2.4-jemalloc-only-telegram-r1.patch | 43 ++++ .../telegram-desktop-4.16.6.ebuild | 246 +++++++++++++++++++++ 4 files changed, 292 insertions(+) create mode 100644 net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch create mode 100644 net-im/telegram-desktop/telegram-desktop-4.16.6.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index a7dccee5c48a..2edafe254327 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index bacefbe877ea..ef9edc0d96cc 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,9 +1,12 @@ AUX tdesktop-4.10.0-system-cppgir.patch 1150 BLAKE2B d8a6e1320c2ccfd4f1c3f63bfda11f58a499df3880f262adf3f1b74f217dc8c4cc62a8c250d71ff809fb67c797948b53fac5a4d5c584a116b1609ea432662d73 SHA512 0fd213f9aec3a6ff9be11654934126960309cb8e1241dd694852bffeb7a37a08d3c78a332a5bb7e6529358df69bfddb7ccb58138e6dc331f20dd5337ddc9a1c1 AUX tdesktop-4.10.5-qt_compare.patch 381 BLAKE2B 5a5ceea9163f5c2a4cda0df5d10e4013a9634e11a3a3694e1d09166ec311c1089f75b48fa6d618965b722daae40d1f297484ea954341ef8420c7259425eb0ef8 SHA512 d37fea06e9178c778560d2f46b2953794b1605635bdcbf1343a5077c1270d7ec56e5cbb00bdf6caf7eafe21a3c44faa719b9376b8d317d2a109308107fae4226 +AUX tdesktop-4.2.4-jemalloc-only-telegram-r1.patch 1307 BLAKE2B b27f65973a6fa8c83469e0c6419a600ca04ebbf35f6c4a406129867eee644082c4f0164fb71afbc6ae729bb4037d0cf6c68ea1ad78f6268bfe245b83e4290400 SHA512 d2c33dd18e354ebe6cb7143b58e9f61dc4cd664bb1e7ad9c60f562efbb05cc72d5b36270af96b866583b366b59cc34cadee3a62dcbd40433276b80b2511e1fcb DIST tdesktop-4.15.0-full.tar.gz 68286818 BLAKE2B 2bd4d59370a4f97aa3c1b1d64fa7eea114539edcff46ea30a5361cefeeb1de8a1954be91a1a420ddc1b1a30970944387c2cd3749badaa494e53862066c624ac3 SHA512 95aa5f14a9a88b9c6421049445f59f1c5c5d7ab4ca4e8b8f4ab7389bdb8f3cc6b29fea270574881633035acec769ba271261f84ec269010c63af28a03719da98 DIST tdesktop-4.15.2-full.tar.gz 69539402 BLAKE2B 95d6cd3eead56f7cb2aeafd0cc1a05d740ec243644e6d318f415a7fa6c8ad94d3a95cfc9082ba04507a024c81bfc15700ad6adcbfd932ca1993a3310744ac196 SHA512 6e65183d5e77d17e11d0c70e1654373e69f6243f2879cf403701e23acd5aed9df6c6892a1c7c83fd975a858e90e20d73824d0754a2f96ad5af6e3de6515e2627 DIST tdesktop-4.16.4-full.tar.gz 69798524 BLAKE2B 1d946a2f9408dfe29bdab679bcd68703f9de2d2aade84eea3331616cd1352c3304c2407e0a8d81044dad262482eab36e983b151f0a600df383a9f23b39177fd4 SHA512 cee57e654d06dd50843a0ae88cb658d69b546e37f613a2e93d7f44463136830ff5c3de6b7177fb050b1301bfa25ed6e16f0b3fd894b0635772941c999d3ff63f +DIST tdesktop-4.16.6-full.tar.gz 70435773 BLAKE2B 5b66ba9e7a4cbbadcfd271bd33940ccf928e32b7b008b60b710095ff3b60255257b56746b5344100f034164949f428cfd19727f5d5a9f364eba7e7f6b58853fb SHA512 5b580d36c8b8a90981c3541d4c148df37bb7ebdec0970bfbfe4c1a9a1175e3cf41c2a14d854d7d917482aa9086ee712844ec40780741df22ad6d42fcf3c48f1f EBUILD telegram-desktop-4.15.0-r2.ebuild 7396 BLAKE2B f869a09a351aed1d0a9f9978085b2999f5e4150a124d117dc281dce0bd7e0537eed3b6c380ff5c7ebfdd842b54f9dbd6add2fc345ff8e45cfc91d2d842e2618e SHA512 6c4f6571992d97fc4cc54cf4db03ad376affc61a78f137f9a9ca59ab3c44af2a5155261bb523bbfd5ea117b7bd9a99adb649639f20772b2293d73d2611db26b0 EBUILD telegram-desktop-4.15.2-r1.ebuild 7397 BLAKE2B 80f9511ffdd2c5827bc00ce5574bc0af59d299d1bc2d09953c3736f4a873513d94d4b65ee523af84b5c60b876013b07277d8eeed13dd00d0f9a051b90c9495d7 SHA512 3092a3e3d6dedcd5b32046573e36894a80da73ab251394e6ece32a8f4a23fa6369b4282a04eb18270f6be22de084e13cf5bd3012f695044330ca62be90ea4a0c EBUILD telegram-desktop-4.16.4.ebuild 7353 BLAKE2B 7900df898a2c8e2c216f5f3d17d100e2cc2555783208cdf75d53bbe274ecafbc6dfe57b9241f5108c7e5ab333ad2060b5a92c91c3caf4e28b67dbe93841d4d17 SHA512 49409a1d47ba2ec187907f03a6f86be11d37353b58d9b3386881de05a28f94fb9ea7f9f668a062724ababbb098cee313725578756281806656eba47c61535641 +EBUILD telegram-desktop-4.16.6.ebuild 7870 BLAKE2B b5e806de593763d87959d1ce775433e6c070a83c46d4e1e9d16230fc2ff6c1abf8f4da83a226c9e241006d989822687aa6cae14533bfcaf7f38801804bbd3e74 SHA512 86207eaaa1222a6538a20506034178f662cb1cb748bb3d097d72ffb026223e46b4e9e641249f29d34835b4c72be6128bd6fb7407a8b5b4ef79fea2f7b31794eb MISC metadata.xml 1307 BLAKE2B 13008e6d601f7e537bbfa6c65091f442a68320858ec0f1433f31ef69890dbdd730464a1e9d5dfc125982895a4fdfaa48edb643670fffba538dcdd44ceffa9cf4 SHA512 a7e0db84964fd04ab37641a23d9b722191d1c5731b946d7e4859c6b0dd2f5a53eadb88297fd24dadd66c5ee097aa0622adafae74d8819e940b1aa9e612ab1e38 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.16.6.ebuild b/net-im/telegram-desktop/telegram-desktop-4.16.6.ebuild new file mode 100644 index 000000000000..96d25257595e --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.16.6.ebuild @@ -0,0 +1,246 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +DESCRIPTION="Official desktop client for Telegram" +HOMEPAGE="https://desktop.telegram.org" + +MY_P="tdesktop-${PV}-full" +SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" +IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X" +REQUIRED_USE=" + qt6-imageformats? ( qt6 ) +" + +KIMAGEFORMATS_RDEPEND=" + media-libs/libavif:= + media-libs/libheif:= + >=media-libs/libjxl-0.8.0:= +" +CDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + >=dev-cpp/glibmm-2.77:2.68 + dev-libs/glib:2 + dev-libs/libdispatch + dev-libs/openssl:= + dev-libs/protobuf + dev-libs/xxhash + media-libs/libjpeg-turbo:= + ~media-libs/libtgvoip-2.4.4_p20221208 + media-libs/openal + media-libs/opus + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] + media-video/ffmpeg:=[opus,vpx] + sys-libs/zlib:=[minizip] + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + jemalloc? ( dev-libs/jemalloc:= ) + !qt6? ( + >=dev-qt/qtcore-5.15:5= + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtimageformats-5.15:5 + >=dev-qt/qtnetwork-5.15:5[ssl] + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtwidgets-5.15:5[png,X?] + kde-frameworks/kcoreaddons:5 + webkit? ( + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtwayland-5.15:5 + ) + ) + qt6? ( + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + webkit? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor] + ) + qt6-imageformats? ( + >=dev-qt/qtimageformats-6.5:6= + ${KIMAGEFORMATS_RDEPEND} + ) + ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${CDEPEND} + webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) ) +" +DEPEND="${CDEPEND} + >=dev-cpp/cppgir-2.0_p20240315 + >=dev-cpp/ms-gsl-4 + dev-cpp/expected-lite + dev-cpp/range-v3 +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/cmake-3.16 + >=dev-cpp/cppgir-2.0_p20240315 + dev-util/gdbus-codegen + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch" + "${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch" +) + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn "ccache does not work with ${PN} out of the box" + ewarn "due to usage of precompiled headers" + ewarn "check bug https://bugs.gentoo.org/715114 for more info" + ewarn + fi +} + +src_prepare() { + # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to + # build in gentoo right now. + if use qt6-imageformats; then + sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ + cmake/external/kimageformats/CMakeLists.txt || die + printf '%s\n' \ + 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ + 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ + 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ + >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die + fi + # kde-frameworks/kcoreaddons is bundled when using qt6. + + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './Telegram/lib_webview/CMakeLists.txt' \ + \! -path './cmake/external/expected/CMakeLists.txt' \ + \! -path './cmake/external/kcoreaddons/CMakeLists.txt' \ + \! -path './cmake/external/qt/package.cmake' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + # Make sure to check the excluded files for new + # CMAKE_DISABLE_FIND_PACKAGE entries. + + # Control QtDBus dependency from here, to avoid messing with QtGui. + if ! use dbus; then + sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ + -i cmake/external/qt/package.cmake || die + fi + + cmake_src_prepare +} + +src_configure() { + # Having user paths sneak into the build environment through the + # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir: + # - bug 909038: can't read from flatpak directories (fixed upstream) + # - bug 920819: system-wide directories ignored when variable is set + export XDG_DATA_DIRS="${EPREFIX}/usr/share" + + # Evil flag (bug #919201) + filter-flags -fno-delete-null-pointer-checks + + # The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep + # the same state across both projects. + # See https://bugs.gentoo.org/866055 + append-cppflags '-DNDEBUG' + + local qt=$(usex qt6 6 5) + local mycmakeargs=( + -DQT_VERSION_MAJOR=${qt} + + # Override new cmake.eclass defaults (https://bugs.gentoo.org/921939) + # Upstream never tests this any other way + -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF + + # Control automagic dependencies on certain packages + ## Header-only lib, some git version. + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) + ## Only used in Telegram/lib_webview/CMakeLists.txt + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) + ## KF6CoreAddons is currently unavailable in ::gentoo + -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6) + + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) + -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) + ## Enables enchant and disables hunspell + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) + ## Use system fonts instead of bundled ones + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) + ) + + if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then + einfo "Found custom API credentials" + mycmakeargs+=( + -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" + -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" + ) + else + # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + # Building with snapcraft API credentials by default + # Custom API credentials can be obtained here: + # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md + # After getting credentials you can export variables: + # export MY_TDESKTOP_API_ID="17349"" + # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" + # and restart the build" + # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop + # portage will use custom variable every build automatically + mycmakeargs+=( + -DTDESKTOP_API_ID="611335" + -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" + ) + fi + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use X && ! use screencast; then + ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" + ewarn + fi + if ! use jemalloc && use elibc_glibc; then + # https://github.com/telegramdesktop/tdesktop/issues/16084 + # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003 + ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!" + ewarn "Do NOT report issues about RAM usage without enabling this flag first." + ewarn + fi + if use wayland && ! use qt6; then + ewarn "Wayland-specific integrations have been deprecated with Qt5." + ewarn "The app will continue to function under wayland, but some" + ewarn "functionality may be reduced." + ewarn "These integrations are only supported when built with Qt6." + ewarn + fi + if use qt6 && ! use qt6-imageformats; then + elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support" + elog + fi + optfeature_header + if ! use qt6; then + optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] + fi +} -- cgit v1.2.3