From 26e718c7c38b4e8f69c995b2c6e95be25acca733 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 12 Mar 2020 21:37:07 +0100
Subject: [PATCH] doc/user.rst, .travis.yml: drop GCC 6 support

Debian Stable (Buster) has GCC 8 and Ubuntu LTS (18.04) has GCC 7.

This will unlock a lot of C++17 features like `std::string_view`.
---
 .travis.yml  | 26 --------------------------
 doc/user.rst |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 38b72d547..d57057db6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,32 +67,6 @@ jobs:
       env:
         - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
 
-    # Ubuntu Trusty (16.04) with GCC 6
-    - os: linux
-      dist: trusty
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:mhier/libboost-latest'
-            - sourceline: 'ppa:mstipicevic/ninja-build-1-7-2'
-            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
-          packages:
-            - g++-6
-            - libgtest-dev
-            - boost1.67
-            - python3.6
-            - python3-urllib3
-            - ninja-build
-      before_install:
-        - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
-      install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
-      env:
-        # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
-        - MATRIX_EVAL="export CC='ccache gcc-6' CXX='ccache g++-6' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH"
-
     # Ubuntu Trusty (16.04) with GCC 8
     - os: linux
       dist: trusty
diff --git a/doc/user.rst b/doc/user.rst
index 67bf3b2e8..707165618 100644
--- a/doc/user.rst
+++ b/doc/user.rst
@@ -53,7 +53,7 @@ Download the source tarball from the `MPD home page <https://musicpd.org>`_ and
 
 In any case, you need:
 
-* a C++14 compiler (e.g. gcc 6.0 or clang 3.9)
+* a C++14 compiler (e.g. GCC 7 or clang 4)
 * `Meson 0.49.0 <http://mesonbuild.com/>`__ and `Ninja
   <https://ninja-build.org/>`__
 * Boost 1.58