Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'

3 files changed, 5 insertions, 78 deletions

diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 2aa090742044..69d67ca205e2 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,11 +4,11 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.5.4";
-    sha256Hash = "0a52m5qkvk01yl3za3k7pccjrqkr8gbxqnj5lnhh1im1pdxqwh4m";
+    version = "1.5.11";
+    sha256Hash = "09blyzs6mrmrrmjcfia9pa35mfv4zfc9mrqc36hqqcchmg54kx6w";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "415526";
-    archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik";
+    archPatchesRevision = "429149";
+    archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli";
   };
 in {
   stable = mkTelegram stableVersion;
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch
deleted file mode 100644
index 1c79840d6260..000000000000
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Date: Tue, 17 Jul 2018 20:29:49 +0200
-
----
- Telegram/SourceFiles/export/data/export_data_types.cpp | 9 ++++++---
- Telegram/SourceFiles/export/export_api_wrap.cpp        | 6 ++++--
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
-index f835dc2f9..e811c27e8 100644
---- a/Telegram/SourceFiles/export/data/export_data_types.cpp
-+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
-@@ -221,7 +221,8 @@ Image ParseMaxImage(
- 				result.width = data.vw.v;
- 				result.height = data.vh.v;
- 				result.file.location = ParseLocation(data.vlocation);
--				if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
-+				constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>();
-+				if constexpr (condition) {
- 					result.file.content = data.vbytes.v;
- 					result.file.size = result.file.content.size();
- 				} else {
-@@ -409,7 +410,8 @@ Document ParseDocument(
- 			result.width = data.vw.v;
- 			result.height = data.vh.v;
- 			result.file.location = ParseLocation(data.vlocation);
--			if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
-+			constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>();
-+			if constexpr (condition) {
- 				result.file.content = data.vbytes.v;
- 				result.file.size = result.file.content.size();
- 			} else {
-@@ -1017,7 +1019,8 @@ Message ParseMessage(
- 	auto result = Message();
- 	data.match([&](const auto &data) {
- 		result.id = data.vid.v;
--		if constexpr (!MTPDmessageEmpty::Is<decltype(data)>()) {
-+		constexpr bool condition = !MTPDmessageEmpty::Is<decltype(data)>();
-+		if constexpr (condition) {
- 			result.toId = ParsePeerId(data.vto_id);
- 			const auto peerId = (!data.is_out()
- 				&& data.has_from_id()
-diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
-index b618937f6..bb98647dd 100644
---- a/Telegram/SourceFiles/export/export_api_wrap.cpp
-+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
-@@ -709,7 +709,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
- 	Expects(_userpicsProcess != nullptr);
- 
- 	result.match([&](const auto &data) {
--		if constexpr (MTPDphotos_photos::Is<decltype(data)>()) {
-+		constexpr bool condition = MTPDphotos_photos::Is<decltype(data)>();
-+		if constexpr (condition) {
- 			_userpicsProcess->lastSlice = true;
- 		}
- 		loadUserpicsFiles(Data::ParseUserpicsSlice(
-@@ -1141,7 +1142,8 @@ void ApiWrap::requestMessagesSlice() {
- 		result.match([&](const MTPDmessages_messagesNotModified &data) {
- 			error("Unexpected messagesNotModified received.");
- 		}, [&](const auto &data) {
--			if constexpr (MTPDmessages_messages::Is<decltype(data)>()) {
-+			constexpr bool condition = MTPDmessages_messages::Is<decltype(data)>();
-+			if constexpr (condition) {
- 				_chatProcess->lastSlice = true;
- 			}
- 			loadMessagesFiles(Data::ParseMessagesSlice(
--- 
-2.16.3
-
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index c20da7eeb665..c32e6b186b7a 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -29,12 +29,7 @@ mkDerivation rec {
   };
 
   # TODO: libtgvoip.patch no-gtk2.patch
-  patches = [
-      "${archPatches}/tdesktop.patch"
-    ]
-    # TODO: Only required to work around a compiler bug.
-    # This should be fixed in GCC 7.3.1 (or later?)
-    ++ [ ./fix-internal-compiler-error.patch ];
+  patches = [ "${archPatches}/tdesktop.patch" ];
 
   postPatch = ''
     substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \