Merge pull request OCA#98 from sebalix/fix-wkhtmltox-0.12.5

[FIX] Upgraded Wkhtmltopdf to 0.12.5
novacode-nl · Aug 8, 2018 · 1423755 · 1423755
2 parents cdbaaa3 + e46d889
commit 1423755
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/vars/Debian-9_Odoo-10.yml b/vars/Debian-9_Odoo-10.yml
@@ -93,7 +93,7 @@ odoo_buildout_build_dependencies:
     - liblcms2-dev
     - libwebp-dev
 
-odoo_wkhtmltox_version: 0.12.4
+odoo_wkhtmltox_version: 0.12.5
 
 odoo_wkhtmltox_depends:
     - fontconfig

diff --git a/vars/Debian-9_Odoo-11.yml b/vars/Debian-9_Odoo-11.yml
@@ -90,7 +90,7 @@ odoo_buildout_build_dependencies:
 odoo_buildout_venv_cmd: "python3 -m virtualenv --no-setuptools --python=python3 {{ odoo_buildout_venv_path }}"
 odoo_pip_venv_cmd: "python3 -m virtualenv --python=python3 {{ odoo_pip_venv_path }}"
 
-odoo_wkhtmltox_version: 0.12.4
+odoo_wkhtmltox_version: 0.12.5
 
 odoo_wkhtmltox_depends:
     - fontconfig

diff --git a/vars/Debian-9_Odoo-8.yml b/vars/Debian-9_Odoo-8.yml
@@ -80,7 +80,7 @@ odoo_buildout_build_dependencies:
     - liblcms2-dev
     - libwebp-dev
 
-odoo_wkhtmltox_version: 0.12.4
+odoo_wkhtmltox_version: 0.12.5
 
 odoo_wkhtmltox_depends:
     - fontconfig

diff --git a/vars/Debian-9_Odoo-9.yml b/vars/Debian-9_Odoo-9.yml
@@ -89,7 +89,7 @@ odoo_buildout_build_dependencies:
     - liblcms2-dev
     - libwebp-dev
 
-odoo_wkhtmltox_version: 0.12.4
+odoo_wkhtmltox_version: 0.12.5
 
 odoo_wkhtmltox_depends:
     - fontconfig

diff --git a/vars/Ubuntu-16_Odoo-10.yml b/vars/Ubuntu-16_Odoo-10.yml
@@ -110,8 +110,9 @@ odoo_wkhtmltox_version: 0.12.1
 # Try Trusty's package if Xenial one is not found
 odoo_wkhtmltox_urls:
     # Debian packages
+    - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox_{{ odoo_wkhtmltox_version }}-1.{{ ansible_distribution_release }}_{{ odoo_debian_arch }}.deb
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-trusty-{{ odoo_debian_arch }}.deb
     - http://nightly.odoo.com/extra/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
-    # generic tar.gz packages
+    # generic tar.xz packages
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz
diff --git a/vars/Ubuntu-16_Odoo-11.yml b/vars/Ubuntu-16_Odoo-11.yml
@@ -98,7 +98,7 @@ odoo_buildout_build_dependencies:
 odoo_buildout_venv_cmd: "virtualenv --no-setuptools --python=python3 {{ odoo_buildout_venv_path }}"
 odoo_pip_venv_cmd: "virtualenv --python=python3 {{ odoo_pip_venv_path }}"
 
-odoo_wkhtmltox_version: 0.12.4
+odoo_wkhtmltox_version: 0.12.5
 
 odoo_wkhtmltox_depends:
     - fontconfig
@@ -111,5 +111,7 @@ odoo_wkhtmltox_depends:
     - libjpeg-turbo8
 
 odoo_wkhtmltox_urls:
-    # generic tar.gz packages
+    # Debian packages
+    - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox_{{ odoo_wkhtmltox_version }}-1.{{ ansible_distribution_release }}_{{ odoo_debian_arch }}.deb
+    # generic tar.xz packages
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz
diff --git a/vars/Ubuntu-16_Odoo-8.yml b/vars/Ubuntu-16_Odoo-8.yml
@@ -95,8 +95,9 @@ odoo_wkhtmltox_depends:
 # Try Trusty's package if Xenial one is not found
 odoo_wkhtmltox_urls:
     # Debian packages
+    - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox_{{ odoo_wkhtmltox_version }}-1.{{ ansible_distribution_release }}_{{ odoo_debian_arch }}.deb
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-trusty-{{ odoo_debian_arch }}.deb
     - http://nightly.odoo.com/extra/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
-    # generic tar.gz packages
+    # generic tar.xz packages
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz
diff --git a/vars/Ubuntu-16_Odoo-9.yml b/vars/Ubuntu-16_Odoo-9.yml
@@ -105,8 +105,9 @@ odoo_wkhtmltox_depends:
 # Try Trusty's package if Xenial one is not found
 odoo_wkhtmltox_urls:
     # Debian packages
+    - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox_{{ odoo_wkhtmltox_version }}-1.{{ ansible_distribution_release }}_{{ odoo_debian_arch }}.deb
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-trusty-{{ odoo_debian_arch }}.deb
     - http://nightly.odoo.com/extra/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
-    # generic tar.gz packages
+    # generic tar.xz packages
     - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz