Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/
Date: Wed, 01 Jul 2020 17:02:31
Message-Id: 1593622920.9ccaf3ec7936baea27692990a809da1187aa1031.gyakovlev@gentoo
1 commit: 9ccaf3ec7936baea27692990a809da1187aa1031
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 1 16:51:03 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 1 17:02:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ccaf3ec
7
8 net-im/telegram-desktop: drop unused patch
9
10 merged upstream
11
12 Package-Manager: Portage-2.3.103, Repoman-2.3.23
13 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
14
15 net-im/telegram-desktop/files/2.1.14-no-gtk.patch | 21 ---------------------
16 1 file changed, 21 deletions(-)
17
18 diff --git a/net-im/telegram-desktop/files/2.1.14-no-gtk.patch b/net-im/telegram-desktop/files/2.1.14-no-gtk.patch
19 deleted file mode 100644
20 index 365b7f2967e..00000000000
21 --- a/net-im/telegram-desktop/files/2.1.14-no-gtk.patch
22 +++ /dev/null
23 @@ -1,21 +0,0 @@
24 -diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
25 -index eb23796..3424bab 100644
26 ---- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
27 -+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
28 -@@ -521,6 +521,7 @@ QString GetIconName() {
29 - }
30 -
31 - bool GtkClipboardSupported() {
32 -+#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
33 - return (Libs::gtk_clipboard_get != nullptr)
34 - && (Libs::gtk_clipboard_wait_for_contents != nullptr)
35 - && (Libs::gtk_clipboard_wait_for_image != nullptr)
36 -@@ -532,6 +533,8 @@ bool GtkClipboardSupported() {
37 - && (Libs::gdk_pixbuf_get_rowstride != nullptr)
38 - && (Libs::gdk_pixbuf_get_has_alpha != nullptr)
39 - && (Libs::gdk_atom_intern != nullptr);
40 -+#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
41 -+ return false;
42 - }
43 -
44 - QImage GetImageFromClipboard() {