commit: ea71b855554f292967c455867c25dc3f34b13412 Author: Joe Kappus <joe <AT> wt <DOT> gd> AuthorDate: Fri Sep 5 00:21:07 2025 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Fri Sep 5 07:34:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea71b855
net-im/telegram-desktop: add 6.1.2 Fix the linked bug as upstream already accepted the PR. (commit message adjusted by 'dlan') Link: https://github.com/desktop-app/lib_webview/pull/122 Closes: https://bugs.gentoo.org/957879 Signed-off-by: Joe Kappus <joe <AT> wt.gd> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../telegram-desktop/telegram-desktop-6.1.2.ebuild | 230 +++++++++++++++++++++ 2 files changed, 231 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index fedc00b94b67..b595c9d989f0 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -2,3 +2,4 @@ DIST tdesktop-5.12.3-full.tar.gz 72628307 BLAKE2B 2a625d5e71c3a583c7acf1419ff3f3 DIST tdesktop-5.14.3-full.tar.gz 72816906 BLAKE2B 937a52e5eed559616ad680d40a392c97a40886d5d5799e6de976a919a3c30569d4c12ce682f24ab952fa1830f7ddfcc665159e8beb44c9157f3907d5f43b78a1 SHA512 1c8d6f3f858789c716bdaef8ef00896aac07ef8e6792489b80bf162b40db80dc2cf1831335269c4bc12e11c1b6326cbf8ffd40fc9d847c13196f540e15a1978d DIST tdesktop-5.16.2-full.tar.gz 75093485 BLAKE2B 6e4e1849b72827d5e444b18decf8aef80b39cf15a387c789737f657b4e2f498385217bf890b3a24d4fb81e77ac872efd68e01e57f28d3c06794d9f5b6c1ac2ec SHA512 10805dad68c626f322a36426bc8b5593e5915c6a769ace6eecbe52a2e3c89f254d5ffbe0430a6a8df66eaf31d77cae65664221036e21a5fadf039c01c446dea3 DIST tdesktop-6.0.2-full.tar.gz 75218745 BLAKE2B 186850a32049a1750233f46697b798b7f59d4f539b40fd93f518933a380cf5a521dfb81196df5a14b0e8161a3deedc590fe5febe9460a31d7cc963688b8e4776 SHA512 782e2c1f508e9328532622d84ff9c48fac700d3f8022d86b224ac791103e2a534ae0b51c79673102760af0e2a855bee17f3eb7c68662af460617f08a8f073fce +DIST tdesktop-6.1.2-full.tar.gz 75265146 BLAKE2B 035bbfd62c0319a688c60a6f1262ae1c8b3c7c483eb813564deb4821ee5bdc6005f6b911bf1e403cc8fd80fd61beedf134588861a2f0977c2c00f3b1d25fbdd3 SHA512 9de9332da74175aeeaa7639714249200127f2a75e1e8c7ea547a58d5ce2deab2f8f660159651b7c40287b4fef9d71e43130b1cb943bc4b09862958caf5499534 diff --git a/net-im/telegram-desktop/telegram-desktop-6.1.2.ebuild b/net-im/telegram-desktop/telegram-desktop-6.1.2.ebuild new file mode 100644 index 000000000000..1b613f3f8ae3 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-6.1.2.ebuild @@ -0,0 +1,230 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..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 ~loong" +IUSE="dbus enchant +fonts +libdispatch screencast wayland webkit +X" + +CDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + dev-cpp/ada:= + dev-cpp/cld3:= + >=dev-cpp/glibmm-2.77:2.68 + dev-libs/glib:2 + dev-libs/openssl:= + >=dev-libs/protobuf-21.12 + dev-libs/qr-code-generator:= + 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/openal + media-libs/opus + media-libs/rnnoise + >=media-libs/tg_owt-0_pre20241202:=[screencast=,X=] + >=media-video/ffmpeg-4:=[opus,vpx] + net-libs/tdlib:=[tde2e] + sys-libs/zlib:=[minizip] + kde-frameworks/kcoreaddons:6 + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + 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 + 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 ) +" +# NOTE: dev-cpp/expected-lite used indirectly by a dev-cpp/cppgir header file + +PATCHES=( + "${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 [[ ${MERGE_TYPE} != binary ]]; then + 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 + if tc-is-clang && [[ $(tc-get-cxx-stdlib) = libstdc++ ]]; then + ewarn "this package frequently fails to compile with clang" + ewarn "in combination with libstdc++." + ewarn "please use libc++, or build this package with gcc." + ewarn "(if you have a patch or a fix, please open a" + ewarn "bug report about it)" + ewarn + fi + fi +} + +src_prepare() { + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './cmake/external/qt/package.cmake' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' \ + -e '/find_library(/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 + ## These libraries are only used in lib_webview, for wayland + ## See Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=${use_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=${use_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WaylandCompositor=${use_webkit_wayland} + + -DDESKTOP_APP_DISABLE_QT_PLUGINS=ON + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + ## 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) + ## See tdesktop-*-libdispatch.patch + -DDESKTOP_APP_USE_LIBDISPATCH=$(usex libdispatch) + ) + + 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 +} + +src_compile() { + # There's a bug where sometimes, it will rebuild/relink during src_install + # Make sure that happens here, instead. + cmake_build + cmake_build +} + +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 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] +}
