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
