From 80b23262f20da6913bbab778fbb0a01250e29990 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Mon, 11 Mar 2019 01:25:14 +0100
Subject: [PATCH] telegram-desktop: update to 1.6.0

---
 srcpkgs/telegram-desktop/template | 35 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 73016f9834..c1b26c45f5 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,14 +1,14 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=1.5.15
+version=1.6.0
 revision=1
-_libtgvoip_commit=59a975bf66c19ebddd8c82d9d501fddc02584d7c
+_libtgvoip_commit=7b62334d2f32c44f0b19aff5278e7eb85b28b02c
 _GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
 _variant_commit=550ac2f159ca883d360c196149b466955c77a573
-_crl_commit=9b7c6b5d9f1b59d2160bf6e9c4e74510f955efe1
+_crl_commit=84072fba75f14620935e5e91788ce603daeb1988
 _Catch_commit=5ca44b68721833ae3731802ed99af67c6f38a53a
-create_wrksrc=yes
-build_wrksrc="tdesktop-${version}/Telegram"
+wrksrc="tdesktop-${version}"
+build_wrksrc="Telegram"
 build_style=cmake
 cmake_builddir=build-telegram
 configure_args="-DENABLE_CRASH_REPORTS=OFF -DENABLE_GTK_INTEGRATION=ON
@@ -29,11 +29,11 @@ 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="27916cff1fe9a1042152103cf9ad3385296240fb3d4470a079bae47b1fefd43f
- def54b1aa4f9e0fcd8d1134eec8a86cbe804247ed9270cb479ceee5adc05383a
+checksum="2f56a608ef00c5b78fa92a6208a4e8fcca26283eeb2c153e236e6e041226ab5a
+ 3846ca12abd98e393f3f4f03a870dc595e70bcfa272c0385e59f63550eb99eed
  be81db4ab1b57102a0fa1cd0c4a6469294eb9daf24294347592245b754f65ff6
  aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d
- e605df0dc5d27066e8856b089a308f353c5e71ea7aa6cb102e50a64c7103ff8d
+ 0f4143814b17d61d09c6a7fb6764ce74756ec14c0aab94cd65758f7b5a6d2928
  d24e6d9df2b8aa5739d3b9077c6b0ff0ef4d5ef8acc52c3a57e32893854d8d18"
 
 build_options="clang custom_api_id pulseaudio"
@@ -80,12 +80,16 @@ post_extract() {
 		msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
 		exit 1
 	fi
-
-	cp -rup ${wrksrc}/libtgvoip-${_libtgvoip_commit}/* ${build_wrksrc}/ThirdParty/libtgvoip
-	cp -rup ${wrksrc}/GSL-${_GSL_commit}/* ${build_wrksrc}/ThirdParty/GSL
-	cp -rup ${wrksrc}/variant-${_variant_commit}/* ${build_wrksrc}/ThirdParty/variant
-	cp -rup ${wrksrc}/crl-${_crl_commit}/* ${build_wrksrc}/ThirdParty/crl
-	cp -rup ${wrksrc}/Catch2-${_Catch_commit}/* ${build_wrksrc}/ThirdParty/Catch
+	rmdir ${wrksrc}/${build_wrksrc}/ThirdParty/libtgvoip
+	mv ../libtgvoip-${_libtgvoip_commit} ${wrksrc}/${build_wrksrc}/ThirdParty/libtgvoip
+	rmdir ${wrksrc}/${build_wrksrc}/ThirdParty/GSL
+	mv ../GSL-${_GSL_commit} ${wrksrc}/${build_wrksrc}/ThirdParty/GSL
+	rmdir ${wrksrc}/${build_wrksrc}/ThirdParty/variant
+	mv ../variant-${_variant_commit} ${wrksrc}/${build_wrksrc}/ThirdParty/variant
+	rmdir ${wrksrc}/${build_wrksrc}/ThirdParty/crl
+	mv ../crl-${_crl_commit} ${wrksrc}/${build_wrksrc}/ThirdParty/crl
+	rmdir ${wrksrc}/${build_wrksrc}/ThirdParty/Catch
+	mv ../Catch2-${_Catch_commit} ${wrksrc}/${build_wrksrc}/ThirdParty/Catch
 
 	cp ${FILESDIR}/Telegram.cmake ${build_wrksrc}/CMakeLists.txt
 	cp ${FILESDIR}/ThirdParty-crl.cmake ${build_wrksrc}/ThirdParty/crl/CMakeLists.txt
@@ -104,9 +108,6 @@ post_extract() {
 	if [ -r "$FILESDIR/custom_api_id.h" ]; then
 		cp "${FILESDIR}/custom_api_id.h" "${wrksrc}/TelegramPrivate"
 	fi
-
-	# change wrksrc temporarily so that patches can be applied
-	wrksrc="${wrksrc}/tdesktop-${version}"
 }
 
 pre_configure() {