* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop-bin/, net-im/telegram-desktop-bin/files/
@ 2018-08-17 6:27 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2018-08-17 6:27 UTC (permalink / raw
To: gentoo-commits
commit: ffba6cf7974723a4a75bc61384556a1d093662ca
Author: Henning Schild <henning <AT> hennsch <DOT> de>
AuthorDate: Sat Jul 28 14:05:42 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 06:26:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffba6cf7
net-im/telegram-desktop-bin: exclude from session management
The application seems to register with the X11 session manager but fails
to follow the protocol for remembering its state. The result is that a
session manager will restart it, and during that process the command
line argument for disabling the internal updater gets lost.
So on a restarted session the updater will be enabled again.
Do not let the application register at the session manager in the first
place, by unsetting the env variable used to find it.
Closes: https://bugs.gentoo.org/662330
Closes: https://github.com/gentoo/gentoo/pull/9366
Signed-off-by: Henning Schild <henning <AT> hennsch.de>
.../files/telegram-desktop-bin-r1 | 9 ++++
.../telegram-desktop-bin-1.3.10-r1.ebuild | 59 ++++++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r1 b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r1
new file mode 100644
index 00000000000..954b3bdeaea
--- /dev/null
+++ b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r1
@@ -0,0 +1,9 @@
+#!/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-1.3.10-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10-r1.ebuild
new file mode 100644
index 00000000000..11ccb634fcf
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils 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 )
+ x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="telegram"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ >=sys-apps/dbus-1.4.20
+ x11-libs/libX11
+ >=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+ exeinto /usr/lib/${PN}
+ doexe "Telegram"
+ newbin "${FILESDIR}"/${PN}-r1 "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-desktop.png
+ done
+
+ domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop-bin/, net-im/telegram-desktop-bin/files/
@ 2018-12-13 13:00 Mikle Kolyada
0 siblings, 0 replies; 3+ messages in thread
From: Mikle Kolyada @ 2018-12-13 13:00 UTC (permalink / raw
To: gentoo-commits
commit: a2c5d222662ac167e2a05403410c1f94b050284c
Author: Henning Schild <henning <AT> hennsch <DOT> de>
AuthorDate: Thu Dec 13 08:30:02 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 13:00:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c5d222
net-im/telegram-desktop-bin: Bump version to 1.5.1
Signed-off-by: Henning Schild <henning <AT> hennsch.de>
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-im/telegram-desktop-bin/Manifest | 3 +
.../files/telegram-desktop-bin | 9 +++
.../telegram-desktop-bin-1.5.1.ebuild | 65 ++++++++++++++++++++++
3 files changed, 77 insertions(+)
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 5307c86e6df..ff0888d6c58 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,3 +1,6 @@
DIST tdesktop-1.4.3.tar.gz 17341652 BLAKE2B 26bacb695bb6e5adfd9fcdb394652695b6d8300fb856caf12cb7e22dd571b370cf74d38363c7eecdd8d7bde9fc3d43a91fd08ab175c2d3406db4f8cfed8619aa SHA512 c72deb10be79221c86b84cb36cf647e69bd51f57c05ae0ab0a43a23b04829aed068536124acfafd308e2b850de64bf448eec770e1d6a5423bb4a6b4c445edb6f
+DIST tdesktop-1.5.1.tar.gz 14105322 BLAKE2B d78859771f891eb04223cc8a6992daf4d6e9f33f4fdf810629fd640bc3a504911994fb6f2c67c7ca9163dd3be9cfa7eb9f21e7f3a9ac244a78e7d21dc3b7ae70 SHA512 9e9f24d925c4aa36961abeec9b4ca1a08238ba716ed5e472ae7d9660af7d2660de4a7fa92eb34fb27b5a5a17bbe78a803cf2953c159c3ee84996d2fc7ff389d3
DIST tsetup.1.4.3.tar.xz 34895128 BLAKE2B efea0915fee03ff7eecd4739b4c656b7282858611c96d7a59faf8e59f94a6a6bb5e29060f280af2dee5e7f6516564268e977f1e801cce0f1bd7c6bbdf491128d SHA512 fb344584fa2ce2adb53c6377cee34d917464495aaa0aa20d80ef80071f480ea2477f5fed4d5af336e95c9999dc2f2c73d30ff72146662d076d254b23bfc57969
+DIST tsetup.1.5.1.tar.xz 32080940 BLAKE2B 3ecf42f88904d343d25f927b6f043a916b6ea90e1b1fbb60f34572cf71858d31fa68c240d82daef3c3343295b6defb5be019379d3b018ce7fcf961387290797b SHA512 70a35d5af9a8d4a212f5c7b63989d02392e3d0da30e7baf0644a609899547393a019061e71905a708c14c12e09cf32ced6b42f5889c287b32f4395b3236686c5
DIST tsetup32.1.4.3.tar.xz 37493196 BLAKE2B 1643016dd13e4f214fbac9892c7784f6998ce5fefd50d001d38db1fbd92c2f102eadf4b7d15a46e2151eeff971b5ed70f5ac8b9476ff4d7d489ad8c0ebf95f17 SHA512 e5b321da75b15c97438d30d480ce73305d97fe3373146650f132931f0620ea75aeac369a031ed070e0695af0b85335bb605d9b8b3a8047de3d739ab08bfa8578
+DIST tsetup32.1.5.1.tar.xz 34530452 BLAKE2B 2c074baf733780afc35b64e70f6d4bf8dcd49c44d60e1020f5061bc48e6a71283c8a32f2f848a0fa235b822c4a47e3e771e10306cfa751b9a22d835f18842306 SHA512 f2767b5b0ac027ce341dac2616a18cc865e8e41524a24b17e91b7ad7b14d921fde837e4721da161685a1e7572c3dc3649e3c57f818848979232e23e9ee91d0b0
diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin b/net-im/telegram-desktop-bin/files/telegram-desktop-bin
new file mode 100644
index 00000000000..954b3bdeaea
--- /dev/null
+++ b/net-im/telegram-desktop-bin/files/telegram-desktop-bin
@@ -0,0 +1,9 @@
+#!/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-1.5.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.1.ebuild
new file mode 100644
index 00000000000..d24c8adae29
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils 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://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup.${PV}.tar.xz )
+ x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="telegram"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ >=sys-apps/dbus-1.4.20
+ x11-libs/libX11
+ >=x11-libs/libxcb-1.10[xkb]
+ >=media-libs/fontconfig-2.13
+"
+
+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_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+ einfo
+ einfo "Previous versions of ${PN} have created "
+ einfo "\"~/.local/share/applications/telegram.desktop\". These files"
+ einfo "conflict with the one shipped by portage and should be removed"
+ einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop-bin/, net-im/telegram-desktop-bin/files/
@ 2021-10-03 15:34 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2021-10-03 15:34 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-03 15:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-13 13:00 [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop-bin/, net-im/telegram-desktop-bin/files/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2021-10-03 15:34 Ionen Wolkens
2018-08-17 6:27 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox