diff options
Diffstat (limited to 'net-im/telegram-desktop')
| -rw-r--r-- | net-im/telegram-desktop/Manifest | 9 | ||||
| -rw-r--r-- | net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-2.patch | 28 | ||||
| -rw-r--r-- | net-im/telegram-desktop/metadata.xml | 1 | ||||
| -rw-r--r-- | net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild | 211 | ||||
| -rw-r--r-- | net-im/telegram-desktop/telegram-desktop-4.7.1.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-4.5.3.ebuild) | 17 |
5 files changed, 10 insertions, 256 deletions
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 84d8260e136c..53a22aa9b80e 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,10 +1,7 @@ AUX tdesktop-4.2.4-jemalloc-only-telegram.patch 1309 BLAKE2B c6ed3e2cfcce9540e367fb90fcaacab81fa6dbb150be7207634facfef77361b830175e4e5e2781d884f101833fde022f496b7c39702d97990de4d16585b5c33d SHA512 83d8c3eaafc2947fbe3555d9acf5c78ad07e89009b89f05908dc5cd088652063766c297e4b726ee69423b15804faf79f52815405b09bba554538e664a99ce0e7 -AUX tdesktop-4.3.4-qt5-incompatibility-2.patch 1325 BLAKE2B 0a74bb545024dbd4df62d52a7603f7a3b28b827940900f4338d6c05ac148ddaf2dcb6cefb8ff3905c737e7e330b896e493334f1dd114341d6818b1aec6e8469a SHA512 254acfe8b8cec69df629759f025ff1c979f609b0fa591a4137c96e9e726782049e4b6a799755b9e50ffffe6d0a26ca3211d4c12e28c7bacd07605b028235e474 AUX tdesktop-4.4.1-fix-dupe-main-decl.patch 853 BLAKE2B 6a3ce346467a3b6450674a77157f3fa45d9e1991160ce33e9cc58292a8441310468943225d5d5b2ba5e5c23feaba544d52f19c964130a8e8c724a99392072abe SHA512 edaad94a901181f0bca4a64b4ab2277a247073005b351156df02532dfff470a4060e6b709197da0778b5484d39a4c1bc1f75e9df068872d68209dd47eca9ac54 -DIST tdesktop-4.4.1-full.tar.gz 50077498 BLAKE2B 6196c474c0771197c56b386bbfd67e4a014569cb8bd9676990e323005f06cb6938aad0c0dd00fd74cab9fca1ac50c7bf7227f34aa39ae598b4f003199fa8cd00 SHA512 91038f0a615ef7ae1050cbfa614041a3d6a45fdbd26d120ef98cca3c31377612c3bb1e80f9aff58c4853a1726bf2cfb427f752a4f88a796f05b381516c981563 -DIST tdesktop-4.5.3-full.tar.gz 63718129 BLAKE2B 85492ad92ea2643dd5e74c831609a4f7be9671648d2b542c24f415dbb19b66521ccecb2a545eadfbf9fa7f934d35d32de085b5b8403dce54bed0b85c54ea98fe SHA512 58a9c5d096e236090347388e1ed480527f841045a80771079dc0c3e35e12ce8ac11753987e87bb57870d9bd8488fc6a4734114648ecec7823d8544744b06c6b1 DIST tdesktop-4.6.5-full.tar.gz 63793549 BLAKE2B a425aaf8d1f1c633b3b8ddacff5bb7cc26e6063d4238413fea76db6a4608497d229061a614c79464373e7f1aa3bb854d9718083638e119538e989a202741b3d6 SHA512 4a337e375d7746cb1fa652f5851f8be5718b7b9d9676bba8ab040489b8492b2a665a51848adba28117a910789aa942c386318a01f6c99b4caa12a1eac682c780 -EBUILD telegram-desktop-4.4.1.ebuild 6663 BLAKE2B 2052b75ff309abefcee5bcdc09fb44eefe23590f4364b0ef43818b290ae67eb3df5fef4ecefbbb5b488921e71bbfa9b9185a964aa5aca03ff0529daddd136e38 SHA512 eb90ddcb2eeae86810fb384d648f9e0c01098495c8051e6de5d5caff13ae180a73bd519885c751f23235c2c79932e3d9da7cc14d44f77a3e8a4360fe56186556 -EBUILD telegram-desktop-4.5.3.ebuild 6606 BLAKE2B dace4440f9c9c27afe7295d3414f63f457d75eeb730cb2438ad1d2a76d6061b73cee57ee964460946fed6946f10fc5f1e84f29bd612554f311b615de776feb2a SHA512 dada58163e4f6f0163ab50f090f40887a3d4bb55d386112d368518cb8e4a297c43190b70eae5b0efcca5012cdb35a05ba58bcad74a1427c7887657e7248b41ee +DIST tdesktop-4.7.1-full.tar.gz 63990659 BLAKE2B 0d734dd5a5aebdafbef68d80249b88502a0ea77e37399603a42b86170e51b87dc0dc005d844a6e6c5e28f79880ae574695b70c14d9075cefcfeb8f7d95088a4f SHA512 1e83bcb56cbc84d1d7385b81b411273f4d26235ecff41b288fccfab75a848f80a80fff063212fc058a2ec923bf48a366311c7ccd678b079861ac15702a993f64 EBUILD telegram-desktop-4.6.5.ebuild 6473 BLAKE2B 1d7eb299b8d73fced8f786fc125b9de39855e04d016871a0cecf4f7c299d10c028e4a6f3a0de0fe7b104264c4eb06cede3f850b88a144e95d9ac183a46241a99 SHA512 86e54a6a8909d5123f3fef8d1e209d9e824fe7cbb345520a0f80c670fec6ea7be8d3456e23c69386af0e34fc563438cb446d1e96dff26f4402982340304caad8 -MISC metadata.xml 1159 BLAKE2B 3149bba4d7156a497b85b472a94bd1eaf9cd7b32a40ca70a34e9a3b7ec50dd0b683bb02a693a9cfe4bd7cb22ba01084c70cef45ebb9cfc30f00aa17395d0f05d SHA512 2a1dc65dea055a5ec71a3d9790153d2df35c699752dac6656708bd1ccf95f8b12918c2ba272b6fe5473583d6a8b4c8b0a72eaa5c48fad043add16ee1c78061ca +EBUILD telegram-desktop-4.7.1.ebuild 6500 BLAKE2B 957b193190d36453997d08c360bf50021f99f4e48129ae0fae365abad403e100afacf163ca16c7d29ca44f1be179d24bd16df33a628b6b996347ec4f720a56c0 SHA512 7c9fcf7c15d832072cfdc96527a310e97e34869fa5790d53b802c73b42f4240b80575e4bdfe41ea4b06c4918edd97d3c42054c8b9ee93f465d077e25cfcea2ab +MISC metadata.xml 1054 BLAKE2B 20fe1b580b85d3e99165e627333e149736892180357b195a66fce92d7113ec7848141937f946519f1a16ca56f0776d9864acde54463038444e97cfff06420f09 SHA512 17598d2d8ee26ddbe7e250e35d010109567924ac63206d307844be204e0ec2f70117519e186f4baa90dedbd0cf1f03f837ff50d44440732aa5e1822f8838ea75 diff --git a/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-2.patch b/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-2.patch deleted file mode 100644 index ae5c84763c8d..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -Disable unused incompatible overload with qt5 - -Neither Qt nore C++ are my forte, but this code is unused with the packaged -distro version, anyway. - -/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp: In lambda function: -/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp:705:74: error: call of overloaded ‘arg(QByteArray&)’ is ambiguous - 705 | return qsl("org.telegram.desktop.%1.desktop").arg(md5Hash); - | ^ - ---- tdesktop-4.3.4-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ tdesktop-4.3.4-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -692,6 +692,7 @@ - + qsl(".desktop"); - } - -+#if !(defined(TDESKTOP_DISABLE_AUTOUPDATE) && QT_VERSION < QT_VERSION_CHECK(6, 2, 0)) - if (!Core::UpdaterDisabled()) { - QByteArray md5Hash(h); - if (!Launcher::Instance().customWorkingDir()) { -@@ -706,6 +707,7 @@ - - return qsl("org.telegram.desktop.%1.desktop").arg(md5Hash); - } -+#endif // !(defined(TDESKTOP_DISABLE_AUTOUPDATE) && QT_VERSION < QT_VERSION_CHECK(6, 2, 0)) - - return qsl("org.telegram.desktop.desktop"); - }()); diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index cd141868ce56..f99bd5fb5e94 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -11,7 +11,6 @@ </maintainer> <use> <flag name="enchant">Use the <pkg>app-text/aspell</pkg> spell-checking backend instead of <pkg>app-text/hunspell</pkg></flag> - <flag name="hunspell">Enable the <pkg>app-text/hunspell</pkg> spell-checking backend (old flag)</flag> <flag name="fonts">Use builtin patched copy of open-sans fonts (overrides fontconfig)</flag> <flag name="qt6">Build with Qt6 support</flag> <flag name="qt6-imageformats">Add support for HEIF, AVIF and JpegXL by bundling kde-frameworks/kimageformats</flag> diff --git a/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild deleted file mode 100644 index 48b724704d43..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -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 ~ppc64 ~riscv" -IUSE="+dbus enchant +fonts +hunspell +jemalloc screencast +spell qt6 qt6-imageformats wayland +X" -REQUIRED_USE=" - spell? ( - ^^ ( enchant hunspell ) - ) - 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-libs/glib:2 - dev-libs/libdispatch - dev-libs/libsigc++:2 - dev-libs/openssl:= - dev-libs/xxhash - media-libs/fontconfig:= - media-libs/libjpeg-turbo:= - ~media-libs/libtgvoip-2.4.4_p20220503 - media-libs/openal - media-libs/opus:= - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20220507:=[screencast=,X=] - media-video/ffmpeg:=[opus] - sys-libs/zlib:=[minizip] - virtual/opengl - dbus? ( dev-cpp/glibmm:2.68 ) - enchant? ( app-text/enchant:= ) - hunspell? ( >=app-text/hunspell-1.7:= ) - 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/qt5compat:6 - 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? ( ${KIMAGEFORMATS_RDEPEND} ) - ) - X? ( - x11-libs/libxcb:= - x11-libs/xcb-util-keysyms - ) -" -DEPEND="${RDEPEND} - dev-cpp/range-v3 - dev-cpp/ms-gsl -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/cmake-3.16 - virtual/pkgconfig -" -# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 - -PATCHES=( - "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch" - "${FILESDIR}/tdesktop-4.3.4-qt5-incompatibility-2.patch" - "${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.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 -} - -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 - - 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_DBUS_INTEGRATION=$(usex !dbus) - -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) - -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) - -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell) # enables hunspell (recommended) - -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 (requires USE=dbus enabled)" net-libs/webkit-gtk:4 - 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-4.5.3.ebuild b/net-im/telegram-desktop/telegram-desktop-4.7.1.ebuild index 099ce3718db4..350747f4d8cc 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.5.3.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.7.1.ebuild @@ -17,11 +17,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" -IUSE="+dbus enchant +fonts +hunspell +jemalloc screencast +spell qt6 qt6-imageformats wayland +X" +IUSE="+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X" REQUIRED_USE=" - spell? ( - ^^ ( enchant hunspell ) - ) qt6-imageformats? ( qt6 ) " @@ -38,6 +35,7 @@ RDEPEND=" dev-libs/libdispatch dev-libs/libsigc++:2 dev-libs/openssl:= + dev-libs/protobuf dev-libs/xxhash media-libs/fontconfig:= media-libs/libjpeg-turbo:= @@ -46,12 +44,12 @@ RDEPEND=" media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20230105:=[screencast=,X=] - media-video/ffmpeg:=[opus] + media-video/ffmpeg:=[opus,vpx] sys-libs/zlib:=[minizip] virtual/opengl - dbus? ( dev-cpp/glibmm:2.68 ) + dbus? ( >=dev-cpp/glibmm-2.76:2.68 ) + !enchant? ( >=app-text/hunspell-1.7:= ) enchant? ( app-text/enchant:= ) - hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 @@ -77,7 +75,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-cpp/range-v3 - dev-cpp/ms-gsl + >=dev-cpp/ms-gsl-4 " BDEPEND=" ${PYTHON_DEPS} @@ -109,7 +107,7 @@ src_prepare() { if use qt6-imageformats; then sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ cmake/external/kimageformats/CMakeLists.txt || die - printf "%s\n" \ + printf '%s\n' \ 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ @@ -136,7 +134,6 @@ src_configure() { -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) - -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell) # enables hunspell (recommended) -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 ) |