From d4d5d2b25219999249569b6031b6514f653047f1 Mon Sep 17 00:00:00 2001 From: Henning Schild Date: Sun, 3 Oct 2021 10:39:51 +0200 Subject: net-im/telegram-desktop-bin: disable internal updater again Upstream silently dropped the "-externalupdater" switch. Instead we need to create a file in /etc to disable the internal updater. Closes: https://bugs.gentoo.org/814062 Signed-off-by: Henning Schild Closes: https://github.com/gentoo/gentoo/pull/22472 Signed-off-by: Ionen Wolkens --- .../files/telegram-desktop-bin | 9 ---- .../telegram-desktop-bin-3.0.1-r1.ebuild | 54 ++++++++++++++++++++++ .../telegram-desktop-bin-3.0.1.ebuild | 53 --------------------- .../telegram-desktop-bin-3.1.0-r1.ebuild | 51 ++++++++++++++++++++ .../telegram-desktop-bin-3.1.0.ebuild | 50 -------------------- .../telegram-desktop-bin-3.1.1-r1.ebuild | 51 ++++++++++++++++++++ .../telegram-desktop-bin-3.1.1.ebuild | 50 -------------------- 7 files changed, 156 insertions(+), 162 deletions(-) delete mode 100644 net-im/telegram-desktop-bin/files/telegram-desktop-bin create mode 100644 net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild delete mode 100644 net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1.ebuild create mode 100644 net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild delete mode 100644 net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0.ebuild create mode 100644 net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild delete mode 100644 net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1.ebuild (limited to 'net-im/telegram-desktop-bin') diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin b/net-im/telegram-desktop-bin/files/telegram-desktop-bin deleted file mode 100644 index 954b3bdeaea5..000000000000 --- a/net-im/telegram-desktop-bin/files/telegram-desktop-bin +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# this wrapper disables the auto-updater of telegram-desktop -# This program is licensed under the same license as telegram-desktop - -# telegram-desktop fails to set RestartCommand with the session manager -# exclude it from session management to prevent restarts without the argument -unset SESSION_MANAGER - -exec /usr/lib/telegram-desktop-bin/Telegram -externalupdater $@ diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild new file mode 100644 index 000000000000..6f908ad66faa --- /dev/null +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop optfeature xdg + +DESCRIPTION="Official desktop client for Telegram (binary package)" +HOMEPAGE="https://desktop.telegram.org" +SRC_URI=" + https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz + amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) +" + +LICENSE="GPL-3-with-openssl-exception" +SLOT="0" +KEYWORDS="-* ~amd64" + +QA_PREBUILT="usr/bin/telegram-desktop" + +RDEPEND=" + dev-libs/glib:2 + >=media-libs/fontconfig-2.13 + media-libs/freetype:2 + sys-libs/zlib + virtual/opengl + x11-libs/libSM + x11-libs/libdrm + x11-libs/libX11 + >=x11-libs/libxcb-1.10[xkb] +" + +S="${WORKDIR}/Telegram" + +src_install() { + newbin Telegram telegram-desktop + + insinto /etc/tdesktop + newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop" + + local icon_size + for icon_size in 16 32 48 64 128 256 512; do + newicon -s "${icon_size}" \ + "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ + telegram.png + done + + domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "spell checker support" app-text/enchant +} diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1.ebuild deleted file mode 100644 index 57697533db07..000000000000 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop optfeature xdg - -DESCRIPTION="Official desktop client for Telegram (binary package)" -HOMEPAGE="https://desktop.telegram.org" -SRC_URI=" - https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz - amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) -" - -LICENSE="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="usr/lib/${PN}/Telegram" - -RDEPEND=" - dev-libs/glib:2 - >=media-libs/fontconfig-2.13 - media-libs/freetype:2 - sys-libs/zlib - virtual/opengl - x11-libs/libSM - x11-libs/libdrm - x11-libs/libX11 - >=x11-libs/libxcb-1.10[xkb] -" - -S="${WORKDIR}/Telegram" - -src_install() { - exeinto /usr/lib/${PN} - doexe "Telegram" - newbin "${FILESDIR}"/${PN} "telegram-desktop" - - local icon_size - for icon_size in 16 32 48 64 128 256 512; do - newicon -s "${icon_size}" \ - "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ - telegram.png - done - - domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "spell checker support" app-text/enchant -} diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild new file mode 100644 index 000000000000..ed873795842e --- /dev/null +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop optfeature xdg + +DESCRIPTION="Official desktop client for Telegram (binary package)" +HOMEPAGE="https://desktop.telegram.org" +SRC_URI=" + https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz + amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) +" + +LICENSE="GPL-3-with-openssl-exception" +SLOT="0" +KEYWORDS="-* ~amd64" + +QA_PREBUILT="usr/bin/telegram-desktop" + +RDEPEND=" + dev-libs/glib:2 + >=media-libs/fontconfig-2.13 + media-libs/freetype:2 + virtual/opengl + x11-libs/libX11 + >=x11-libs/libxcb-1.10[xkb] +" + +S="${WORKDIR}/Telegram" + +src_install() { + newbin Telegram telegram-desktop + + insinto /etc/tdesktop + newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop" + + local icon_size + for icon_size in 16 32 48 64 128 256 512; do + newicon -s "${icon_size}" \ + "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ + telegram.png + done + + domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "spell checker support" app-text/enchant +} diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0.ebuild deleted file mode 100644 index 18ad635fcc20..000000000000 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop optfeature xdg - -DESCRIPTION="Official desktop client for Telegram (binary package)" -HOMEPAGE="https://desktop.telegram.org" -SRC_URI=" - https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz - amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) -" - -LICENSE="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="usr/lib/${PN}/Telegram" - -RDEPEND=" - dev-libs/glib:2 - >=media-libs/fontconfig-2.13 - media-libs/freetype:2 - virtual/opengl - x11-libs/libX11 - >=x11-libs/libxcb-1.10[xkb] -" - -S="${WORKDIR}/Telegram" - -src_install() { - exeinto /usr/lib/${PN} - doexe "Telegram" - newbin "${FILESDIR}"/${PN} "telegram-desktop" - - local icon_size - for icon_size in 16 32 48 64 128 256 512; do - newicon -s "${icon_size}" \ - "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ - telegram.png - done - - domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "spell checker support" app-text/enchant -} diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild new file mode 100644 index 000000000000..015193a01c6f --- /dev/null +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop optfeature xdg + +DESCRIPTION="Official desktop client for Telegram (binary package)" +HOMEPAGE="https://desktop.telegram.org" +SRC_URI=" + https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz + amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) +" + +LICENSE="GPL-3-with-openssl-exception" +SLOT="0" +KEYWORDS="-* ~amd64" + +QA_PREBUILT="usr/bin/telegram-desktop" + +RDEPEND=" + dev-libs/glib:2 + >=media-libs/fontconfig-2.13 + media-libs/freetype:2 + virtual/opengl + x11-libs/libX11 + >=x11-libs/libxcb-1.10[xkb] +" + +S="${WORKDIR}/Telegram" + +src_install() { + newbin Telegram telegram-desktop + + insinto /etc/tdesktop + newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop" + + local icon_size + for icon_size in 16 32 48 64 128 256 512; do + newicon -s "${icon_size}" \ + "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ + telegram.png + done + + domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "spell checker support" app-text/enchant +} diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1.ebuild deleted file mode 100644 index 11e16f31c865..000000000000 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop optfeature xdg - -DESCRIPTION="Official desktop client for Telegram (binary package)" -HOMEPAGE="https://desktop.telegram.org" -SRC_URI=" - https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz - amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) -" - -LICENSE="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="usr/lib/${PN}/Telegram" - -RDEPEND=" - dev-libs/glib:2 - >=media-libs/fontconfig-2.13 - media-libs/freetype:2 - virtual/opengl - x11-libs/libX11 - >=x11-libs/libxcb-1.10[xkb] -" - -S="${WORKDIR}/Telegram" - -src_install() { - exeinto /usr/lib/${PN} - doexe "Telegram" - newbin "${FILESDIR}"/${PN} "telegram-desktop" - - local icon_size - for icon_size in 16 32 48 64 128 256 512; do - newicon -s "${icon_size}" \ - "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ - telegram.png - done - - domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "spell checker support" app-text/enchant -} -- cgit v1.2.3-65-gdbad