public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
Date: Wed, 28 Apr 2021 13:16:15 +0000 (UTC)	[thread overview]
Message-ID: <1619615699.7ee2b4eb47d30099e87982b282accb6b04e0048b.gyakovlev@gentoo> (raw)

commit:     7ee2b4eb47d30099e87982b282accb6b04e0048b
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Wed Apr 28 10:58:35 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 13:14:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee2b4eb

net-im/telegram-desktop: fix USE=-dbus

Thanks-to: Kirill A. Shutemov <kirill <AT> shutemov.name>
Closes: https://bugs.gentoo.org/786183
Closes: https://github.com/gentoo/gentoo/pull/20570
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../tdesktop-2.7.1-fix-disable-dbus-integration.patch   | 17 +++++++++++++++++
 ...2.7.1-r1.ebuild => telegram-desktop-2.7.1-r2.ebuild} |  4 ++++
 2 files changed, 21 insertions(+)

diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
new file mode 100644
index 00000000000..5351a808ec4
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
@@ -0,0 +1,17 @@
+Index: tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+===================================================================
+--- tdesktop-2.7.1-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp
++++ tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+@@ -754,10 +754,12 @@ void InstallLauncher(bool force) {
+ 
+ void RegisterCustomScheme(bool force) {
+ 	try {
++#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+ 		if (InSnap()) {
+ 			SnapDefaultHandler(qsl("tg"));
+ 			return;
+ 		}
++#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+ 
+ 		if (cExeName().isEmpty()) {
+ 			return;

diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild
similarity index 98%
rename from net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild
rename to net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild
index dbfad550c49..ee4a0e5a5bf 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild
@@ -65,6 +65,10 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/tdesktop-2.7.1-fix-disable-dbus-integration.patch"
+)
+
 pkg_pretend() {
 	if has ccache ${FEATURES}; then
 		ewarn


             reply	other threads:[~2021-04-28 13:16 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-28 13:16 Georgy Yakovlev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-21 20:53 [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/ Sam James
2025-02-18 13:20 Yixun Lan
2025-01-06  2:05 Yixun Lan
2024-12-04  3:14 Yixun Lan
2024-11-08  0:35 Yixun Lan
2024-10-23 10:55 Yixun Lan
2024-07-09  0:27 Yixun Lan
2024-07-04 13:47 Yixun Lan
2023-10-31  1:07 Yixun Lan
2023-10-07 22:26 Ionen Wolkens
2023-07-15 16:25 Sam James
2023-07-15 16:25 Sam James
2023-06-10 13:43 Sam James
2023-02-22 23:03 Georgy Yakovlev
2023-01-22 23:36 Georgy Yakovlev
2022-11-29 14:59 Georgy Yakovlev
2022-10-03 22:52 Georgy Yakovlev
2022-08-03 17:40 Georgy Yakovlev
2022-03-13 18:20 Arthur Zamarin
2022-03-13 18:20 Arthur Zamarin
2022-02-16 19:43 Georgy Yakovlev
2022-01-06 23:47 Georgy Yakovlev
2021-09-24 17:33 Georgy Yakovlev
2021-09-16 12:07 Georgy Yakovlev
2021-08-13 23:30 Georgy Yakovlev
2021-08-04  8:31 Georgy Yakovlev
2021-07-20  2:44 Georgy Yakovlev
2021-06-12 22:49 Georgy Yakovlev
2021-06-04 18:45 Georgy Yakovlev
2021-04-23 19:06 Georgy Yakovlev
2020-07-17 18:14 Georgy Yakovlev
2020-07-17 17:58 Georgy Yakovlev
2020-06-29 23:39 Georgy Yakovlev
2020-04-24 20:02 Georgy Yakovlev
2020-04-24 20:02 Georgy Yakovlev
2020-03-31 12:51 Georgy Yakovlev
2020-03-19 17:47 Georgy Yakovlev
2020-03-19 17:47 Georgy Yakovlev
2020-02-26  2:44 Georgy Yakovlev
2020-02-25  8:17 Georgy Yakovlev
2020-02-14  6:21 Georgy Yakovlev
2020-02-12  9:10 Georgy Yakovlev
2020-01-25 10:32 Georgy Yakovlev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1619615699.7ee2b4eb47d30099e87982b282accb6b04e0048b.gyakovlev@gentoo \
    --to=gyakovlev@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox