commit: fad903c4f7e78d0280ac76ea3578693260847e15 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Sun Dec 14 23:21:06 2025 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Tue Dec 16 01:42:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad903c4
net-im/telegram-desktop: Drop old Closes: https://github.com/gentoo/gentoo/pull/45029 Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> net-im/telegram-desktop/Manifest | 1 - .../files/tdesktop-5.12.3-fix-webview.patch | 34 --- .../telegram-desktop-6.0.2-r1.ebuild | 231 --------------------- 3 files changed, 266 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 672aa4f6ee1f..5d1ecdf6fe03 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,2 @@ -DIST tdesktop-6.0.2-full.tar.gz 75218745 BLAKE2B 186850a32049a1750233f46697b798b7f59d4f539b40fd93f518933a380cf5a521dfb81196df5a14b0e8161a3deedc590fe5febe9460a31d7cc963688b8e4776 SHA512 782e2c1f508e9328532622d84ff9c48fac700d3f8022d86b224ac791103e2a534ae0b51c79673102760af0e2a855bee17f3eb7c68662af460617f08a8f073fce DIST tdesktop-6.2.4-full.tar.gz 75402815 BLAKE2B 92e6abc5e7f1bb91dd5ab3eb8104d22b2d8f8f40b69a310589c7d78fff2b044431ccab7fa5a2195ab37cf0b6ffe516d95b70b57265cfb458d74c13eecabf7006 SHA512 8cbeb3ff205959a26c6b2da71984c01584207645eb73b4548f77ecd487f3cef6c27d5be7c730e9c0e046ac4327b551f7e740ffe138028b1a3247640431f6c3d8 DIST tdesktop-6.3.8-full.tar.gz 76325345 BLAKE2B b530ace0af4ce2fbc5519e0e3b5cabbbd74f80508f22d85923d3d4ab13b31a0a5e3d5419d76102a88072b9ff8a529572eb648fbacd3e9beb2f65c07d03dc6810 SHA512 9267a4718cbf3bd8753cebf84c0f2775de838c2e977ba2b933e7e056b9e6bbabfc85fc7652813d71df340956e00d6de34815d3a303928284090aae1db7c67c2b diff --git a/net-im/telegram-desktop/files/tdesktop-5.12.3-fix-webview.patch b/net-im/telegram-desktop/files/tdesktop-5.12.3-fix-webview.patch deleted file mode 100644 index fa50da2627fd..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-5.12.3-fix-webview.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix error in building with USE=webkit - -In file included from /var/tmp/portage/net-im/telegram-desktop-5.12.3-r2/work/tdesktop-5.12.3-full/Telegram/lib_webview/webview/webview_dialog.cpp:13: -/var/tmp/portage/net-im/telegram-desktop-5.12.3-r2/work/tdesktop-5.12.3-full/Telegram/lib_ui/ui/widgets/buttons.h:276:3: error: unknown type name 'nullptr_t'; did you mean 'std::nullptr_t'? - 276 | nullptr_t, - | ^~~~~~~~~ - | std::nullptr_t -/usr/lib/gcc/x86_64-pc-linux-gnu/14/include/g++-v14/x86_64-pc-linux-gnu/bits/c++config.h:314:29: note: 'std::nullptr_t' declared here - 314 | typedef decltype(nullptr) nullptr_t; - | ^ -1 error generated. - ---- tdesktop-5.12.3-full.orig/Telegram/lib_ui/ui/widgets/buttons.cpp -+++ tdesktop-5.12.3-full/Telegram/lib_ui/ui/widgets/buttons.cpp -@@ -795,7 +795,7 @@ - - SettingsButton::SettingsButton( - QWidget *parent, -- nullptr_t, -+ std::nullptr_t, - const style::SettingsButton &st) - : RippleButton(parent, st.ripple) - , _st(st) ---- tdesktop-5.12.3-full.orig/Telegram/lib_ui/ui/widgets/buttons.h -+++ tdesktop-5.12.3-full/Telegram/lib_ui/ui/widgets/buttons.h -@@ -273,7 +273,7 @@ - const style::SettingsButton &st = st::defaultSettingsButton); - SettingsButton( - QWidget *parent, -- nullptr_t, -+ std::nullptr_t, - const style::SettingsButton &st = st::defaultSettingsButton); - ~SettingsButton(); - diff --git a/net-im/telegram-desktop/telegram-desktop-6.0.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-6.0.2-r1.ebuild deleted file mode 100644 index 6a074cbcff56..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-6.0.2-r1.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# 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] - virtual/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-1.82.0-r2 - 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 - 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="${ESYSROOT}/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 no_webkit_wayland=$(use webkit && use wayland && echo no || echo yes) - 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=${no_webkit_wayland} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=${no_webkit_wayland} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WaylandCompositor=${no_webkit_wayland} - - # Make sure dependencies that aren't patched to be REQUIRED in - # src_prepare, are found. This was suggested to me by the telegram - # devs, in lieu of having explicit flags in the build system. - -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6DBus=$(usex dbus) - -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick=${use_webkit_wayland} - -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets=${use_webkit_wayland} - -DCMAKE_REQUIRE_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] -}
