From 56239ca5e225079d4b8605f577031339f077bdfa Mon Sep 17 00:00:00 2001 From: Esteve Varela Colominas Date: Sat, 19 Feb 2022 22:03:39 +0100 Subject: net-im/telegram-desktop: Add musl support Signed-off-by: Esteve Varela Colominas Closes: https://github.com/gentoo/gentoo/pull/24278 Signed-off-by: Georgy Yakovlev --- .../tdesktop-3.5.2-jemalloc-only-telegram.patch | 14 +- .../files/tdesktop-3.5.2-jemalloc-optional.patch | 71 +++++++++ .../files/tdesktop-3.5.2-musl.patch | 33 +++++ .../telegram-desktop-3.5.2-r1.ebuild | 160 +++++++++++++++++++++ .../telegram-desktop/telegram-desktop-3.5.2.ebuild | 152 -------------------- 5 files changed, 271 insertions(+), 159 deletions(-) create mode 100644 net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch create mode 100644 net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch create mode 100644 net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild delete mode 100644 net-im/telegram-desktop/telegram-desktop-3.5.2.ebuild (limited to 'net-im/telegram-desktop') 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 index 837cfaf38b7c..4f5c7017e6ac 100644 --- 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 @@ -7,19 +7,19 @@ 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 -@@ -1335,6 +1335,12 @@ - endif() +@@ -1357,6 +1357,12 @@ + desktop-app::external_kwayland + ) endif() - else() ++ + target_link_libraries(Telegram + PRIVATE + desktop-app::linux_jemalloc_helper + $ + ) -+ - if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) - target_link_libraries(Telegram - PRIVATE + 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 @@ 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 new file mode 100644 index 000000000000..bd3595858c20 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch @@ -0,0 +1,71 @@ +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 +- $ +- ) ++ if (NOT DESKTOP_APP_DISABLE_JEMALLOC) ++ target_link_libraries(Telegram ++ PRIVATE ++ 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) diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch new file mode 100644 index 000000000000..4c34d107913e --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch @@ -0,0 +1,33 @@ +Stub out some glibc-specific functions + +This allows support for alternative libcs like musl + +--- tdesktop-3.5.2-full.orig/Telegram/lib_base/base/platform/linux/base_info_linux.cpp ++++ tdesktop-3.5.2-full/Telegram/lib_base/base/platform/linux/base_info_linux.cpp +@@ -22,7 +22,7 @@ + + #include + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + #include + #endif // Q_OS_LINUX + +@@ -200,7 +200,7 @@ + } + + QString GetLibcName() { +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + return "glibc"; + #endif // Q_OS_LINUX + +@@ -208,7 +208,7 @@ + } + + QString GetLibcVersion() { +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + static const auto result = [&] { + const auto version = QString::fromLatin1(gnu_get_libc_version()); + return QVersionNumber::fromString(version).isNull() ? QString() : version; diff --git a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild new file mode 100644 index 000000000000..98ffdd9164d6 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild @@ -0,0 +1,160 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +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 ~ppc64 ~riscv" +IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X" +REQUIRED_USE=" + spell? ( + ^^ ( enchant hunspell ) + ) +" + +RDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + dev-libs/libdispatch + dev-libs/openssl:= + dev-libs/xxhash + >=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?] + media-fonts/open-sans + media-libs/fontconfig:= + ~media-libs/libtgvoip-2.4.4_p20220117 + media-libs/openal + media-libs/opus:= + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20220209[screencast=,X=] + media-video/ffmpeg:=[opus] + sys-libs/zlib:=[minizip] + dbus? ( + dev-cpp/glibmm:2 + dev-qt/qtdbus:5 + dev-libs/libdbusmenu-qt[qt5(+)] + ) + enchant? ( app-text/enchant:= ) + hunspell? ( >=app-text/hunspell-1.7:= ) + jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) + wayland? ( kde-frameworks/kwayland:= ) + X? ( x11-libs/libxcb:= ) +" +DEPEND="${RDEPEND} + dev-cpp/range-v3 + =dev-cpp/ms-gsl-3* +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-util/cmake-3.16 + virtual/pkgconfig +" +# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 + +PATCHES=( + "${FILESDIR}/tdesktop-3.5.2-jemalloc-only-telegram.patch" + "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" + "${FILESDIR}/tdesktop-3.5.2-musl.patch" + "${FILESDIR}/tdesktop-3.5.2-jemalloc-optional.patch" +) + +# Current desktop-file-utils-0.26 does not understand Version=1.5 +QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop" + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn + 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() { + # no explicit toggle, doesn't build with the system one #752417 + sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \ + cmake/external/rlottie/CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTDESKTOP_LAUNCHER_BASENAME="${PN}" + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. + -DDESKTOP_APP_QT6=OFF + + -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus) + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) + -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell) # enables hunspell (recommended) + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell + + # This option is heavily discouraged by upstream. + # See files/tdesktop-*-jemalloc-optional.patch + -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) + ) + + 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 + elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!" + elog + fi + if has_version ' https://bugs.gentoo.org/803233 - -PATCHES=( - "${FILESDIR}/tdesktop-3.5.2-jemalloc-only-telegram.patch" - "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" -) - -# Current desktop-file-utils-0.26 does not understand Version=1.5 -QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop" - -pkg_pretend() { - if has ccache ${FEATURES}; then - ewarn - 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() { - # no explicit toggle, doesn't build with the system one #752417 - sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \ - cmake/external/rlottie/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595 - local mycmakeargs=( - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DDESKTOP_APP_QT6=OFF - - -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes) - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes) - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes) - -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes) # enables hunspell (recommended) - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell - ) - - 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 - - # Fix for RISCV, as well as any other platforms that might generate libatomic calls - # Upstreamed in >3.4.3 - append-ldflags '-pthread' - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use X && ! use screencast; then - elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!" - fi - if has_version '