From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- net-im/telegram-desktop/Manifest | 10 +- net-im/telegram-desktop/files/1.9.21-icon.patch | 99 -------------- net-im/telegram-desktop/files/2.1.0-kde-dir.patch | 51 ++++++++ .../telegram-desktop-1.9.14.ebuild | 132 ------------------- .../telegram-desktop-1.9.21.ebuild | 143 --------------------- .../telegram-desktop-2.0.1-r1.ebuild | 134 +++++++++++++++++++ .../telegram-desktop/telegram-desktop-2.0.1.ebuild | 141 -------------------- .../telegram-desktop/telegram-desktop-2.1.0.ebuild | 136 ++++++++++++++++++++ 8 files changed, 325 insertions(+), 521 deletions(-) delete mode 100644 net-im/telegram-desktop/files/1.9.21-icon.patch create mode 100644 net-im/telegram-desktop/files/2.1.0-kde-dir.patch delete mode 100644 net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild delete mode 100644 net-im/telegram-desktop/telegram-desktop-1.9.21.ebuild create mode 100644 net-im/telegram-desktop/telegram-desktop-2.0.1-r1.ebuild delete mode 100644 net-im/telegram-desktop/telegram-desktop-2.0.1.ebuild create mode 100644 net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild (limited to 'net-im/telegram-desktop') diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 62d3698fe9c0..6c36570d5f74 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,8 +1,6 @@ -AUX 1.9.21-icon.patch 3731 BLAKE2B feeaaaad379748ca6b39530809155611f4e9fee484d9f893f990cb52ef3c120df8179e1130cd8b3e597d02a932acd349f9d80cab3bcb7b2c7048fe5e6def8f04 SHA512 56861764177ab73c0589875000129b979434f0a940274700089c6940a89b28d20ad5e5f838b54ad6147e411276c5dd6e392cf6da62d43f7b779025882c9d95eb -DIST tdesktop-1.9.14-full.tar.gz 25324084 BLAKE2B 45c071aa573541b6e483d2ae712b7f3b672c1294e8e7e624d9292f7176482f4d68069c35541019dc27fdb1c66134c29fb4d3667f1197e7085e4f8a80c8ca603c SHA512 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056 -DIST tdesktop-1.9.21-full.tar.gz 25848026 BLAKE2B 503e22bcc83a64721aa4c4c6e8bca89c4c976703c338b1615c5ab1599098e98cbd220a94cffdbe24d9c305b44ffef7719ad1c2d2ad81f4ec6edc8377e1afa4ef SHA512 ea02fc69e88ed6244ed420516bb7a93827cb85efaa0a7e9af7562aa1bc29184c5a2102caca8693c976b25d374832e0deb2ccbf00144d5340b5ffacbdc9dcebf1 +AUX 2.1.0-kde-dir.patch 2118 BLAKE2B 92ec09b35f474cdab0677a394dcef193249f6db8b4ac980a63e054fe841876133e81a9420c52d3d9c91066725a9a0049ae9bc1e80d46c22e4ca8dd9b18cfc328 SHA512 da144cd13f42cac06aa1932945fccf7367f37edca7fb4781e8fa38fe8af1cb52b3b6062396a9a5d2e243966bdbb093e541042446e237d88c59bc855ea347c4e3 DIST tdesktop-2.0.1-full.tar.gz 26106949 BLAKE2B 3975e7d42af8b323a86408e2301b292d94b308413bb92d135673fb12851cd6672156dcf9b631482fa9b8dc9361d9593dc1104c8c335e0c610706b308414db01b SHA512 99cd7c5ca1e9dd75ecd98d272522b0e4aab2d46525e3d0c306503b7a00c9d25c1646e9d7462182682a58947c7435864af805a3b6f85906d8b21e5675cc8383cb -EBUILD telegram-desktop-1.9.14.ebuild 3481 BLAKE2B 1d9fc3583c52e84975032f25518339492e7f4f98f9a3adbbee7977ccfa960dcf7c146ff53e1528968ddd94de401e2a8e3a96d6da2ebfbcd8e3f716c00ec5b5c5 SHA512 211cf718d8ee8ea213e434dcfbc279a51e6e45139b85296d6033424fccca1d80d4b3805d8eaec14dafdac1aa332fbdb802c39db737925f3b1a8b154ed6798e88 -EBUILD telegram-desktop-1.9.21.ebuild 3711 BLAKE2B 26ae27079d14859da028f2131aa5bff51bcd04cf5dafdf6aa6fb0915b4164d582b57718284263368b7b3e92049cdcccba76eeaf40c145b00a03b8c583fc3e65e SHA512 a057a442482af41a024f0e6365b781921697caaf11de966b86decc3f45dcc029cb08bc72992671895e9fc5a26b44b2c7ba4b7a96c920dffe424f9b1c37958116 -EBUILD telegram-desktop-2.0.1.ebuild 3698 BLAKE2B 7dde21d1b0fb1e326bf0b1dfce41d12738c65ce83456b2d961045bf36ea9f295885622c71b905b0fa273f2237203460aa75228c61c18391320ea2e56e081281c SHA512 fd15bea99296a73e87b8d6e5c165d9ee6d7275b1d7795b5891acaba7fc03503a8b3cea79a0b959395c96df1bbd2ba8f16b3ce4fb408046c600b4adff74591be0 +DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d +EBUILD telegram-desktop-2.0.1-r1.ebuild 3634 BLAKE2B 63b7ac611fa44df6daf9d03229455c9fb478c6de5f6218304b3a697ae67d54d358079b01dddcb108cd56e72d279f3b1b390e910e046a0a8ef30e0c5d7f387db8 SHA512 600f025c5ef8580f05049789a26b289c69065b6a934bed14594121e79eba92b043150959eac2c0f61fb380c7ba5663e55ce006a866960d54a67506dd60bf1a3a +EBUILD telegram-desktop-2.1.0.ebuild 3682 BLAKE2B 95425eff2648434f75cf3ee02a8fa5a44c748599ab73d3def605eb19f2324eed8e18b40e448996194d5134971090b8e0f0aa1da928bb05dda1b2ebd52ab5953e SHA512 3951aaac37407b23850dc3e7d69e53c1652fbb3eb61e0bdfc9780544ead08cbaf6dc5c4108530d32058d524d5ddee4bf3bcfee391deec7dcc0449fd5191aec4a MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88 diff --git a/net-im/telegram-desktop/files/1.9.21-icon.patch b/net-im/telegram-desktop/files/1.9.21-icon.patch deleted file mode 100644 index 689e01af72cb..000000000000 --- a/net-im/telegram-desktop/files/1.9.21-icon.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d2291f5b17e0c169083a34e51053a99546207ec8 Mon Sep 17 00:00:00 2001 -From: Ilya Fedin -Date: Tue, 17 Mar 2020 23:13:11 +0400 -Subject: [PATCH] Fix panel icon forcing - ---- - .../platform/linux/main_window_linux.cpp | 20 +++++++++++-------- - .../platform/linux/main_window_linux.h | 2 +- - 2 files changed, 13 insertions(+), 9 deletions(-) - -diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -index 347395ab38..3d30ef755c 100644 ---- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -78,7 +78,8 @@ QString GetTrayIconName(int counter, bool muted) { - const auto iconName = GetIconName(); - const auto panelIconName = GetPanelIconName(counter, muted); - -- if (QIcon::hasThemeIcon(panelIconName)) { -+ if (QIcon::hasThemeIcon(panelIconName) -+ || qEnvironmentVariableIsSet(kForcePanelIcon.utf8())) { - return panelIconName; - } else if (QIcon::hasThemeIcon(iconName)) { - return iconName; -@@ -158,7 +159,7 @@ QIcon TrayIconGen(int counter, bool muted) { - || iconThemeName != TrayIconThemeName - || iconName != TrayIconName) { - if (!iconName.isEmpty()) { -- if(systemIcon.isNull()) { -+ if (systemIcon.isNull()) { - systemIcon = QIcon::fromTheme(iconName); - } - -@@ -467,11 +468,12 @@ void MainWindow::psTrayMenuUpdated() { - } - - #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION --void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) { -+void MainWindow::setSNITrayIcon(int counter, bool muted) { - const auto iconName = GetTrayIconName(counter, muted); - - if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8()) -- && ((!iconName.isEmpty() && !InSnap()) -+ && !iconName.isEmpty() -+ && (!InSnap() - || qEnvironmentVariableIsSet(kForcePanelIcon.utf8()))) { - if (_sniTrayIcon->iconName() == iconName) { - return; -@@ -480,7 +482,8 @@ void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) { - _sniTrayIcon->setIconByName(iconName); - _sniTrayIcon->setToolTipIconByName(iconName); - } else if (IsIndicatorApplication()) { -- if(!IsIconRegenerationNeeded(counter, muted) && !firstShow) { -+ if (!IsIconRegenerationNeeded(counter, muted) -+ && !_sniTrayIcon->iconName().isEmpty()) { - return; - } - -@@ -492,7 +495,8 @@ void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) { - _sniTrayIcon->setIconByName(_trayIconFile->fileName()); - } - } else { -- if(!IsIconRegenerationNeeded(counter, muted) && !firstShow) { -+ if (!IsIconRegenerationNeeded(counter, muted) -+ && !_sniTrayIcon->iconPixmap().isEmpty()) { - return; - } - -@@ -554,7 +558,7 @@ void MainWindow::onSNIOwnerChanged( - - cSetSupportTray(trayAvailable); - -- if(cSupportTray()) { -+ if (cSupportTray()) { - psSetupTrayIcon(); - } else { - LOG(("System tray is not available.")); -@@ -575,7 +579,7 @@ void MainWindow::psSetupTrayIcon() { - this); - - _sniTrayIcon->setTitle(AppName.utf16()); -- setSNITrayIcon(counter, muted, true); -+ setSNITrayIcon(counter, muted); - - attachToSNITrayIcon(); - } -diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h -index 8602c53806..43ab722845 100644 ---- a/Telegram/SourceFiles/platform/linux/main_window_linux.h -+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h -@@ -123,7 +123,7 @@ public slots: - QAction *psMonospace = nullptr; - QAction *psClearFormat = nullptr; - -- void setSNITrayIcon(int counter, bool muted, bool firstShow = false); -+ void setSNITrayIcon(int counter, bool muted); - void attachToSNITrayIcon(); - #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION - diff --git a/net-im/telegram-desktop/files/2.1.0-kde-dir.patch b/net-im/telegram-desktop/files/2.1.0-kde-dir.patch new file mode 100644 index 000000000000..b936275e3613 --- /dev/null +++ b/net-im/telegram-desktop/files/2.1.0-kde-dir.patch @@ -0,0 +1,51 @@ +From 7bc86cc9af28ba3d04a5cb69f6f7c16bfe7f8719 Mon Sep 17 00:00:00 2001 +From: Ilya Fedin +Date: Tue, 21 Apr 2020 23:05:17 +0400 +Subject: [PATCH] Fix directory opening with portal and use them by default + with KDE + +--- + .../SourceFiles/platform/linux/file_utilities_linux.cpp | 6 +++--- + Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +index 47dd56a411..88f8a69a91 100644 +--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp ++++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +@@ -83,11 +83,11 @@ constexpr auto kPreviewHeight = 512; + using Type = ::FileDialog::internal::Type; + + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION +-bool NativeSupported() { ++bool NativeSupported(Type type = Type::ReadFile) { + #ifndef TDESKTOP_FORCE_GTK_FILE_DIALOG + return false; + #endif // TDESKTOP_FORCE_GTK_FILE_DIALOG +- return !Platform::UseXDGDesktopPortal() ++ return (!Platform::UseXDGDesktopPortal() || type == Type::ReadFolder) + && Platform::internal::GdkHelperLoaded() + && (Libs::gtk_widget_hide_on_delete != nullptr) + && (Libs::gtk_clipboard_store != nullptr) +@@ -192,7 +192,7 @@ bool Get( + parent = parent->window(); + } + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION +- if (NativeSupported()) { ++ if (NativeSupported(type)) { + return GetNative( + parent, + files, +diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +index 0bb3963420..c12e5a0780 100644 +--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp ++++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +@@ -266,7 +266,7 @@ bool UseXDGDesktopPortal() { + const auto envVar = qEnvironmentVariableIsSet("TDESKTOP_USE_PORTAL"); + const auto portalPresent = IsXDGDesktopPortalPresent(); + +- return envVar && portalPresent; ++ return (DesktopEnvironment::IsKDE() || envVar) && portalPresent; + }(); + + return UsePortal; diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild deleted file mode 100644 index 6c917eff946e..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake desktop flag-o-matic python-any-r1 xdg-utils - -MY_P="tdesktop-${PV}-full" - -DESCRIPTION="Official desktop client for Telegram" -HOMEPAGE="https://desktop.telegram.org" -SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="+alsa dbus libressl pulseaudio spell" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - app-arch/xz-utils - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-cpp/ms-gsl-2.1.0 - dev-cpp/range-v3 - dev-libs/libdbusmenu-qt[qt5(+)] - dev-libs/xxhash - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtimageformats:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - media-libs/fontconfig:= - >=media-libs/libtgvoip-2.4.4_p20200212[alsa?,pulseaudio?] - media-libs/openal[alsa?,pulseaudio?] - media-libs/opus:= - media-video/ffmpeg:=[opus] - sys-libs/zlib[minizip] - virtual/libiconv - x11-libs/libva:=[X,drm] - x11-libs/libX11 - || ( - dev-qt/qtgui:5[jpeg,png,X(-)] - dev-qt/qtgui:5[jpeg,png,xcb(-)] - ) - || ( - dev-qt/qtwidgets:5[png,X(-)] - dev-qt/qtwidgets:5[png,xcb(-)] - ) - pulseaudio? ( media-sound/pulseaudio ) - spell? ( app-text/enchant:= ) -" - -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} -" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig -" - -REQUIRED_USE="|| ( alsa pulseaudio )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycxxflags=( - -Wno-deprecated-declarations - -Wno-error=deprecated-declarations - -Wno-switch - ) - - append-cxxflags "${mycxxflags[@]}" - - # TODO: unbundle header-only libs, ofc telegram uses git versions... - # it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots - # EXPECTED VARIANT - local mycmakeargs=( - -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF - -DDESKTOP_APP_USE_PACKAGED=ON - -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF - -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF - -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF - -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" - -DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - ) - - 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_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.21.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.21.ebuild deleted file mode 100644 index 653b2ea69cff..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-1.9.21.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake desktop flag-o-matic python-any-r1 xdg-utils - -MY_P="tdesktop-${PV}-full" - -DESCRIPTION="Official desktop client for Telegram" -HOMEPAGE="https://desktop.telegram.org" -SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - app-arch/xz-utils - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-cpp/ms-gsl-2.1.0 - dev-cpp/range-v3 - dev-libs/xxhash - dev-qt/qtcore:5 - dev-qt/qtimageformats:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - media-libs/fontconfig:= - >=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?] - media-libs/openal[alsa?,pulseaudio?] - media-libs/opus:= - media-video/ffmpeg:=[opus] - sys-libs/zlib[minizip] - virtual/libiconv - x11-libs/libva:=[X,drm] - x11-libs/libX11 - || ( - dev-qt/qtgui:5[jpeg,png,X(-)] - dev-qt/qtgui:5[jpeg,png,xcb(-)] - ) - || ( - dev-qt/qtwidgets:5[png,X(-)] - dev-qt/qtwidgets:5[png,xcb(-)] - ) - dbus? ( - dev-qt/qtdbus:5 - dev-libs/libdbusmenu-qt[qt5(+)] - ) - enchant? ( app-text/enchant:= ) - hunspell? ( >=app-text/hunspell-1.7:= ) - pulseaudio? ( media-sound/pulseaudio ) -" - -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} -" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig -" - -REQUIRED_USE="|| ( alsa pulseaudio ) - spell? ( - ^^ ( enchant hunspell ) - ) -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/1.9.21-icon.patch" -) - -src_configure() { - local mycxxflags=( - -Wno-deprecated-declarations - -Wno-error=deprecated-declarations - -Wno-switch - ) - - append-cxxflags "${mycxxflags[@]}" - - # TODO: unbundle header-only libs, ofc telegram uses git versions... - # it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots - # EXPECTED VARIANT - local mycmakeargs=( - -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF - -DDESKTOP_APP_USE_PACKAGED=ON - -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF - -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF - -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell - -DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell - ) - - 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_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-im/telegram-desktop/telegram-desktop-2.0.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.0.1-r1.ebuild new file mode 100644 index 000000000000..8760bb8f5936 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-2.0.1-r1.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit cmake desktop flag-o-matic python-any-r1 xdg-utils + +MY_P="tdesktop-${PV}-full" + +DESCRIPTION="Official desktop client for Telegram" +HOMEPAGE="https://desktop.telegram.org" +SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-3-with-openssl-exception" +SLOT="0" +KEYWORDS="amd64 ~ppc64" +IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X" + +RDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + app-arch/xz-utils + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + >=dev-cpp/ms-gsl-2.1.0 + dev-cpp/range-v3 + dev-libs/xxhash + dev-qt/qtcore:5 + dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?] + dev-qt/qtimageformats:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5[png,X(-)?] + media-fonts/open-sans + media-libs/fontconfig:= + >=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?] + media-libs/openal[alsa?,pulseaudio?] + media-libs/opus:= + media-video/ffmpeg:=[alsa?,opus,pulseaudio?] + sys-libs/zlib[minizip] + virtual/libiconv + dbus? ( + dev-qt/qtdbus:5 + dev-libs/libdbusmenu-qt[qt5(+)] + ) + enchant? ( app-text/enchant:= ) + hunspell? ( >=app-text/hunspell-1.7:= ) + pulseaudio? ( media-sound/pulseaudio ) +" + +DEPEND=" + ${PYTHON_DEPS} + ${RDEPEND} +" + +BDEPEND=" + >=dev-util/cmake-3.16 + virtual/pkgconfig +" + +REQUIRED_USE=" + || ( alsa pulseaudio ) + || ( X wayland ) + spell? ( + ^^ ( enchant hunspell ) + ) +" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local mycxxflags=( + -Wno-deprecated-declarations + -Wno-error=deprecated-declarations + -Wno-switch + ) + + append-cxxflags "${mycxxflags[@]}" + + # TODO: unbundle header-only libs, ofc telegram uses git versions... + # it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots + # EXPECTED VARIANT + local mycmakeargs=( + -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON + -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF + -DDESKTOP_APP_USE_PACKAGED=ON + -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF + -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF + -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF + -DTDESKTOP_LAUNCHER_BASENAME="${PN}" + -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" + -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended) + -DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell + ) + + 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_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} diff --git a/net-im/telegram-desktop/telegram-desktop-2.0.1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.0.1.ebuild deleted file mode 100644 index a27721e0b922..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-2.0.1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake desktop flag-o-matic python-any-r1 xdg-utils - -MY_P="tdesktop-${PV}-full" - -DESCRIPTION="Official desktop client for Telegram" -HOMEPAGE="https://desktop.telegram.org" -SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - app-arch/xz-utils - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-cpp/ms-gsl-2.1.0 - dev-cpp/range-v3 - dev-libs/xxhash - dev-qt/qtcore:5 - dev-qt/qtimageformats:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - media-libs/fontconfig:= - >=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?] - media-libs/openal[alsa?,pulseaudio?] - media-libs/opus:= - media-video/ffmpeg:=[opus] - sys-libs/zlib[minizip] - virtual/libiconv - x11-libs/libva:=[X,drm] - x11-libs/libX11 - || ( - dev-qt/qtgui:5[jpeg,png,X(-)] - dev-qt/qtgui:5[jpeg,png,xcb(-)] - ) - || ( - dev-qt/qtwidgets:5[png,X(-)] - dev-qt/qtwidgets:5[png,xcb(-)] - ) - dbus? ( - dev-qt/qtdbus:5 - dev-libs/libdbusmenu-qt[qt5(+)] - ) - enchant? ( app-text/enchant:= ) - hunspell? ( >=app-text/hunspell-1.7:= ) - pulseaudio? ( media-sound/pulseaudio ) -" - -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} -" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig -" - -PDEPEND="media-fonts/open-sans" - -REQUIRED_USE="|| ( alsa pulseaudio ) - spell? ( - ^^ ( enchant hunspell ) - ) -" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycxxflags=( - -Wno-deprecated-declarations - -Wno-error=deprecated-declarations - -Wno-switch - ) - - append-cxxflags "${mycxxflags[@]}" - - # TODO: unbundle header-only libs, ofc telegram uses git versions... - # it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots - # EXPECTED VARIANT - local mycmakeargs=( - -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF - -DDESKTOP_APP_USE_PACKAGED=ON - -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF - -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF - -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell - -DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell - ) - - 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_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild new file mode 100644 index 000000000000..6c7b00706da8 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild @@ -0,0 +1,136 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit cmake desktop flag-o-matic python-any-r1 xdg-utils + +MY_P="tdesktop-${PV}-full" + +DESCRIPTION="Official desktop client for Telegram" +HOMEPAGE="https://desktop.telegram.org" +SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-3-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X" + +RDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + app-arch/xz-utils + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + >=dev-cpp/ms-gsl-2.1.0 + dev-cpp/range-v3 + dev-libs/xxhash + dev-qt/qtcore:5 + dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?] + dev-qt/qtimageformats:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5[png,X(-)?] + media-fonts/open-sans + media-libs/fontconfig:= + >=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?] + media-libs/openal[alsa?,pulseaudio?] + media-libs/opus:= + media-video/ffmpeg:=[alsa?,opus,pulseaudio?] + sys-libs/zlib[minizip] + virtual/libiconv + dbus? ( + dev-qt/qtdbus:5 + dev-libs/libdbusmenu-qt[qt5(+)] + ) + enchant? ( app-text/enchant:= ) + hunspell? ( >=app-text/hunspell-1.7:= ) + pulseaudio? ( media-sound/pulseaudio ) +" + +DEPEND=" + ${PYTHON_DEPS} + ${RDEPEND} +" + +BDEPEND=" + >=dev-util/cmake-3.16 + virtual/pkgconfig +" + +REQUIRED_USE=" + || ( alsa pulseaudio ) + || ( X wayland ) + spell? ( + ^^ ( enchant hunspell ) + ) +" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/${PV}-kde-dir.patch" ) + +src_configure() { + local mycxxflags=( + -Wno-deprecated-declarations + -Wno-error=deprecated-declarations + -Wno-switch + ) + + append-cxxflags "${mycxxflags[@]}" + + # TODO: unbundle header-only libs, ofc telegram uses git versions... + # it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots + # EXPECTED VARIANT + local mycmakeargs=( + -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON + -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF + -DDESKTOP_APP_USE_PACKAGED=ON + -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF + -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF + -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF + -DTDESKTOP_LAUNCHER_BASENAME="${PN}" + -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" + -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended) + -DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell + ) + + 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_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} -- cgit v1.2.3