From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1425415800A for ; Sat, 15 Jul 2023 16:25:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28551E088F; Sat, 15 Jul 2023 16:25:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 099B8E088F for ; Sat, 15 Jul 2023 16:25:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DEE6D335D6E for ; Sat, 15 Jul 2023 16:25:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FA53AFA for ; Sat, 15 Jul 2023 16:25:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1689438296.8a5a0205dc4f55b099c6ccffd6599458a154dd78.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/, net-im/telegram-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop/files/tdesktop-4.8.4-remove-private-qt.patch net-im/telegram-desktop/telegram-desktop-4.8.4-r2.ebuild X-VCS-Directories: net-im/telegram-desktop/ net-im/telegram-desktop/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8a5a0205dc4f55b099c6ccffd6599458a154dd78 X-VCS-Branch: master Date: Sat, 15 Jul 2023 16:25:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e9f1d71f-91b3-4318-9aa4-b2c2e2416453 X-Archives-Hash: 4d2a5b08728e301b5faf348722bacaff commit: 8a5a0205dc4f55b099c6ccffd6599458a154dd78 Author: Esteve Varela Colominas gmail com> AuthorDate: Fri Jul 14 00:04:23 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 15 16:24:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5a0205 net-im/telegram-desktop: Remove dependency on private Qt components Closes: https://bugs.gentoo.org/908500 Thanks-to: ZetaCorvi protonmail.com Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31538 Signed-off-by: Sam James gentoo.org> .../files/tdesktop-4.8.4-remove-private-qt.patch | 50 +++++ .../telegram-desktop-4.8.4-r2.ebuild | 227 +++++++++++++++++++++ 2 files changed, 277 insertions(+) diff --git a/net-im/telegram-desktop/files/tdesktop-4.8.4-remove-private-qt.patch b/net-im/telegram-desktop/files/tdesktop-4.8.4-remove-private-qt.patch new file mode 100644 index 000000000000..3dcf17662564 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.8.4-remove-private-qt.patch @@ -0,0 +1,50 @@ +Remove uses of private Qt classes + +Currently, this is used to fix compatibility with odd environments, and only +for Qt6. This causes more trouble than it's worth, because it means telegram +must be rebuilt with every minor Qt bump. + +https://bugs.gentoo.org/908500 + +--- tdesktop-4.8.4-full.orig/Telegram/lib_ui/ui/rp_widget.cpp ++++ tdesktop-4.8.4-full/Telegram/lib_ui/ui/rp_widget.cpp +@@ -12,38 +12,9 @@ + + #include + #include +-#include +- +-class TWidgetPrivate : public QWidgetPrivate { +-public: +-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) +- QPlatformBackingStoreRhiConfig rhiConfig() const override { +- const auto q = static_cast(q_ptr); +- if (!q->testAttribute(Qt::WA_WState_Created)) { +- return QWidgetPrivate::rhiConfig(); +- } +- if (const auto config = q->rhiConfig()) { +- return *config; +- } +- if (::Platform::IsMac10_14OrGreater()) { +- return { QPlatformBackingStoreRhiConfig::Metal }; +- } +- // We can't specify the widget here as q_evaluateRhiConfig is called +- // in QWidgetWindow constructor, while windowHandle is set right after +- // the constructor is completed +- if (::Platform::IsWayland() // old versions of mutter produce flicker without OpenGL +- && Ui::GL::ChooseBackendDefault( +- Ui::GL::CheckCapabilities(nullptr)) +- == Ui::GL::Backend::OpenGL) { +- return { QPlatformBackingStoreRhiConfig::OpenGL }; +- } +- return QWidgetPrivate::rhiConfig(); +- } +-#endif // Qt >= 6.4.0 +-}; + + TWidget::TWidget(QWidget *parent) +-: TWidgetHelper(*(new TWidgetPrivate), parent, {}) { ++: TWidgetHelper(parent, {}) { + [[maybe_unused]] static const auto Once = [] { + auto format = QSurfaceFormat::defaultFormat(); + format.setSwapInterval(0); diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.4-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.4-r2.ebuild new file mode 100644 index 000000000000..c58885293abd --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.8.4-r2.ebuild @@ -0,0 +1,227 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +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 ~riscv" +IUSE="enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X" +REQUIRED_USE=" + qt6-imageformats? ( qt6 ) +" + +KIMAGEFORMATS_RDEPEND=" + media-libs/libavif:= + media-libs/libheif:= + media-libs/libjxl +" +RDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + >=dev-cpp/glibmm-2.76:2.68 + dev-libs/glib:2 + dev-libs/libdispatch + dev-libs/libsigc++:2 + dev-libs/openssl:= + dev-libs/protobuf + dev-libs/xxhash + media-libs/fontconfig:= + 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_pre20230428:=[screencast=,X=] + media-video/ffmpeg:=[opus,vpx] + sys-libs/zlib:=[minizip] + virtual/opengl + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) + !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:= + ) + qt6? ( + dev-qt/qtbase:6[dbus,gui,network,opengl,widgets,X?] + dev-qt/qtimageformats:6 + dev-qt/qtsvg:6 + wayland? ( dev-qt/qtwayland:6 ) + qt6-imageformats? ( + dev-qt/qtimageformats:6= + ${KIMAGEFORMATS_RDEPEND} + ) + ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-keysyms + ) +" +DEPEND="${RDEPEND} + dev-cpp/cppgir + >=dev-cpp/ms-gsl-4 + dev-cpp/range-v3 +" +BDEPEND=" + ${PYTHON_DEPS} + dev-cpp/cppgir + >=dev-util/cmake-3.16 + dev-util/gdbus-codegen + virtual/pkgconfig +" +# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 + +PATCHES=( + "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch" + "${FILESDIR}/tdesktop-4.8.4-system-cppgir.patch" + "${FILESDIR}/tdesktop-4.8.3-fix-clang.patch" + "${FILESDIR}/tdesktop-4.8.4-remove-private-qt.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 "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 +} + +pkg_setup() { + # Having inaccessible paths sneak into the build environment through the + # XDG_DATA_DIRS variable breaks cppgir. + # bug 909038 + unset XDG_DATA_DIRS +} + +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, see: + # cmake/external/kcoreaddons/CMakeLists.txt + + # Happily fail if libraries aren't found... + find -type f -name 'CMakeLists.txt' \ + \! -path "./cmake/external/expected/CMakeLists.txt" \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + + cmake_src_prepare +} + +src_configure() { + # 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' + + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. + -DQT_VERSION_MAJOR=$(usex qt6 6 5) + + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) + -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) # use system fonts instead of bundled ones + ) + + 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 has_version '