patch 8.0.0080

Problem:    The OS X build fails on Travis.
Solution:   Skip the virtual framebuffer on OS X.

diff --git a/.travis.yml b/.travis.yml
index e9464aec97b0b1c89f34732eb58211f4b0b8afe0..d4472f20be0c6732f5d3b06f71f8f6884a16a5a9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,11 +69,9 @@ before_install:
     # Lua is not installed on Travis OSX
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi
 
-# Start virtual framebuffer to be able to test the GUI.
+# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
 before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && sleep 3; fi
 
 script:
   - NPROC=$(getconf _NPROCESSORS_ONLN)

diff --git a/src/version.c b/src/version.c
index 88adc6d19b73af00ec50e1ce98ef8a97b1ba6566..d4b84c5ce12b442155678659abd5fc2c864c29ef 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    80,
 /**/
     79,
 /**/