From 53cba99042fa967e2a93da9f8db806fe2d035543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Feb 2020 01:16:38 +0000 Subject: gentoo resync : 17.02.2020 --- net-im/telegram-desktop/Manifest | 13 +- .../telegram-desktop/files/0003-PPC-config.patch | 28 ---- net-im/telegram-desktop/files/musl.patch | 12 -- net-im/telegram-desktop/metadata.xml | 3 - .../telegram-desktop-1.9.10-r1.ebuild | 157 --------------------- .../telegram-desktop-1.9.10.ebuild | 155 -------------------- .../telegram-desktop-1.9.13-r1.ebuild | 136 ++++++++++++++++++ .../telegram-desktop/telegram-desktop-1.9.8.ebuild | 144 ------------------- .../telegram-desktop/telegram-desktop-1.9.9.ebuild | 147 ------------------- 9 files changed, 139 insertions(+), 656 deletions(-) delete mode 100644 net-im/telegram-desktop/files/0003-PPC-config.patch delete mode 100644 net-im/telegram-desktop/files/musl.patch delete mode 100644 net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild delete mode 100644 net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild create mode 100644 net-im/telegram-desktop/telegram-desktop-1.9.13-r1.ebuild delete mode 100644 net-im/telegram-desktop/telegram-desktop-1.9.8.ebuild delete mode 100644 net-im/telegram-desktop/telegram-desktop-1.9.9.ebuild (limited to 'net-im/telegram-desktop') diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 2fc5bf3aa6eb..c02d6913b6bb 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,11 +1,4 @@ AUX 0002-PPC-big-endian.patch 791 BLAKE2B f24d1f799eb23f4aa0ed3324996027014c790ef3ed249ef1b48748529b7e7af622d7db34fbe0cae06539913b5e20512f490e7a609b952273aa990baef20de374 SHA512 26aab35d254bdeb89aff05fa5ec84c405e2c939f300f923c0e7adb452e50442d140104fe74f6bd39ab533493314118de3bfed7f3a931c2c5442da6fccdb6e390 -AUX 0003-PPC-config.patch 907 BLAKE2B 3d7a74ea4ee52f3b07ec11bf6c30425bd6555e57c99de931e6e029f4dd70c1bf8a6c3a5678b671c5060a47c0ed44b3ce4d175ef0ef79b40aabbc902d8ddf9d62 SHA512 3f0b214ea6510609f2c312b057e926239fa404d4d834bce0688fa5756768e996fd6a89b03a8a11f106ea744daafcea71d35211761bb772400274084618d78e9a -AUX musl.patch 493 BLAKE2B fa27c9442075c6adcc48a7d282c1ba1e143cb1da05dd8b9fbd4317a7a3fc485112a98db54ffe947366913c4e18c54208d29045f0660525f2c65d91caaa032436 SHA512 9b9a9b623edcce37339e52e3e306a7106b6289749fca1b2dc7450c299da1a6f8d3f3f12b4973ecfbf3797f75ba88cf7f644adee896b053a683df4e4754d5d057 -DIST tdesktop-1.9.10-full.tar.gz 25272713 BLAKE2B 26b2eb49b5b55dac21be46d37ff7ddd3b6ea4490e58d8a04aaada3237b81cfbb87f2422d179882407501db2a597718f4974629791c8d3f165673fe953bdecbf6 SHA512 128dc3fd42196ebf61853917914c3d33fb148d3e6b04847ffa6d4df5baa8d9e286e7d25317b0dd2a332f1475f60b5addd19bb6e25a0fa6bbca316c22235569c6 -DIST tdesktop-1.9.8-full.tar.gz 25225784 BLAKE2B d938dc5d82740f93c575f621697e4bae430dc045c18437957bead6cc949ad0643b0422d8fd2a1695af921ea7f259ca323094a4a7821855d842edfaf4f328c840 SHA512 5562eb99812a8faec74fe073323d6e04e36311c1e4ce984035212ecfed8bd5d12df92cd0f0022401201136315fb5556971b267b4bf47edf4eeddc9926c7969dc -DIST tdesktop-1.9.9-full.tar.gz 25221934 BLAKE2B c8f6252fd6e72785a39c92f04e5dadf322775fc1a178f2c6dac9e38cb654b9eb924c16cffcf9dc47e2e309e4f27a13ea07235146e7d7960b6bd0a342a3645e03 SHA512 ba6400e6f5eec5bda6e8a54b43846e695b2cce731cb6b39f17407cc39e3e9b8078d977253d29962671f30e33dbe012f8e40f340f781fd8ca73487e5f2d42e3de -EBUILD telegram-desktop-1.9.10-r1.ebuild 4147 BLAKE2B 9c56a92fba6fc18ccdfe43c9845b909e09d6e2ab79eba5ee62c3040951e614ba940a9799c4c2b91b87ad5a8979b69eb894793ca3dcd6ce6347b16978bcc21240 SHA512 707308a17b456de541ab9981709dba284639db06a3a6e623b4b64aea8d892def9646f82435d7bb2a9804d10bcb0d360b98da02067b5864ef7d6486b09c1cbfe6 -EBUILD telegram-desktop-1.9.10.ebuild 3973 BLAKE2B 92ffd553c7ec4663ec1c78e75dabdf02388629e0a4a8333146be1b9367ee345e546249cc78106068d4774b5397574f0e1b0e7f90607d350a30446536a26c71de SHA512 1b79cb84b54ab23ad14a32893e4191f6f6442b9fa0628cbc5a31d0e834b15fabacaa69c14c82f873e03bdb618b65ca8e1087628a1f7d9e8fde68ac7f1a0907cc -EBUILD telegram-desktop-1.9.8.ebuild 3614 BLAKE2B f51b090718b6464e7edcab33f9768ac13ec8f230af4eeb119b51d50ab32d559262ac55a516408bb6587c7623d9c0486a6955158fc5a40cd0d0bbe9d14ca317a8 SHA512 6d006d0d48b46aa2813273ea77f886ba4b196625116741caf9e1cc50304a88e561c53ffdb65441292e11b651e9e60dd65928324a366eb7fd2392dae14f073839 -EBUILD telegram-desktop-1.9.9.ebuild 3637 BLAKE2B ebc32472e1fd13ef27eeab43a43da1ee0e035c5e8cd5b88168a542289dd8b7f4a4867f11e89ef42c962fe21cb15c903929e61c0b74b263f227afef928ab719fe SHA512 db8388a3930fc4693ed99728fd826cc94dff511c98fb9f413db8b7cd317705b7bfb5a664ec17ddd6cc5c8894f511a7569a09cd7be347b8f288753b2833709de8 -MISC metadata.xml 348 BLAKE2B 57a3aaf9f66d41173fffd5d7c40d1d25beda8eb6e46c3259c253c1d644fa2ec22fd2725ef61ca38a7338caba1da5e7abba73d363448c1c5f6e7b7767f1e8d897 SHA512 8d7efddbb9a62b78f4bac0b00a92e588b527d7914b84b7c8b73d654d35893f2c26f31b8d5ccbde2e0020f2e420816b691cf77cc902eefe9f4375b4a82c2a328d +DIST tdesktop-1.9.13-full.tar.gz 25324119 BLAKE2B 70029ea0dd68fd4be3ba540831111b79d223e059f70551a970847190b00f2aaebc13319236b2c681b2a55ee99408d20e6feea3fc3ab2fb9c97d4740fd4c6a644 SHA512 995face8a2ffb54f9f31aaa8d5a26421f4915e73360945553b6fa4e4b02431ca83ec1e72d6d2ce77f5b9daa39892859c88f7ea53c3ddbeec2cb37f27451878d2 +EBUILD telegram-desktop-1.9.13-r1.ebuild 3535 BLAKE2B 1cbaf77fe520be3d0bfc3624a725d9a09b4b92c771ba298e1d9c2fe7f7f1ae92b19381146a897f933964fa5ae08d00c9420402fc88067924597332bade4d344d SHA512 37902c4892ad492a3ca31979a32658cb9ada5e1a3be26e30846969cca11c5c6f38865cbe7a211e8f7a1c2c91679c96bee2f9b43c92a13d74660e80285bd4d95e +MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9 diff --git a/net-im/telegram-desktop/files/0003-PPC-config.patch b/net-im/telegram-desktop/files/0003-PPC-config.patch deleted file mode 100644 index 95b7b639d58e..000000000000 --- a/net-im/telegram-desktop/files/0003-PPC-config.patch +++ /dev/null @@ -1,28 +0,0 @@ -From af5f8d19f0fdded987beee4568f02cc8dcbd20f4 Mon Sep 17 00:00:00 2001 -From: John Zimmermann -Date: Thu, 2 Jan 2020 12:58:45 +0100 -Subject: [PATCH] PPC config - ---- - base/build_config.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git Telegram/lib_base/base/build_config.h Telegram/lib_base/base/build_config.h -index a02c9b0..b3f4860 100644 ---- a/Telegram/lib_base/base/build_config.h -+++ b/Telegram/lib_base/base/build_config.h -@@ -46,9 +46,9 @@ - #define ARCH_CPU_X86_FAMILY 1 - #define ARCH_CPU_X86 1 - #define ARCH_CPU_32_BITS 1 --#elif defined(__aarch64__) -+#elif defined(__aarch64__) || defined(__powerpc64__) - #define ARCH_CPU_64_BITS 1 --#elif defined(_M_ARM) || defined(__arm__) -+#elif defined(_M_ARM) || defined(__arm__) || defined(__powerpc__) - #define ARCH_CPU_32_BITS 1 - #else - #error Please add support for your architecture in base/build_config.h --- -2.24.1 - diff --git a/net-im/telegram-desktop/files/musl.patch b/net-im/telegram-desktop/files/musl.patch deleted file mode 100644 index dece8ec216f0..000000000000 --- a/net-im/telegram-desktop/files/musl.patch +++ /dev/null @@ -1,12 +0,0 @@ -Should send this one upstream; it would work with glibc as well. - ---- tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp.old 2020-01-21 12:16:27.000000000 +0000 -+++ tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp 2020-01-22 17:44:42.185530350 +0000 -@@ -6,6 +6,7 @@ - - #include "AudioPulse.h" - #include -+#include - #include "../../logging.h" - - #define DECLARE_DL_FUNCTION(name) typeof(name)* AudioPulse::_import_##name=NULL diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index 36b8a035d4c6..efcd58fe0b9b 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -5,7 +5,4 @@ gyakovlev@gentoo.org Georgy Yakovlev - - Enable GTK3 integration (tray, theme, filepicker, etc) - diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild deleted file mode 100644 index 660977c09e08..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild +++ /dev/null @@ -1,157 +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 gtk3 libressl pulseaudio spell" - -# dbus still required to build, but use flag disables dbus usage at runtime -# pkg-config will pick up gtk2 first if found, needs a workaround -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 - media-libs/fontconfig:= - media-libs/libtgvoip[alsa?,pulseaudio?] - media-libs/openal[alsa?,pulseaudio?] - sys-libs/zlib[minizip] - virtual/ffmpeg - virtual/libiconv - x11-libs/libva[X,drm] - x11-libs/libX11 - || ( - dev-qt/qtgui:5[png,X(-)] - dev-qt/qtgui:5[png,xcb(-)] - ) - || ( - dev-qt/qtwidgets:5[png,X(-)] - dev-qt/qtwidgets:5[png,xcb(-)] - ) - gtk3? ( - dev-libs/libappindicator:3 - x11-libs/gtk+:3 - ) - pulseaudio? ( media-sound/pulseaudio ) - spell? ( app-text/enchant:= ) -" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig -" -REQUIRED_USE="|| ( alsa pulseaudio )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/0002-PPC-big-endian.patch" - "${FILESDIR}/musl.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=( - -Ddisable_autoupdate=1 - -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_GTK_INTEGRATION="$(usex gtk3 OFF ON)" - -DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)" - ) - - 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 - mycmakeargs+=( -DTDESKTOP_API_TEST=ON ) - ewarn - ewarn "Building ${PN} with test API credentials." - ewarn "Connectivity to API servers will be throttled." - ewarn "To build ${PN} custom API credentials cancel build now and obtain" - ewarn "credentials here: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md" - ewarn "After getting credentials you can export variables:" - ewarn "export MY_TDESKTOP_API_ID=\"17349\"" - ewarn "export MY_TDESKTOP_API_HASH=\"344583e45741c457fe1862106095a5eb\"" - ewarn "and restart the build" - ewarn "you can save variables in /etc/portage/env/${CATEGORY}/${PN}" - ewarn "portage will use the file every build automatically" - ewarn - fi - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}/bin/${PN}" - - newmenu lib/xdg/telegramdesktop.desktop "${PN}.desktop" - - local icon_size - for icon_size in 16 32 48 64 128 256 512 - do - newicon -s ${icon_size} \ - Telegram/Resources/art/icon${icon_size}.png telegram.png - done - - insinto /usr/share/appdata - doins lib/xdg/telegramdesktop.appdata.xml - - einstalldocs -} - -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.10.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild deleted file mode 100644 index 9ef754c699fc..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild +++ /dev/null @@ -1,155 +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 Unlicense" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="dbus gtk3 libressl 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/qtimageformats:5 - dev-qt/qtnetwork:5 - media-libs/fontconfig:= - media-libs/openal[pulseaudio] - media-libs/opus - media-sound/pulseaudio - sys-libs/zlib[minizip] - virtual/ffmpeg - x11-libs/libva[X,drm] - x11-libs/libX11 - || ( - dev-qt/qtgui:5[png,X(-)] - dev-qt/qtgui:5[png,xcb(-)] - ) - || ( - dev-qt/qtwidgets:5[png,X(-)] - dev-qt/qtwidgets:5[png,xcb(-)] - ) - dbus? ( dev-qt/qtdbus:5 ) - gtk3? ( - dev-libs/libappindicator:3 - x11-libs/gtk+:3 - sys-apps/xdg-desktop-portal - ) - spell? ( app-text/enchant:= ) -" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/0002-PPC-big-endian.patch" - "${FILESDIR}/musl.patch" -) - -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=( - -Ddisable_autoupdate=1 - -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}" - -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF - -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" - -DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)" - -DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)" - ) - - 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 - mycmakeargs+=( -DTDESKTOP_API_TEST=ON ) - ewarn - ewarn "Building ${PN} with test API credentials." - ewarn "Connectivity to API servers will be throttled." - ewarn "To build ${PN} custom API credentials cancel build now and obtain" - ewarn "credentials here: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md" - ewarn "After getting credentials you can export variables:" - ewarn "export MY_TDESKTOP_API_ID=\"17349\"" - ewarn "export MY_TDESKTOP_API_HASH=\"344583e45741c457fe1862106095a5eb\"" - ewarn "and restart the build" - ewarn "you can save variables in /etc/portage/env/${CATEGORY}/${PN}" - ewarn "portage will use the file every build automatically" - ewarn - fi - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}/bin/${PN}" - - newmenu lib/xdg/telegramdesktop.desktop "${PN}.desktop" - - local icon_size - for icon_size in 16 32 48 64 128 256 512 - do - newicon -s ${icon_size} \ - Telegram/Resources/art/icon${icon_size}.png telegram.png - done - - insinto /usr/share/appdata - doins lib/xdg/telegramdesktop.appdata.xml - - einstalldocs -} - -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.13-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.13-r1.ebuild new file mode 100644 index 000000000000..620b15ce23a9 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-1.9.13-r1.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} ) + +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}" + +PATCHES=( + "${FILESDIR}/0002-PPC-big-endian.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_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.8.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.8.ebuild deleted file mode 100644 index c32dd8370518..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-1.9.8.ebuild +++ /dev/null @@ -1,144 +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 Unlicense" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="dbus gtk3 libressl 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/range-v3 - dev-libs/xxhash - dev-qt/qtcore:5 - dev-qt/qtgui:5[png,X(-)] - dev-qt/qtimageformats:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5[png,X(-)] - media-libs/openal[pulseaudio] - media-libs/opus - media-sound/pulseaudio - sys-libs/zlib[minizip] - virtual/ffmpeg - x11-libs/libva[X,drm] - x11-libs/libX11 - dbus? ( dev-qt/qtdbus:5 ) - gtk3? ( - dev-libs/libappindicator:3 - x11-libs/gtk+:3 - ) - spell? ( app-text/enchant:= ) -" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/0002-PPC-big-endian.patch" - "${FILESDIR}/0003-PPC-config.patch" - "${FILESDIR}/musl.patch" -) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycxxflags=( - -Wno-deprecated-declarations - -Wno-error=deprecated-declarations - -Wno-switch - ) - - append-cxxflags "${mycxxflags[@]}" - - local mycmakeargs=( - -Ddisable_autoupdate=1 - -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF - -DDESKTOP_APP_USE_PACKAGED=ON - -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF - -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF - -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" - -DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)" - -DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)" - ) - - 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 - mycmakeargs+=( -DTDESKTOP_API_TEST=ON ) - ewarn - ewarn "Building ${PN} with test API credentials." - ewarn "Connectivity to API servers will be throttled." - ewarn "To build ${PN} custom API credentials cancel build now and obtain" - ewarn "credentials here: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md" - ewarn "After getting credentials you can export variables:" - ewarn "export MY_TDESKTOP_API_ID=\"17349\"" - ewarn "export MY_TDESKTOP_API_HASH=\"344583e45741c457fe1862106095a5eb\"" - ewarn "and restart the build" - ewarn "you can save variables in /etc/portage/env/${CATEGORY}/${PN}" - ewarn "portage will use the file every build automatically" - ewarn - fi - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}/bin/${PN}" - - newmenu lib/xdg/telegramdesktop.desktop "${PN}.desktop" - - local icon_size - for icon_size in 16 32 48 64 128 256 512 - do - newicon -s ${icon_size} \ - Telegram/Resources/art/icon${icon_size}.png telegram.png - done - - insinto /usr/share/appdata - doins lib/xdg/telegramdesktop.appdata.xml - - insinto /usr/share/kservices5 - doins lib/xdg/tg.protocol - - einstalldocs -} - -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.9.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.9.ebuild deleted file mode 100644 index 4e3d063493a0..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-1.9.9.ebuild +++ /dev/null @@ -1,147 +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 Unlicense" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="dbus gtk3 libressl 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/range-v3 - dev-libs/xxhash - dev-qt/qtcore:5 - dev-qt/qtimageformats:5 - dev-qt/qtnetwork:5 - media-libs/openal[pulseaudio] - media-libs/opus - media-sound/pulseaudio - sys-libs/zlib[minizip] - virtual/ffmpeg - x11-libs/libva[X,drm] - x11-libs/libX11 - || ( - dev-qt/qtgui:5[png,X(-)] - dev-qt/qtgui:5[png,xcb(-)] - ) - || ( - dev-qt/qtwidgets:5[png,X(-)] - dev-qt/qtwidgets:5[png,xcb(-)] - ) - dbus? ( dev-qt/qtdbus:5 ) - gtk3? ( - dev-libs/libappindicator:3 - x11-libs/gtk+:3 - ) - spell? ( app-text/enchant:= ) -" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/0002-PPC-big-endian.patch" - "${FILESDIR}/0003-PPC-config.patch" - "${FILESDIR}/musl.patch" -) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycxxflags=( - -Wno-deprecated-declarations - -Wno-error=deprecated-declarations - -Wno-switch - ) - - append-cxxflags "${mycxxflags[@]}" - - local mycmakeargs=( - -Ddisable_autoupdate=1 - -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF - -DDESKTOP_APP_USE_PACKAGED=ON - -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF - -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF - -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" - -DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)" - -DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)" - ) - - 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 - mycmakeargs+=( -DTDESKTOP_API_TEST=ON ) - ewarn - ewarn "Building ${PN} with test API credentials." - ewarn "Connectivity to API servers will be throttled." - ewarn "To build ${PN} custom API credentials cancel build now and obtain" - ewarn "credentials here: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md" - ewarn "After getting credentials you can export variables:" - ewarn "export MY_TDESKTOP_API_ID=\"17349\"" - ewarn "export MY_TDESKTOP_API_HASH=\"344583e45741c457fe1862106095a5eb\"" - ewarn "and restart the build" - ewarn "you can save variables in /etc/portage/env/${CATEGORY}/${PN}" - ewarn "portage will use the file every build automatically" - ewarn - fi - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}/bin/${PN}" - - newmenu lib/xdg/telegramdesktop.desktop "${PN}.desktop" - - local icon_size - for icon_size in 16 32 48 64 128 256 512 - do - newicon -s ${icon_size} \ - Telegram/Resources/art/icon${icon_size}.png telegram.png - done - - insinto /usr/share/appdata - doins lib/xdg/telegramdesktop.appdata.xml - - einstalldocs -} - -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