summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAliaksei Urbanski <aliaksei.urbanski@gmail.com>2024-07-07 20:32:03 +0300
committerYixun Lan <dlan@gentoo.org>2024-07-08 23:58:03 +0000
commit78889919f9d5cb472111c32a298628b37096633f (patch)
tree9fab8cf97c7c4bb750815e89b63b4369db37c385 /net-im/telegram-desktop
parentmate-base/mate-settings-daemon: Build needs mate-desktop >= 1.27.1 (diff)
downloadgentoo-78889919f9d5cb472111c32a298628b37096633f.tar.gz
gentoo-78889919f9d5cb472111c32a298628b37096633f.tar.bz2
gentoo-78889919f9d5cb472111c32a298628b37096633f.zip
net-im/telegram-desktop: bump 5.2.2 to 5.2.3, drop 5.1.5
Release: - https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.3 Changelog: - https://github.com/telegramdesktop/tdesktop/blob/v5.2.3/changelog.txt These changes also: - drop abandoned tdesktop-4.10.5-qt_compare.patch Closes: https://github.com/gentoo/gentoo/pull/37476 Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski@gmail.com> Signed-off-by: Yixun Lan <dlan@gentoo.org>
Diffstat (limited to 'net-im/telegram-desktop')
-rw-r--r--net-im/telegram-desktop/Manifest3
-rw-r--r--net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch12
-rw-r--r--net-im/telegram-desktop/telegram-desktop-5.1.5.ebuild249
-rw-r--r--net-im/telegram-desktop/telegram-desktop-5.2.3.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-5.2.2.ebuild)0
4 files changed, 1 insertions, 263 deletions
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index eaa8340857c9..2b24ff1f1ae4 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,3 +1,2 @@
DIST tdesktop-5.0.4-full.tar.gz 69462550 BLAKE2B 46e630ea74c6571e41909bab768ff19e8eaf2246cf624474b1c14d5c598146e0c772f55d7665af35979dc27bc70eb372b6865e5fecb6f97c50e13351c352bb54 SHA512 611bad9f174a35c27ffc55efe3544318f992af25a89364c3b64fa1afb4765ebf7aae7d4a83539d9e0038fe4ca8e637bdb5d453f058e64dffc2c45edf2f348dbb
-DIST tdesktop-5.1.5-full.tar.gz 69533393 BLAKE2B 216000da3449da9a9c2100a1f8399afa05627d2583f39c09c89e054cc1e52b8868619f003226c4f8eb734f34d72ab0286b5f5a23db263b28e56340f87fc965e6 SHA512 61dd2c30e6831506b120615758ec74aeb36de4dfce513ce3862f8f40e4812a2d59524dd37a09e3acbfdc5db1f16d89b15d58a81ab252a34a93215d55d8eac39c
-DIST tdesktop-5.2.2-full.tar.gz 69739957 BLAKE2B d8ceb807b2208de2cc185128b851f68f41fbfbeac01106d6e8ec12bfb5bb40eada45eb760e12827718261ecb6eaf52f6e1fa5fcae3a7712737e441774c92b0c8 SHA512 85fde17b0ea225e6ef7842688123381f1703aea460a4d4ecf46a8ac5d062c9d630140fca754c832e98925c71f4c6727233be418e88885e76d8f54386c826878e
+DIST tdesktop-5.2.3-full.tar.gz 69745773 BLAKE2B a6811098d2e0f8d0ebc0d7ac4d392981ff600544d31eb38a72b208778a69462d241122f8ff74b3a8b730d7a1221b78febb0ea9f641872992a830d9c805555c39 SHA512 5d5bf1f5c35af11b2adf7db075832e7cca5768c2c5f82d9fc5054b9d45f964a3520eb88864aefc3de593ce1359534b210b1e5d89495819e7386f6ca15fd4a15c
diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch b/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch
deleted file mode 100644
index f481ddd74d7c..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Telegram/lib_base/base/qt/qt_compare.h b/Telegram/lib_base/base/qt/qt_compare.h
-index ca03fa2..d1eb6ab 100644
---- a/Telegram/lib_base/base/qt/qt_compare.h
-+++ b/Telegram/lib_base/base/qt/qt_compare.h
-@@ -10,6 +10,7 @@
- #include <gsl/pointers>
-
- #include <QString>
-+#include <variant>
-
- #if !defined(__apple_build_version__) || (__apple_build_version__ > 12000032)
-
diff --git a/net-im/telegram-desktop/telegram-desktop-5.1.5.ebuild b/net-im/telegram-desktop/telegram-desktop-5.1.5.ebuild
deleted file mode 100644
index 144d4ae03052..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-5.1.5.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# 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"
-
-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 ~loong ~ppc64 ~riscv"
-IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X"
-REQUIRED_USE="
- qt6-imageformats? ( qt6 )
-"
-
-KIMAGEFORMATS_RDEPEND="
- media-libs/libavif:=
- media-libs/libheif:=
- >=media-libs/libjxl-0.8.0:=
-"
-CDEPEND="
- !net-im/telegram-desktop-bin
- app-arch/lz4:=
- dev-cpp/abseil-cpp:=
- >=dev-cpp/glibmm-2.77:2.68
- dev-libs/glib:2
- dev-libs/libdispatch
- dev-libs/openssl:=
- dev-libs/protobuf
- dev-libs/xxhash
- 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_pre20230921:=[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:= )
- !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? (
- >=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? (
- >=dev-qt/qtdeclarative-6.5:6
- >=dev-qt/qtwayland-6.5:6[compositor,qml]
- )
- qt6-imageformats? (
- >=dev-qt/qtimageformats-6.5:6=
- ${KIMAGEFORMATS_RDEPEND}
- )
- )
- 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
- 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.0.1-qt6-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() {
- # 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.
-
- # 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
-
- 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'
-
- 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=$(usex !webkit)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
- ## Only used in Telegram/lib_webview/CMakeLists.txt
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit)
- ## KF6CoreAddons is currently unavailable in ::gentoo
- -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
-
- -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 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
- if ! use qt6; then
- optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
- fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-5.2.2.ebuild b/net-im/telegram-desktop/telegram-desktop-5.2.3.ebuild
index 7ec080b67231..7ec080b67231 100644
--- a/net-im/telegram-desktop/telegram-desktop-5.2.2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-5.2.3.ebuild