mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
net-im/telegram-desktop: Bump to 5.8.3
Closes: https://bugs.gentoo.org/944793 Thanks-to: Stephan Litterst <stephan.litterst@googlemail.com> Signed-off-by: Esteve Varela Colominas <esteve.varela@gmail.com> Signed-off-by: Yixun Lan <dlan@gentoo.org>
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
DIST tdesktop-5.5.5-full.tar.gz 70112426 BLAKE2B 21cdb01d66ea1d1b7479995d790fc44d65248c807dafb25d865970a0d619483ccccd99c8d64b6853d8aa29c78c73010f14e720bf707c918e7c3bb5cb2428dde5 SHA512 88cd526fb02b7b0459cb1bd1b0c57147b2261e57c392d2cb62964015ef6b26e202fba717b35d74201c41becf0a5d78ef4d9d593b5666b3f0a0db646e40bfd1fc
|
||||
DIST tdesktop-5.6.3-full.tar.gz 70333924 BLAKE2B a42ded12ef7403153e36073cec5b1343d7c4f5e6db0db561b9df4db7f59157dcf57d5c487fbb6543305cdb1c4b4e772e1fd21037f79570f26fbc9bdc4522c4ee SHA512 0cce16f780f1350199d8a10a9eff6e8052888aede5d3839d3435acdfb34f445098ec24cac21d1950f704350c22bec86020e6c746706bb34c5533e2086e6cb597
|
||||
DIST tdesktop-5.7.2-full.tar.gz 70396886 BLAKE2B 5e592e06f5c85290d06deb1ecef8e18bdafd5de3205046ddf0ca2574d480e95d3c81db55c0955d05251d9df3cf558edec9681603cdb0e85f39e2dac44f1c53d0 SHA512 55fa4f20ceae71f2b869c00abdcf6a27f505156f7b254e38a68a97ea34b09e2e9deeef1fec6c5633e93043fb2e9e9ea72502ec9daeed319c8de65cbe825ca916
|
||||
DIST tdesktop-5.8.3-full.tar.gz 70450970 BLAKE2B 475d70beaf08898d69888a7484409886f894f2327eaae3027b22d10bf0926369542141a959474f74c7a1bb7c50c8981f407a7695e363708dbdb32c4eed393d9a SHA512 272c677544fdca4e2a7e24a5821fb0e99f9caef4388d577c47442351ff1939837163fb2d83a2ec929b92c60197608ed968b5f98b180735218b6cf57cdd501327
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
Fix failure when building webkit without wayland support
|
||||
|
||||
--- tdesktop-5.8.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.cpp
|
||||
+++ tdesktop-5.8.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.cpp
|
||||
@@ -730,9 +730,11 @@
|
||||
|
||||
void Instance::setOpaqueBg(QColor opaqueBg) {
|
||||
if (_remoting) {
|
||||
+#ifdef DESKTOP_APP_WEBVIEW_WAYLAND_COMPOSITOR
|
||||
if (const auto widget = qobject_cast<QQuickWidget*>(_widget.get())) {
|
||||
widget->setClearColor(opaqueBg);
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (!_helper) {
|
||||
return;
|
||||
@@ -0,0 +1,242 @@
|
||||
# Copyright 2020-2024 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 ~arm64 ~riscv"
|
||||
IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast qt6 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
|
||||
dev-libs/xxhash
|
||||
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_pre20240804:=[screencast=,X=]
|
||||
media-video/ffmpeg:=[opus,vpx]
|
||||
sys-libs/zlib:=[minizip]
|
||||
!enchant? ( >=app-text/hunspell-1.7:= )
|
||||
enchant? ( app-text/enchant:= )
|
||||
jemalloc? ( dev-libs/jemalloc:= )
|
||||
libdispatch? ( dev-libs/libdispatch )
|
||||
!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:5
|
||||
webkit? ( wayland? (
|
||||
>=dev-qt/qtdeclarative-5.15:5
|
||||
>=dev-qt/qtwayland-5.15:5[compositor(+)]
|
||||
) )
|
||||
)
|
||||
qt6? (
|
||||
>=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?]
|
||||
>=dev-qt/qtimageformats-6.5:6
|
||||
>=dev-qt/qtsvg-6.5:6
|
||||
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-util/gdbus-codegen
|
||||
virtual/pkgconfig
|
||||
wayland? ( dev-util/wayland-scanner )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
|
||||
"${FILESDIR}"/tdesktop-4.10.0-system-cppgir.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-webkit-no-wayland.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.
|
||||
|
||||
# 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/Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h
|
||||
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 qt=$(usex qt6 6 5)
|
||||
local mycmakeargs=(
|
||||
-DQT_VERSION_MAJOR=${qt}
|
||||
|
||||
# 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_Qt${qt}Quick=${use_webkit_wayland}
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=${use_webkit_wayland}
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=${use_webkit_wayland}
|
||||
## KF6CoreAddons is currently unavailable in ::gentoo
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
|
||||
|
||||
-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
|
||||
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
|
||||
optfeature_header
|
||||
if ! use qt6; then
|
||||
optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:5[avif,heif,jpegxl]
|
||||
else
|
||||
optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:6[avif,heif,jpegxl]
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user