summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEsteve Varela Colominas <esteve.varela@gmail.com>2021-04-28 12:58:35 +0200
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2021-04-28 06:14:59 -0700
commit7ee2b4eb47d30099e87982b282accb6b04e0048b (patch)
treef605a8ad292a97d340cfbc17d4a14ef83c59400c
parentdev-db/pg_activity: version bump to 2.1.5 - remove old (diff)
downloadgentoo-7ee2b4eb.tar.gz
gentoo-7ee2b4eb.tar.bz2
gentoo-7ee2b4eb.zip
net-im/telegram-desktop: fix USE=-dbus
Thanks-to: Kirill A. Shutemov <kirill@shutemov.name> Closes: https://bugs.gentoo.org/786183 Closes: https://github.com/gentoo/gentoo/pull/20570 Signed-off-by: Esteve Varela Colominas <esteve.varela@gmail.com> Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch17
-rw-r--r--net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild)4
2 files changed, 21 insertions, 0 deletions
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 000000000000..5351a808ec4c
--- /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
index dbfad550c49f..ee4a0e5a5bfb 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