commit: 8580435894e1480944650dd4b297fe0c97f18736 Author: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com> AuthorDate: Wed Jul 3 23:37:13 2024 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Thu Jul 4 13:46:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85804358
net-im/telegram-desktop: add 5.2.2 Release: - https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.2 Changelog: - https://github.com/telegramdesktop/tdesktop/blob/v5.2.2/changelog.txt These changes also: - add the libdispatch USE flag - add the repository url to the HOMEPAGE variable Bug: https://bugs.gentoo.org/881697 Closes: https://github.com/gentoo/gentoo/pull/37165 Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../files/tdesktop-5.2.2-libdispatch.patch | 24 ++ .../files/tdesktop-5.2.2-qt6-no-wayland.patch | 86 +++++++ net-im/telegram-desktop/metadata.xml | 1 + .../telegram-desktop/telegram-desktop-5.2.2.ebuild | 260 +++++++++++++++++++++ 5 files changed, 372 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 81fef72ce205..a3bf260ad572 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -2,3 +2,4 @@ DIST tdesktop-4.15.0-full.tar.gz 68286818 BLAKE2B 2bd4d59370a4f97aa3c1b1d64fa7ee DIST tdesktop-5.0.1-full.tar.gz 69454563 BLAKE2B 0bbb0ee0c096a344b00091795c2bfadd71272b01966daed8f44fd7010c4c4ecfb265c80ecd773934dd0636be1e703bbadc0038befdefd6da93dfadea40e53fba SHA512 45b7833f20f01d78c09163e205af7d68afffcfc88075ba6af35dc6cbbce1f0205c0150b137ca09e6bdaf271240e4d1336411ad427bc27a2b2ad42dc435ee0ec2 DIST tdesktop-5.0.4-full.tar.gz 69462550 BLAKE2B 46e630ea74c6571e41909bab768ff19e8eaf2246cf624474b1c14d5c598146e0c772f55d7665af35979dc27bc70eb372b6865e5fecb6f97c50e13351c352bb54 SHA512 611bad9f174a35c27ffc55efe3544318f992af25a89364c3b64fa1afb4765ebf7aae7d4a83539d9e0038fe4ca8e637bdb5d453f058e64dffc2c45edf2f348dbb DIST tdesktop-5.1.5-full.tar.gz 69533393 BLAKE2B 216000da3449da9a9c2100a1f8399afa05627d2583f39c09c89e054cc1e52b8868619f003226c4f8eb734f34d72ab0286b5f5a23db263b28e56340f87fc965e6 SHA512 61dd2c30e6831506b120615758ec74aeb36de4dfce513ce3862f8f40e4812a2d59524dd37a09e3acbfdc5db1f16d89b15d58a81ab252a34a93215d55d8eac39c +DIST tdesktop-5.2.2-full.tar.gz 69739957 BLAKE2B d8ceb807b2208de2cc185128b851f68f41fbfbeac01106d6e8ec12bfb5bb40eada45eb760e12827718261ecb6eaf52f6e1fa5fcae3a7712737e441774c92b0c8 SHA512 85fde17b0ea225e6ef7842688123381f1703aea460a4d4ecf46a8ac5d062c9d630140fca754c832e98925c71f4c6727233be418e88885e76d8f54386c826878e diff --git a/net-im/telegram-desktop/files/tdesktop-5.2.2-libdispatch.patch b/net-im/telegram-desktop/files/tdesktop-5.2.2-libdispatch.patch new file mode 100644 index 000000000000..dee252c5a7ea --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-5.2.2-libdispatch.patch @@ -0,0 +1,24 @@ +# https://bugs.gentoo.org/881697 +# https://github.com/telegramdesktop/tdesktop/issues/17437 + +--- tdesktop-5.2.0-orig/cmake/external/CMakeLists.txt ++++ tdesktop-5.2.0-full/cmake/external/CMakeLists.txt +@@ -18,7 +18,7 @@ + add_checked_subdirectory(cld3) + endif() + add_checked_subdirectory(crash_reports) +-if (LINUX) ++if (LINUX AND DESKTOP_APP_USE_LIBDISPATCH) + add_checked_subdirectory(dispatch) + endif() + add_checked_subdirectory(expected) +--- tdesktop-5.2.0-orig/cmake/variables.cmake ++++ tdesktop-5.2.0-full/cmake/variables.cmake +@@ -21,6 +21,7 @@ + endif() + + option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON) ++cmake_dependent_option(DESKTOP_APP_USE_LIBDISPATCH "Use libdispatch instead of QThreadPool." OFF LINUX ON) + cmake_dependent_option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration." OFF LINUX ON) + cmake_dependent_option(DESKTOP_APP_USE_ALLOCATION_TRACER "Use simple allocation tracer." OFF LINUX OFF) + cmake_dependent_option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages." OFF LINUX OFF) diff --git a/net-im/telegram-desktop/files/tdesktop-5.2.2-qt6-no-wayland.patch b/net-im/telegram-desktop/files/tdesktop-5.2.2-qt6-no-wayland.patch new file mode 100644 index 000000000000..b411b8e92edd --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-5.2.2-qt6-no-wayland.patch @@ -0,0 +1,86 @@ +Allow disabling wayland integration for Qt6 builds + +Upstream has removed the required toggle for wayland integration, and instead +is forcing it when the program is being built with Qt6 version 6.5.0 or higher. + +Currently this is simple to work around, but its future feasibility remains to +be seen, depending on what upstream thinks about this. + +https://bugs.gentoo.org/928451 +https://github.com/desktop-app/cmake_helpers/commit/a428df5440e76a726abc30924766ac7da0cb381c + +--- a/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp ++++ b/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp +@@ -15,7 +15,7 @@ + namespace base::Platform { + + void RunWithXdgActivationToken(Fn<void(QString)> callback) { +-#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) ++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) + const auto window = QGuiApplication::focusWindow(); + if (!window) { + callback({}); +--- a/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp ++++ b/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp +@@ -414,7 +414,7 @@ + } + #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION + +-#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) ++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) + void ShowWaylandWindowMenu(not_null<QWidget*> widget, const QPoint &point) { + static const auto wl_proxy_marshal_array = [] { + void (*result)( +@@ -544,7 +544,7 @@ + } + + bool WindowMarginsSupported() { +-#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) ++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) + static const auto WaylandResult = [] { + using namespace QNativeInterface::Private; + QWindow window; +@@ -571,7 +571,7 @@ + } + + void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins) { +-#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) ++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) + using namespace QNativeInterface::Private; + const auto window = not_null(widget->windowHandle()); + const auto platformWindow = not_null(window->handle()); +@@ -593,7 +593,7 @@ + } + + void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) { +-#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) ++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) + if (::Platform::IsWayland()) { + ShowWaylandWindowMenu(widget, point); + return; +--- a/cmake/options.cmake ++++ b/cmake/options.cmake +@@ -23,6 +23,13 @@ + ) + endif() + ++if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) ++ target_compile_definitions(common_options ++ INTERFACE ++ DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION ++ ) ++endif() ++ + if (WIN32) + include(cmake/options_win.cmake) + elseif (APPLE) +--- a/cmake/variables.cmake ++++ b/cmake/variables.cmake +@@ -21,6 +21,7 @@ + + option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON) + cmake_dependent_option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration." OFF LINUX ON) ++cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF LINUX ON) + cmake_dependent_option(DESKTOP_APP_USE_ALLOCATION_TRACER "Use simple allocation tracer." OFF LINUX OFF) + cmake_dependent_option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages." OFF LINUX OFF) + option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled patched ones." OFF) diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index 0b48d04a08ee..f910759e757c 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -20,6 +20,7 @@ <use> <flag name="enchant">Use the <pkg>app-text/enchant</pkg> spell-checking backend instead of <pkg>app-text/hunspell</pkg></flag> <flag name="fonts">Use builtin patched copy of open-sans fonts (overrides fontconfig)</flag> + <flag name="libdispatch">Use <pkg>dev-libs/libdispatch</pkg> to speed up concurrent code execution</flag> <flag name="qt6">Build with Qt6 support</flag> <flag name="qt6-imageformats">Add support for HEIF, AVIF and JpegXL by bundling kde-frameworks/kimageformats</flag> </use> diff --git a/net-im/telegram-desktop/telegram-desktop-5.2.2.ebuild b/net-im/telegram-desktop/telegram-desktop-5.2.2.ebuild new file mode 100644 index 000000000000..7ec080b67231 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-5.2.2.ebuild @@ -0,0 +1,260 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +DESCRIPTION="Official desktop client for Telegram" +HOMEPAGE="https://desktop.telegram.org https://github.com/telegramdesktop/tdesktop"; + +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 +libdispatch 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 + libdispatch? ( 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[compositor(+)] + ) + ) + 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,qml] + ) + 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 + "${FILESDIR}"/tdesktop-5.2.2-qt6-no-wayland.patch + "${FILESDIR}"/tdesktop-5.2.2-libdispatch.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. + # QtGui will use find_package to find QtDbus as well, which + # conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method. + 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' + + # https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398 + use !libdispatch && append-cppflags -DCRL_FORCE_QT + + 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_USE_LIBDISPATCH=$(usex libdispatch) + -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 libdispatch; then + ewarn "Disabling USE=libdispatch may cause performance degradation" + ewarn "due to fallback to poor QThreadPool! Please see" + ewarn "https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode"; + 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 +}
