summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorEsteve Varela Colominas <esteve.varela@gmail.com>2023-07-14 02:04:23 +0200
committerSam James <sam@gentoo.org>2023-07-15 17:24:56 +0100
commit8a5a0205dc4f55b099c6ccffd6599458a154dd78 (patch)
tree4a8947f0884e604aa5bc024181f8073d1fd0964d /net-im
parentnet-im/telegram-desktop: Add SLOT rebuilds for Qt (diff)
downloadgentoo-8a5a0205dc4f55b099c6ccffd6599458a154dd78.tar.gz
gentoo-8a5a0205dc4f55b099c6ccffd6599458a154dd78.tar.bz2
gentoo-8a5a0205dc4f55b099c6ccffd6599458a154dd78.zip
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 <esteve.varela@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31538 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-im')
-rw-r--r--net-im/telegram-desktop/files/tdesktop-4.8.4-remove-private-qt.patch50
-rw-r--r--net-im/telegram-desktop/telegram-desktop-4.8.4-r2.ebuild227
2 files changed, 277 insertions, 0 deletions
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 <QtGui/QWindow>
+ #include <QtGui/QtEvents>
+-#include <private/qwidget_p.h>
+-
+-class TWidgetPrivate : public QWidgetPrivate {
+-public:
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+- QPlatformBackingStoreRhiConfig rhiConfig() const override {
+- const auto q = static_cast<TWidget*>(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<QWidget>(*(new TWidgetPrivate), parent, {}) {
++: TWidgetHelper<QWidget>(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 '<dev-qt/qtcore-5.15.2-r10'; then
+ ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
+ ewarn "to crash when pasting big images from the clipboard."
+ 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 qt6; then
+ ewarn "Qt6 support in gentoo is experimental."
+ ewarn "Please report any issues you may find, but don't expect"
+ ewarn "everything to work correctly as of yet."
+ 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
+ optfeature "shop payment support" net-libs/webkit-gtk:4
+ if ! use qt6; then
+ optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
+ fi
+}