commit:     d4d5d2b25219999249569b6031b6514f653047f1
Author:     Henning Schild <henning <AT> hennsch <DOT> de>
AuthorDate: Sun Oct  3 08:39:51 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct  3 15:24:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d5d2b2

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 <henning <AT> hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/22472
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 net-im/telegram-desktop-bin/files/telegram-desktop-bin           | 9 ---------
 ...top-bin-3.0.1.ebuild => telegram-desktop-bin-3.0.1-r1.ebuild} | 9 +++++----
 ...top-bin-3.1.0.ebuild => telegram-desktop-bin-3.1.0-r1.ebuild} | 9 +++++----
 ...top-bin-3.1.1.ebuild => telegram-desktop-bin-3.1.1-r1.ebuild} | 9 +++++----
 4 files changed, 15 insertions(+), 21 deletions(-)

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 954b3bdeaea..00000000000
--- 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.ebuild 
b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild
similarity index 86%
rename from net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1.ebuild
rename to net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild
index 57697533db0..6f908ad66fa 100644
--- 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-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 
-QA_PREBUILT="usr/lib/${PN}/Telegram"
+QA_PREBUILT="usr/bin/telegram-desktop"
 
 RDEPEND="
        dev-libs/glib:2
@@ -33,9 +33,10 @@ RDEPEND="
 S="${WORKDIR}/Telegram"
 
 src_install() {
-       exeinto /usr/lib/${PN}
-       doexe "Telegram"
-       newbin "${FILESDIR}"/${PN} "telegram-desktop"
+       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

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-r1.ebuild
similarity index 86%
rename from net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0.ebuild
rename to net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild
index 18ad635fcc2..ed873795842 100644
--- 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-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 
-QA_PREBUILT="usr/lib/${PN}/Telegram"
+QA_PREBUILT="usr/bin/telegram-desktop"
 
 RDEPEND="
        dev-libs/glib:2
@@ -30,9 +30,10 @@ RDEPEND="
 S="${WORKDIR}/Telegram"
 
 src_install() {
-       exeinto /usr/lib/${PN}
-       doexe "Telegram"
-       newbin "${FILESDIR}"/${PN} "telegram-desktop"
+       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

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-r1.ebuild
similarity index 86%
rename from net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1.ebuild
rename to net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild
index 11e16f31c86..015193a01c6 100644
--- 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-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 
-QA_PREBUILT="usr/lib/${PN}/Telegram"
+QA_PREBUILT="usr/bin/telegram-desktop"
 
 RDEPEND="
        dev-libs/glib:2
@@ -30,9 +30,10 @@ RDEPEND="
 S="${WORKDIR}/Telegram"
 
 src_install() {
-       exeinto /usr/lib/${PN}
-       doexe "Telegram"
-       newbin "${FILESDIR}"/${PN} "telegram-desktop"
+       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

Reply via email to