From 0be560d43f9994f4ad2dbd9d457d1ada3c82f0c1 Mon Sep 17 00:00:00 2001
From: Jonathan Goldfarb <jgoldfar@gmail.com>
Date: Thu, 11 Oct 2018 11:56:00 -0400
Subject: [PATCH] Another try at getting OSX to the build stage

---
 .travis.yml      | 11 ++++++-----
 build_for_ppa.py |  7 +++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 16b9900..eed36fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,8 +77,8 @@ matrix:
     - os: osx # Until the build passes, then re-enable.
 
 before_install:
-  - if [ "${TRAVIS_OS_NAME}" == "osx" ] ; then brew reinstall gettext; fi
-  - if [ "${TRAVIS_OS_NAME}" == "osx" ] ; then brew unlink gettext && brew link gettext --force; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ] ; then brew reinstall gettext; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ] ; then brew unlink gettext && brew link gettext --force; fi
 # Clone and build poppler
   - git clone ${POPPLER_SOURCE}
   - cd poppler; 
@@ -107,14 +107,15 @@ before_install:
     ./configure --disable-programs --disable-python-extension --disable-python-scripting --prefix=${TRAVIS_BUILD_DIR}/usr;
     make;
     make install
-  - if [ "${TRAVIS_OS_NAME}" == "linux" ] ; then sudo ldconfig; fi
-  - if [ "${TRAVIS_OS_NAME}" == "osx" ] ; then sudo update_dyld_shared_cache; fi
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ] ; then sudo ldconfig; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ] ; then sudo update_dyld_shared_cache; fi
   - cd ${TRAVIS_BUILD_DIR}
 
 # Test setup
   - pip install --user Pillow selenium sauceclient
   - export DISPLAY=:99.0
-  - test/start_xvfb.sh
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then test/start_xvfb.sh ;fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ( sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )& fi
   - pushd /
   - python -m SimpleHTTPServer 8000 >/dev/null 2>&1 &
   - popd
diff --git a/build_for_ppa.py b/build_for_ppa.py
index 81dea72..5ea25e5 100755
--- a/build_for_ppa.py
+++ b/build_for_ppa.py
@@ -10,6 +10,9 @@ modified for pdf2htmlEX
 
 modified for general git repo
 2013.05.30
+
+modified for updated repo, support more distributions (hopefully)
+2018.10.11
 """
 
 
@@ -19,8 +22,8 @@ import re
 import time
 
 package='pdf2htmlex'
-ppa_name='ppa:coolwanglu/pdf2htmlex'
-supported_distributions=('precise', 'trusty')
+ppa_name='ppa:jgoldfar/pdf2htmlex'
+supported_distributions=('precise', 'trusty', 'xenial', 'cosmic')
 dist_pattern=re.compile('|'.join(['\\) '+i for i in supported_distributions]))
 archive_cmd='(rm CMakeCache.txt || true) && cmake . && make dist'
 archive_suffix='.tar.bz2'