1 |
commit: 7ee2b4eb47d30099e87982b282accb6b04e0048b |
2 |
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Apr 28 10:58:35 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 28 13:14:59 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee2b4eb |
7 |
|
8 |
net-im/telegram-desktop: fix USE=-dbus |
9 |
|
10 |
Thanks-to: Kirill A. Shutemov <kirill <AT> shutemov.name> |
11 |
Closes: https://bugs.gentoo.org/786183 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/20570 |
13 |
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> |
14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
15 |
|
16 |
.../tdesktop-2.7.1-fix-disable-dbus-integration.patch | 17 +++++++++++++++++ |
17 |
...2.7.1-r1.ebuild => telegram-desktop-2.7.1-r2.ebuild} | 4 ++++ |
18 |
2 files changed, 21 insertions(+) |
19 |
|
20 |
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 |
21 |
new file mode 100644 |
22 |
index 00000000000..5351a808ec4 |
23 |
--- /dev/null |
24 |
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch |
25 |
@@ -0,0 +1,17 @@ |
26 |
+Index: tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp |
27 |
+=================================================================== |
28 |
+--- tdesktop-2.7.1-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp |
29 |
++++ tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp |
30 |
+@@ -754,10 +754,12 @@ void InstallLauncher(bool force) { |
31 |
+ |
32 |
+ void RegisterCustomScheme(bool force) { |
33 |
+ try { |
34 |
++#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION |
35 |
+ if (InSnap()) { |
36 |
+ SnapDefaultHandler(qsl("tg")); |
37 |
+ return; |
38 |
+ } |
39 |
++#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION |
40 |
+ |
41 |
+ if (cExeName().isEmpty()) { |
42 |
+ return; |
43 |
|
44 |
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 |
45 |
similarity index 98% |
46 |
rename from net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild |
47 |
rename to net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild |
48 |
index dbfad550c49..ee4a0e5a5bf 100644 |
49 |
--- a/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild |
50 |
+++ b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild |
51 |
@@ -65,6 +65,10 @@ REQUIRED_USE=" |
52 |
|
53 |
S="${WORKDIR}/${MY_P}" |
54 |
|
55 |
+PATCHES=( |
56 |
+ "${FILESDIR}/tdesktop-2.7.1-fix-disable-dbus-integration.patch" |
57 |
+) |
58 |
+ |
59 |
pkg_pretend() { |
60 |
if has ccache ${FEATURES}; then |
61 |
ewarn |