From 30ae322cf082fb053716141c786d4075a7c983dd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 Feb 2017 18:29:04 +0300
Subject: [PATCH] Move to GCC 6 and silent some warnings there.

---
 Telegram/ThirdParty/minizip/zip.c | 4 ++--
 Telegram/gyp/settings_linux.gypi  | 1 +
 Telegram/gyp/settings_mac.gypi    | 3 ---
 doc/building-cmake.md             | 8 ++++----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Telegram/ThirdParty/minizip/zip.c b/Telegram/ThirdParty/minizip/zip.c
index 3c1a7bff25..d1a31dd28d 100644
--- a/Telegram/ThirdParty/minizip/zip.c
+++ b/Telegram/ThirdParty/minizip/zip.c
@@ -526,8 +526,8 @@ local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
         break;
       }
 
-      if (uPosFound!=0)
-        break;
+    if (uPosFound!=0)
+      break;
   }
   TRYFREE(buf);
   return uPosFound;
diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
index 79eacfcb5a..a723ac9ea2 100644
--- a/Telegram/gyp/settings_linux.gypi
+++ b/Telegram/gyp/settings_linux.gypi
@@ -35,6 +35,7 @@
           '-Wno-comment',
           '-Wno-unused-but-set-variable',
           '-Wno-missing-field-initializers',
+          '-Wno-sign-compare',
         ],
       },
       'conditions': [
diff --git a/Telegram/gyp/settings_mac.gypi b/Telegram/gyp/settings_mac.gypi
index c13c592786..600ec0a799 100644
--- a/Telegram/gyp/settings_mac.gypi
+++ b/Telegram/gyp/settings_mac.gypi
@@ -89,9 +89,6 @@
     }],
     [ 'build_macold', {
       'xcode_settings': {
-        'OTHER_CFLAGS': [
-          '-Wno-inconsistent-missing-override',
-        ],
         'OTHER_CPLUSPLUSFLAGS': [
           '-Wno-inconsistent-missing-override',
         ],
diff --git a/doc/building-cmake.md b/doc/building-cmake.md
index 4d97df46f7..0420ff245a 100644
--- a/doc/building-cmake.md
+++ b/doc/building-cmake.md
@@ -5,13 +5,13 @@
 * Install git by command **sudo apt-get install git** in Terminal
 * Install g++ by command **sudo apt-get install g++** in Terminal
 
-You need to install g++ version 4.9 manually by such commands
+You need to install g++ version 6 manually by such commands
 
 * sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 * sudo apt-get update
-* sudo apt-get install gcc-4.9 g++-4.9
-* sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 21
-* sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 21
+* sudo apt-get install gcc-6 g++-6
+* sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60
+* sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 60
 
 ###Prepare folder