commit: a1e299000467c4d12870893f671db4525811c5b5 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Wed May 21 19:40:14 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 21 20:51:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e29900
net-im/telegram-desktop: Bump to 5.14.3 Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42194 Signed-off-by: Sam James <sam <AT> gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../files/tdesktop-5.14.3-system-cppgir.patch | 31 +++ .../telegram-desktop-5.14.3.ebuild | 222 +++++++++++++++++++++ 3 files changed, 254 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 1cb581ca929a..78f918df018d 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,3 @@ DIST tdesktop-5.12.3-full.tar.gz 72628307 BLAKE2B 2a625d5e71c3a583c7acf1419ff3f31173446a1475514e981c6483aa18a88ff7e1aa57252412bab3c3e9b162bc9ac6286718f2c96c2f0758f635678086469a99 SHA512 cd366f6cecfc72396ae2b8453d015e85f1f579c60212f0b77f84057ba6caf6aa97d7ed08fde2ab8bf2f29017fdd7c0b617392ec74537be4f8445ef81ea135e5c DIST tdesktop-5.13.1-full.tar.gz 72699182 BLAKE2B 85e6e29be38f72d9171c530ba8a1a04661ed5a6deb1b66a8f4a1120ffe5d43844aedbc21e5c7bfa78f3893939777e37b8dc9a32541118da9164ee0faa6afede0 SHA512 6d15ad0641e0e47e4d48869885c63e6d1ddbfb5461c121cf33ac77d231a6fc77a6eb5333ad7b76d3aa2e1111d9a5f58846fae83cd36886838d6791dbfaa65929 +DIST tdesktop-5.14.3-full.tar.gz 72816906 BLAKE2B 937a52e5eed559616ad680d40a392c97a40886d5d5799e6de976a919a3c30569d4c12ce682f24ab952fa1830f7ddfcc665159e8beb44c9157f3907d5f43b78a1 SHA512 1c8d6f3f858789c716bdaef8ef00896aac07ef8e6792489b80bf162b40db80dc2cf1831335269c4bc12e11c1b6326cbf8ffd40fc9d847c13196f540e15a1978d diff --git a/net-im/telegram-desktop/files/tdesktop-5.14.3-system-cppgir.patch b/net-im/telegram-desktop/files/tdesktop-5.14.3-system-cppgir.patch new file mode 100644 index 000000000000..a6da5fd1a9c8 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-5.14.3-system-cppgir.patch @@ -0,0 +1,31 @@ +Use system cppgir + +https://github.com/desktop-app/cmake_helpers/issues/282 +https://github.com/desktop-app/cmake_helpers/pull/305 +--- tdesktop-5.14.3-full.orig/cmake/external/glib/CMakeLists.txt ++++ tdesktop-5.14.3-full/cmake/external/glib/CMakeLists.txt +@@ -7,13 +7,6 @@ + add_library(external_glib INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_glib ALIAS external_glib) + +-block() +- set(BUILD_TESTING OFF) +- set(BUILD_DOC OFF) +- set(BUILD_EXAMPLES OFF) +- add_subdirectory(cppgir EXCLUDE_FROM_ALL) +-endblock() +- + include(generate_cppgir.cmake) + generate_cppgir(external_glib Gio-2.0) + +--- tdesktop-5.14.3-full.orig/cmake/external/glib/generate_cppgir.cmake ++++ tdesktop-5.14.3-full/cmake/external/glib/generate_cppgir.cmake +@@ -4,6 +4,8 @@ + # For license and copyright information please follow this link: + # https://github.com/desktop-app/legal/blob/master/LEGAL + ++find_package(CppGir REQUIRED) ++ + function(generate_cppgir target_name gir) + set(cppgir_loc ${cmake_helpers_loc}/external/glib/cppgir) + diff --git a/net-im/telegram-desktop/telegram-desktop-5.14.3.ebuild b/net-im/telegram-desktop/telegram-desktop-5.14.3.ebuild new file mode 100644 index 000000000000..1a3e3d7fcbc1 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-5.14.3.ebuild @@ -0,0 +1,222 @@ +# Copyright 2020-2025 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" +IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast wayland webkit +X" + +CDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + dev-cpp/ada:= + >=dev-cpp/glibmm-2.77:2.68 + dev-libs/glib:2 + dev-libs/openssl:= + >=dev-libs/protobuf-21.12 + dev-libs/xxhash + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,ssl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + media-libs/libjpeg-turbo:= + ~media-libs/libtgvoip-2.4.4_p20240706 + media-libs/openal + media-libs/opus + media-libs/rnnoise + >=media-libs/tg_owt-0_pre20241202:=[screencast=,X=] + >=media-video/ffmpeg-6:=[opus,vpx] + net-libs/tdlib:=[tde2e] + sys-libs/zlib:=[minizip] + kde-frameworks/kcoreaddons:6 + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + jemalloc? ( dev-libs/jemalloc:= ) + libdispatch? ( dev-libs/libdispatch ) + webkit? ( wayland? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor,qml] + ) ) + 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.1.0 + dev-cpp/expected-lite + dev-cpp/range-v3 +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/cmake-3.16 + >=dev-cpp/cppgir-2.0_p20240315 + dev-libs/gobject-introspection + dev-util/gdbus-codegen + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}"/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch + "${FILESDIR}"/tdesktop-5.2.2-qt6-no-wayland.patch + "${FILESDIR}"/tdesktop-5.2.2-libdispatch.patch + "${FILESDIR}"/tdesktop-5.7.2-cstring.patch + "${FILESDIR}"/tdesktop-5.8.3-cstdint.patch + "${FILESDIR}"/tdesktop-5.12.3-fix-webview.patch + "${FILESDIR}"/tdesktop-5.14.3-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() { + # 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. + + # Some packages are found through pkg_check_modules, rather than find_package + sed -e '/find_package(lz4 /d' -i cmake/external/lz4/CMakeLists.txt || die + sed -e '/find_package(Opus /d' -i cmake/external/opus/CMakeLists.txt || die + sed -e '/find_package(xxHash /d' -i cmake/external/xxhash/CMakeLists.txt || die + + # 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 + + # Control automagic dep only needed when USE="webkit wayland" + if ! use webkit || ! use wayland; then + sed -e 's/QT_CONFIG(wayland_compositor_quick)/0/' \ + -i Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h || 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 use_webkit_wayland=$(use webkit && use wayland && echo yes || echo no) + local mycmakeargs=( + -DQT_VERSION_MAJOR=6 + + # 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_Qt6Quick=${use_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=${use_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WaylandClient=$(usex !wayland) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WaylandCompositor=${use_webkit_wayland} + + -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 + optfeature_header + optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:6[avif,heif,jpegxl] +}
