Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop-bin/, net-im/telegram-desktop-bin/files/
Date: Sun, 03 Oct 2021 15:34:05
Message-Id: 1633274649.d4d5d2b25219999249569b6031b6514f653047f1.ionen@gentoo
1 commit: d4d5d2b25219999249569b6031b6514f653047f1
2 Author: Henning Schild <henning <AT> hennsch <DOT> de>
3 AuthorDate: Sun Oct 3 08:39:51 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 3 15:24:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d5d2b2
7
8 net-im/telegram-desktop-bin: disable internal updater again
9
10 Upstream silently dropped the "-externalupdater" switch. Instead we need
11 to create a file in /etc to disable the internal updater.
12
13 Closes: https://bugs.gentoo.org/814062
14 Signed-off-by: Henning Schild <henning <AT> hennsch.de>
15 Closes: https://github.com/gentoo/gentoo/pull/22472
16 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
17
18 net-im/telegram-desktop-bin/files/telegram-desktop-bin | 9 ---------
19 ...top-bin-3.0.1.ebuild => telegram-desktop-bin-3.0.1-r1.ebuild} | 9 +++++----
20 ...top-bin-3.1.0.ebuild => telegram-desktop-bin-3.1.0-r1.ebuild} | 9 +++++----
21 ...top-bin-3.1.1.ebuild => telegram-desktop-bin-3.1.1-r1.ebuild} | 9 +++++----
22 4 files changed, 15 insertions(+), 21 deletions(-)
23
24 diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin b/net-im/telegram-desktop-bin/files/telegram-desktop-bin
25 deleted file mode 100644
26 index 954b3bdeaea..00000000000
27 --- a/net-im/telegram-desktop-bin/files/telegram-desktop-bin
28 +++ /dev/null
29 @@ -1,9 +0,0 @@
30 -#!/bin/sh
31 -# this wrapper disables the auto-updater of telegram-desktop
32 -# This program is licensed under the same license as telegram-desktop
33 -
34 -# telegram-desktop fails to set RestartCommand with the session manager
35 -# exclude it from session management to prevent restarts without the argument
36 -unset SESSION_MANAGER
37 -
38 -exec /usr/lib/telegram-desktop-bin/Telegram -externalupdater $@
39
40 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
41 similarity index 86%
42 rename from net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1.ebuild
43 rename to net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild
44 index 57697533db0..6f908ad66fa 100644
45 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1.ebuild
46 +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild
47 @@ -16,7 +16,7 @@ LICENSE="GPL-3-with-openssl-exception"
48 SLOT="0"
49 KEYWORDS="-* ~amd64"
50
51 -QA_PREBUILT="usr/lib/${PN}/Telegram"
52 +QA_PREBUILT="usr/bin/telegram-desktop"
53
54 RDEPEND="
55 dev-libs/glib:2
56 @@ -33,9 +33,10 @@ RDEPEND="
57 S="${WORKDIR}/Telegram"
58
59 src_install() {
60 - exeinto /usr/lib/${PN}
61 - doexe "Telegram"
62 - newbin "${FILESDIR}"/${PN} "telegram-desktop"
63 + newbin Telegram telegram-desktop
64 +
65 + insinto /etc/tdesktop
66 + newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
67
68 local icon_size
69 for icon_size in 16 32 48 64 128 256 512; do
70
71 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
72 similarity index 86%
73 rename from net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0.ebuild
74 rename to net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild
75 index 18ad635fcc2..ed873795842 100644
76 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0.ebuild
77 +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild
78 @@ -16,7 +16,7 @@ LICENSE="GPL-3-with-openssl-exception"
79 SLOT="0"
80 KEYWORDS="-* ~amd64"
81
82 -QA_PREBUILT="usr/lib/${PN}/Telegram"
83 +QA_PREBUILT="usr/bin/telegram-desktop"
84
85 RDEPEND="
86 dev-libs/glib:2
87 @@ -30,9 +30,10 @@ RDEPEND="
88 S="${WORKDIR}/Telegram"
89
90 src_install() {
91 - exeinto /usr/lib/${PN}
92 - doexe "Telegram"
93 - newbin "${FILESDIR}"/${PN} "telegram-desktop"
94 + newbin Telegram telegram-desktop
95 +
96 + insinto /etc/tdesktop
97 + newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
98
99 local icon_size
100 for icon_size in 16 32 48 64 128 256 512; do
101
102 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
103 similarity index 86%
104 rename from net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1.ebuild
105 rename to net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild
106 index 11e16f31c86..015193a01c6 100644
107 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1.ebuild
108 +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild
109 @@ -16,7 +16,7 @@ LICENSE="GPL-3-with-openssl-exception"
110 SLOT="0"
111 KEYWORDS="-* ~amd64"
112
113 -QA_PREBUILT="usr/lib/${PN}/Telegram"
114 +QA_PREBUILT="usr/bin/telegram-desktop"
115
116 RDEPEND="
117 dev-libs/glib:2
118 @@ -30,9 +30,10 @@ RDEPEND="
119 S="${WORKDIR}/Telegram"
120
121 src_install() {
122 - exeinto /usr/lib/${PN}
123 - doexe "Telegram"
124 - newbin "${FILESDIR}"/${PN} "telegram-desktop"
125 + newbin Telegram telegram-desktop
126 +
127 + insinto /etc/tdesktop
128 + newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
129
130 local icon_size
131 for icon_size in 16 32 48 64 128 256 512; do