From 347bf35c79cabc3127c532b11a166879018fac3f Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Wed, 13 Sep 2017 20:56:46 -0400
Subject: [PATCH] Updates to .travis.yml

- Use qt591
- Only install necessary packages
- Use personal clones of linuxdeployqt and upload.sh to minimize risks that
  updates to the upstream projects would unexpectedly break CI builds.  Clones
  can be updated in a coordinated manner.
---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ecd188..50b6409 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,11 @@ sudo: require
 dist: trusty
 
 before_install:
-    - sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
+    - sudo add-apt-repository ppa:beineri/opt-qt591-trusty -y
     - sudo apt-get update -qq
     
 install: 
-    - sudo apt-get -y install qt58base qt58xmlpatterns qt58translations qt58tools qt58svg zlib1g-dev
+    - sudo apt-get -y install qt59base qt59svg qt59tools zlib1g-dev
     - source /opt/qt5*/bin/qt5*-env.sh
 
 script:
@@ -19,16 +19,16 @@ script:
   - sudo make DESTDIR=appdir install ; sudo chown -R $USER appdir ; find appdir/
 
 after_success:
-  - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
+  - wget -c "https://github.com/jimevins/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
   - chmod a+x linuxdeployqt*.AppImage
   - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - export LD_LIBRARY_PATH=/opt/qt58/lib/:$LD_LIBRARY_PATH
+  - export LD_LIBRARY_PATH=/opt/qt*/lib/:$LD_LIBRARY_PATH
   - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs
   - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage
   - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
   - ls -lh ./gLabels*.AppImage
   - mv ./gLabels*.AppImage glabels-continuous-x86_64.AppImage
-  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  - wget -c https://github.com/jimevins/uploadtool/raw/master/upload.sh
   - bash ./upload.sh glabels-continuous-x86_64.AppImage
   
 branches: