commit: e56291255f5727ec7706552f85107ce7b958362c Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Tue Feb 25 02:39:54 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Tue Feb 25 02:52:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5629125
net-im/telegram-desktop: bump to 1.9.17, enable hunspell by default enchant is crashing from time to time. added missing qtwayland dep. Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../files/1.9.17-hunspell-cmake.patch | 22 ++++ net-im/telegram-desktop/metadata.xml | 4 + .../telegram-desktop-1.9.17.ebuild | 143 +++++++++++++++++++++ 4 files changed, 170 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 5bed1039a64..8031465b0e3 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,4 @@ DIST tdesktop-1.9.14-full.tar.gz 25324084 BLAKE2B 45c071aa573541b6e483d2ae712b7f3b672c1294e8e7e624d9292f7176482f4d68069c35541019dc27fdb1c66134c29fb4d3667f1197e7085e4f8a80c8ca603c SHA512 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056 DIST tdesktop-1.9.15-full.tar.gz 25327647 BLAKE2B 5d689f656a66d55b3e62d52d48106270fc16675a01ff8a2b865c122191c7ee4781c2e698d0652c765a10985148ade0ce5dd47f4938538f24348cd5b42fe0160c SHA512 457b568226e34cc23e379d34a9ad21d0d6c26fb69647cd17bf74aef48ad9ce35eae6697795af8c349f43e376b44bcab49e1939733b1cc20ec16ddf1c29a32c4e DIST tdesktop-1.9.16-full.tar.gz 25328085 BLAKE2B 1d429964e67641a1cfa0f826820ed54eb7e37d9946fdd3292d5d67276609d736dcfb2b4c422f6b64364705eb68e78f6ac6bfa52096ca39d948a9e01bc152404b SHA512 89cdf12456d9bcaa4e332286d2d5c4da6cf715bd0e798e51e458adb7bf5c89044899beb9ac7b11a808b81e37958473a473e3774519420baf7a6bc34eb7938733 +DIST tdesktop-1.9.17-full.tar.gz 25840548 BLAKE2B ca824ceb691d244a6a7879d753c78559d763e023f77527bd843693035716f27576a9d4e97b38b4d25cc7b3950dbc593dcca21effda47199bc080ff5976c48612 SHA512 b545c39b9ae013a2ae96636895b6eedf27e6deda07af7516e3b2caf58bf7df6f67d9f9da281d7eb9589081b2dc61b95fdf6088afa6fc19e3b79f27e46505738c diff --git a/net-im/telegram-desktop/files/1.9.17-hunspell-cmake.patch b/net-im/telegram-desktop/files/1.9.17-hunspell-cmake.patch new file mode 100644 index 00000000000..bbf250861ad --- /dev/null +++ b/net-im/telegram-desktop/files/1.9.17-hunspell-cmake.patch @@ -0,0 +1,22 @@ +From 81e27ccc0e7bf27405569ce98582860dfc9ea9bb Mon Sep 17 00:00:00 2001 +From: John Preston <johnprestonm...@gmail.com> +Date: Tue, 25 Feb 2020 01:11:10 +0400 +Subject: [PATCH] Fix packaged build. + +--- + external/hunspell/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/external/hunspell/CMakeLists.txt b/cmake/external/hunspell/CMakeLists.txt +index 6fec471..fbe2e95 100644 +--- a/cmake/external/hunspell/CMakeLists.txt ++++ b/cmake/external/hunspell/CMakeLists.txt +@@ -5,7 +5,7 @@ + # https://github.com/desktop-app/legal/blob/master/LEGAL + + if (DESKTOP_APP_USE_PACKAGED) +- add_library(external_hunspell INTERFACE IMPORTED) ++ add_library(external_hunspell INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_hunspell ALIAS external_hunspell) + + find_package(PkgConfig REQUIRED) diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index efcd58fe0b9..5eb4b12ceaa 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -5,4 +5,8 @@ <email>gyakov...@gentoo.org</email> <name>Georgy Yakovlev</name> </maintainer> + <use> + <flag name="enchant">Enable the app-text/aspell spell-checking backend</flag> + <flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag> + </use> </pkgmetadata> diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.17.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.17.ebuild new file mode 100644 index 00000000000..fd191f347c8 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-1.9.17.ebuild @@ -0,0 +1,143 @@ +# 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 + dev-qt/qtwayland: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(-)] + ) + 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}/${PV}-hunspell-cmake.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_DISABLE_DESKTOP_FILE_GENERATION=ON + -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 +}
