From 5c1e419582680cfb61e0ae777c693704f3a731e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 14 Feb 2023 01:55:21 +0000 Subject: gentoo auto-resync : 14:02:2023 - 01:55:20 --- net-im/Manifest.gz | Bin 10067 -> 10062 bytes net-im/telegram-desktop/Manifest | 3 + .../files/tdesktop-4.6.2-fix-gcc12-optional.patch | 15 ++ .../telegram-desktop/telegram-desktop-4.6.2.ebuild | 208 +++++++++++++++++++++ 4 files changed, 226 insertions(+) create mode 100644 net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch create mode 100644 net-im/telegram-desktop/telegram-desktop-4.6.2.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index a278f9ca342b..b656d948c753 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 81b39555e077..ac9d1af194df 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,8 +1,11 @@ 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 +AUX tdesktop-4.6.2-fix-gcc12-optional.patch 419 BLAKE2B d798a025929203343cfa6abdbecad0ae861bf00fdd71db170ec29ec67b2363d53da916eb7341335754dd3438b8cf62ceea5062c4c460c716e632281f3825ba6c SHA512 e46a3442ce8a106d417ae36419f954595965e4abd4be94888e5bb994974fbd8b63c7a2a12a3d33f5a590498942838efa90c3fd65c88f715e60017ed6571061d4 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.2-full.tar.gz 63799003 BLAKE2B 828b75e13f00c50d26df276479500edd7604987d233b3caf433dc1d5611f0743ef6c9e25ccecd35581b809ca1986ffc3f01bcc0a10c7d05b1d8c9396edc026b1 SHA512 9a52cecb2ccde6e1381045b1c96730c63c5f19ca188a1be3bc905762f6e356906b7be141e8d373473390c21bc8b48ef7d5f4ee43bb09229a96b82c4fd974b531 EBUILD telegram-desktop-4.4.1.ebuild 6663 BLAKE2B 2052b75ff309abefcee5bcdc09fb44eefe23590f4364b0ef43818b290ae67eb3df5fef4ecefbbb5b488921e71bbfa9b9185a964aa5aca03ff0529daddd136e38 SHA512 eb90ddcb2eeae86810fb384d648f9e0c01098495c8051e6de5d5caff13ae180a73bd519885c751f23235c2c79932e3d9da7cc14d44f77a3e8a4360fe56186556 EBUILD telegram-desktop-4.5.3.ebuild 6606 BLAKE2B dace4440f9c9c27afe7295d3414f63f457d75eeb730cb2438ad1d2a76d6061b73cee57ee964460946fed6946f10fc5f1e84f29bd612554f311b615de776feb2a SHA512 dada58163e4f6f0163ab50f090f40887a3d4bb55d386112d368518cb8e4a297c43190b70eae5b0efcca5012cdb35a05ba58bcad74a1427c7887657e7248b41ee +EBUILD telegram-desktop-4.6.2.ebuild 6556 BLAKE2B 26c304bfd0e5e4544ca735418c1af1086bd4a7aaa3256cde53a4190f25f0d5ea2ae301f7e060bd2a4057d717c6528118ff3e649dc83112f36f942f231bd7f951 SHA512 225ddd91f4508d926c69b9735603dafe82ec5c6e236089e937ca5b87cb8c038cbc064e73145a7becbd6db64548a659140554c896dc34033fb5730697b0d5bd91 MISC metadata.xml 1111 BLAKE2B da28403273bdd0e3055f45070a419b8cc65867ec406f3bb19f048e465604a88426d3857e4b7d696ccfd8405713d7a587d0dec5fde8cb264df59f246045584282 SHA512 2fc1a41ad4dfd78d1e02ef5d0ff2fa391cf2950bf6645038a61f0ad48803ad505917ed4a787f0397d529c1ed07d78c0bfd425f6fb9a9876f5a015f573769d38d diff --git a/net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch b/net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch new file mode 100644 index 000000000000..7e471e143ec0 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch @@ -0,0 +1,15 @@ +Fix missing header with gcc 12 + +Upstream: +https://github.com/telegramdesktop/tdesktop/commit/a8decf154f5aceeff0b977c0a5845e42404286b3 + +--- tdesktop-4.6.2-full.orig/Telegram/SourceFiles/payments/stripe/stripe_card_validator.h ++++ tdesktop-4.6.2-full/Telegram/SourceFiles/payments/stripe/stripe_card_validator.h +@@ -9,6 +9,7 @@ + + #include "stripe/stripe_card.h" + #include ++#include + + class QDate; + diff --git a/net-im/telegram-desktop/telegram-desktop-4.6.2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.6.2.ebuild new file mode 100644 index 000000000000..647c887cfff8 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.6.2.ebuild @@ -0,0 +1,208 @@ +# 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 qt6 qt6-imageformats wayland +X" +REQUIRED_USE=" + ^^ ( 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_p20221208 + media-libs/openal + media-libs/opus:= + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20230105:=[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.4.1-fix-dupe-main-decl.patch" + "${FILESDIR}/tdesktop-4.6.2-fix-gcc12-optional.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_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 '