Merge pull request #148 from fixmycode/master

changed wkhtmltopdf install procedure

Author: johnraz

.travis.yml

@@ -42,15 +42,13 @@ matrix:
       env: DJANGO="Django>=1.7,<1.8"
 before_install:
   - PWD=`pwd`
-  - "echo '## Installing dependencies'"
-  - "sudo apt-get update"
-  - "sudo apt-get install -y openssl build-essential xorg libssl-dev xfonts-75dpi"
-  - "echo '## Downloading wkhtmltopdf'"
-  - "wget http://download.gna.org/wkhtmltopdf/0.12/0.12.2.1/wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb"
-  - "echo '## Installing wkhtmltox'"
-  - "sudo dpkg -i wkhtmltox-0.12.2.1_linux-wheezy-amd64.deb"
-  - WHICH_WK=`which wkhtmltopdf`
-  - "export WKHTMLTOPDF_CMD=$WHICH_WK"
+  - echo '## Installing wkhtmltopdf dependencies'
+  - sudo apt-get update -qq
+  - sudo apt-get install -y libxrender1 libfontconfig1 zlib1g libfreetype6 libx11-6 libxext6
+  - echo '## Installing wkhtmltopdf'
+  - wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
+  - tar xf wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
+  - export WKHTMLTOPDF_CMD="$PWD/wkhtmltox/bin/wkhtmltopdf"
 install:
   - pip install $DJANGO
   - pip install -r test_requirements.txt