From f4c688767a559498fb54161f19cd15d6d525d589 Mon Sep 17 00:00:00 2001
From: Joseph Donofry <joedonofry@gmail.com>
Date: Fri, 17 May 2019 22:47:47 -0400
Subject: [PATCH] Update azure build.  Temporarily disable travis ci matrix
 notifs

---
 .ci/install.sh | 4 ++--
 .travis.yml    | 2 +-
 CMakeLists.txt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index c0159dff..d1ffb065 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -4,7 +4,7 @@ set -ex
 
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then
     brew update
-    brew install qt5 lmdb clang-format ninja libsodium cmark
+    brew install qt5 lmdb clang-format ninja libsodium cmark autoconf automake libtool || true
 
     # probably should update this to check if these are actually installed or not
     # but this installs boost, cmake, and icu4c if they aren't installed already
@@ -49,7 +49,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
         sudo apt-add-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main"
 
         sudo apt-get update -qq
-        sudo apt-get install -qq -y clang-5.0
+        sudo apt-get install -qq -y clang
 
         sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
 
diff --git a/.travis.yml b/.travis.yml
index 952e56c2..4a51e8ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ dist: trusty
 notifications:
   webhooks:
     urls:
-    - https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MHJlZF9za3klM0FvY2Vhbi5qb2Vkb25vZnJ5LmNvbS8lMjFldkFxa1BIWnVQSElHZWVuaGklM0FvY2Vhbi5qb2Vkb25vZnJ5LmNvbQ
+    # - https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MHJlZF9za3klM0FvY2Vhbi5qb2Vkb25vZnJ5LmNvbS8lMjFldkFxa1BIWnVQSElHZWVuaGklM0FvY2Vhbi5qb2Vkb25vZnJ5LmNvbQ
     on_success: always
     on_failure: always
     on_start: never
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e24f427..151772c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ if(NOT MSVC)
     if (NOT CMAKE_COMPILER_IS_GNUCXX)
         # -Wshadow is buggy and broken in GCC, so do not enable it.
         # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79328
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
+        # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
     endif()
 endif()