From 38d122cf1fa0843f2c8a9d2eb8eb3cc0d2709d91 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sat, 14 Sep 2019 06:14:23 +0200
Subject: [PATCH] telegram-desktop: update to 1.8.8.

---
 .../patches/gdk-wayland-backend.patch         | 48 -------------------
 .../telegram-desktop/patches/stdafx.h.patch   | 19 ++++++++
 srcpkgs/telegram-desktop/template             |  4 +-
 3 files changed, 21 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/telegram-desktop/patches/gdk-wayland-backend.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/stdafx.h.patch

diff --git a/srcpkgs/telegram-desktop/patches/gdk-wayland-backend.patch b/srcpkgs/telegram-desktop/patches/gdk-wayland-backend.patch
deleted file mode 100644
index ac6db87469..0000000000
--- a/srcpkgs/telegram-desktop/patches/gdk-wayland-backend.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Reason: Make sure that Telegram only tries gtk3 when running under wayland and allow the GDK wayland
-	Possible fix for void-linux/void-packages#14251
-Athor: John <johnz@posteo.net>
-
---- Telegram/SourceFiles/platform/linux/linux_libs.cpp	2019-09-07 19:39:53.957208036 +0200
-+++ -	2019-09-07 19:46:41.632839765 +0200
-@@ -106,8 +106,13 @@
- 		// Otherwise we get segfault in Ubuntu 17.04 in gtk_init_check() call.
- 		// See https://github.com/telegramdesktop/tdesktop/issues/3176
- 		// See https://github.com/telegramdesktop/tdesktop/issues/3162
--		DEBUG_LOG(("Limit allowed GDK backends to x11"));
--		gdk_set_allowed_backends("x11");
-+		if(QApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive)) {
-+			DEBUG_LOG(("Limit allowed GDK backends to wayland"));
-+			gdk_set_allowed_backends("wayland");
-+		} else if (QApplication::platformName() == qsl("xcb")) {
-+			DEBUG_LOG(("Limit allowed GDK backends to x11"));
-+			gdk_set_allowed_backends("x11");
-+		}
- 	}
- 
- 	DEBUG_LOG(("Library gtk functions loaded!"));
-@@ -228,6 +233,7 @@
- 
- 	bool gtkLoaded = false;
- 	bool indicatorLoaded = false;
-+	bool isWayland = QApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive);
- 	QLibrary lib_gtk, lib_indicator;
- 	if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) || loadLibrary(lib_indicator, "appindicator3", 1)) {
- 		if (loadLibrary(lib_gtk, "gtk-3", 0)) {
-@@ -235,7 +241,7 @@
- 			indicatorLoaded = setupAppIndicator(lib_indicator);
- 		}
- 	}
--	if (!gtkLoaded || !indicatorLoaded) {
-+	if ((!gtkLoaded || !indicatorLoaded) && !isWayland) {
- 		if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) || loadLibrary(lib_indicator, "appindicator", 1)) {
- 			if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
- 				gtkLoaded = indicatorLoaded = false;
-@@ -250,7 +256,7 @@
- 		if (loadLibrary(lib_gtk, "gtk-3", 0)) {
- 			gtkLoaded = setupGtkBase(lib_gtk);
- 		}
--		if (!gtkLoaded && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
-+		if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
- 			gtkLoaded = setupGtkBase(lib_gtk);
- 		}
- 	}
diff --git a/srcpkgs/telegram-desktop/patches/stdafx.h.patch b/srcpkgs/telegram-desktop/patches/stdafx.h.patch
new file mode 100644
index 0000000000..1202a268f6
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/stdafx.h.patch
@@ -0,0 +1,19 @@
+--- Telegram/SourceFiles/stdafx.h	2019-09-10 17:30:47.000000000 +0200
++++ -	2019-09-18 14:03:45.704797349 +0200
+@@ -60,6 +60,8 @@
+ #include <QtCore/QString>
+ #include <QtCore/QStringList>
+ #include <QtCore/QVector>
++#include <QtNetwork/QNetworkProxy>
++#include <QtNetwork/QTcpSocket>
+ 
+ #include <QtGui/QIcon>
+ #include <QtGui/QImage>
+@@ -119,6 +121,7 @@
+ 
+ #include "base/basic_types.h"
+ #include "logs.h"
++#include "scheme.h"
+ #include "core/utils.h"
+ #include "config.h"
+ 
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 6334f09c02..47c73c597f 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=1.8.4
+version=1.8.8
 revision=1
 _libtgvoip_commit=d4a0f719ffd8d29e88474f67abc9fc862661c3b9
 _GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
@@ -30,7 +30,7 @@ distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.g
  https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz
  https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz
  https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz"
-checksum="97f034d78447c99002b8742c75a3a436e709cdf2f5dff79f7ca04a8c76298627
+checksum="32242002f6adc2f322f6bd38b8d225d03cd44b86c0e83b3840acb737f9340915
  bb75188b900907a5b00594ad3ddb78195c8d1fdc144e5a458b314dd666eba996
  be81db4ab1b57102a0fa1cd0c4a6469294eb9daf24294347592245b754f65ff6
  aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d