# HG changeset patch
# User Chris Cannam
# Date 1535712351 -3600
# Node ID 7496836f8f2797159eaf7c95b6ac4ffebd9f6d63
# Parent  25b49a378431d867e4e340c9f72ecfb02f56f3fd
Attempt to update AppImage and Travis build files for c++14

diff -r 25b49a378431 -r 7496836f8f27 .travis.yml
--- a/.travis.yml	Fri Aug 31 10:15:16 2018 +0100
+++ b/.travis.yml	Fri Aug 31 11:45:51 2018 +0100
@@ -3,16 +3,20 @@
 
 matrix:
   include:
+    - os: osx
+      osx_image: xcode9
     - os: linux
       dist: trusty
       sudo: required
-    - os: osx
-      osx_image: xcode9
-
-addons:
-  apt:
-    packages:
-     - libbz2-dev libfftw3-dev libfishsound1-dev libid3tag0-dev liblo-dev liblrdf0-dev libmad0-dev liboggz2-dev libpulse-dev libsamplerate-dev libsndfile-dev libsord-dev libxml2-utils portaudio19-dev qt5-default libqt5svg5-dev raptor-utils librubberband-dev autoconf libtool git mlton
+      addons:
+        apt:
+          sources:
+           - ubuntu-toolchain-r-test
+          packages:
+           - libbz2-dev libfftw3-dev libfishsound1-dev libid3tag0-dev liblo-dev liblrdf0-dev libmad0-dev liboggz2-dev libpulse-dev libsamplerate-dev libsndfile-dev libsord-dev libxml2-utils portaudio19-dev qt5-default libqt5svg5-dev raptor-utils librubberband-dev autoconf libtool git mlton g++-4.9
+      env:
+        - MATRIX_CC=gcc-4.9
+        - MATRIX_CXX=g++-4.9
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew update ; fi
@@ -20,8 +24,7 @@
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew install qt5 ; fi
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then export PATH=$PATH:/usr/local/opt/qt5/bin ; fi
   - ( cd ../ ; git clone https://github.com/sandstorm-io/capnproto )
-  - if [[ "$TRAVIS_OS_NAME" = "linux" ]] ; then ( cd ../capnproto ; git checkout v0.6.1 ) ; fi
-  - ( cd ../capnproto/c++ ; ./setup-autotools.sh && autoreconf -i )
+  - ( cd ../capnproto/c++ ; autoreconf -i )
   - ( cd ../capnproto/c++ ; ./configure && make && sudo make install )
 
 before_script:
diff -r 25b49a378431 -r 7496836f8f27 deploy/linux/docker/Dockerfile_appimage.in
--- a/deploy/linux/docker/Dockerfile_appimage.in	Fri Aug 31 10:15:16 2018 +0100
+++ b/deploy/linux/docker/Dockerfile_appimage.in	Fri Aug 31 11:45:51 2018 +0100
@@ -42,23 +42,31 @@
 RUN apt-add-repository -y ppa:beineri/opt-qt-5.10.1-trusty
 RUN apt-get update && \
     apt-get install -y \
+    g++-4.9 \
     qt510base \
     qt510svg
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+RUN for x in g++ gcc gcc-ar gcc-nm gcc-ranlib ; do ln -sf /usr/bin/$x-4.9 /usr/bin/$x ; ln -sf /usr/bin/x86_64-linux-gnu-gcc-$x-4.9 /usr/bin/x86_64-linux-gnu-gcc-$x ; done
+
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8  
 ENV LANGUAGE en_US:en  
 ENV LC_ALL en_US.UTF-8
+
 RUN hg clone -r[[REVISION]] https://code.soundsoftware.ac.uk/hg/sonic-visualiser
+
 RUN git clone https://github.com/sandstorm-io/capnproto
 WORKDIR capnproto
 RUN git checkout v0.7.0
 WORKDIR c++
-RUN ./setup-autotools.sh && autoreconf -i && ./configure && make -j3 && make install
+RUN autoreconf -i && ./configure && make -j3 && make install
+
 WORKDIR ../../sonic-visualiser
 ENV QTDIR /opt/qt510
 ENV PATH /opt/qt510/bin:$PATH
 RUN ./configure
 RUN make -j3
+
 RUN deploy/linux/deploy-appimage.sh
 RUN tar cvf output.tar *.AppImage && cp output.tar ..