From 7019b00e55087ffe9e37b359b4ca6f659af9b57e Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 13 Sep 2020 16:13:02 +0200
Subject: [PATCH] Fix apt packages for PHP 7.0

---
 Dockerfiles/mods/Dockerfile-7.0       | 17 +++++-------
 build/ansible/group_vars/all/mods.yml | 39 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
index 439ec16..e7c47fc 100644
--- a/Dockerfiles/mods/Dockerfile-7.0
+++ b/Dockerfiles/mods/Dockerfile-7.0
@@ -32,7 +32,6 @@ RUN set -eux \
 		libgmp-dev \
 		libib-util \
 		libicu-dev \
-		libimagequant-dev \
 		libjpeg-dev \
 		libkrb5-dev \
 		libldap2-dev \
@@ -61,7 +60,7 @@ RUN set -eux \
 		libwebp-dev \
 		libwebp6 \
 		libwebpdemux2 \
-		libwebpmux3 \
+		libwebpmux2 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -840,15 +839,13 @@ RUN set -eux \
 	libgif7 \
 	libglib2.0-0 \
 	libicu57 \
-	libimagequant0 \
 	libjpeg62-turbo \
-	libmagick++-6.q16-8 \
-	libmagick++-6.q16hdri-8 \
-	libmagickcore-6.q16-6 \
-	libmagickcore-6.q16-6-extra \
+	libmagick++-6.q16-7 \
+	libmagick++-6.q16hdri-7 \
+	libmagickcore-6.q16-3 \
+	libmagickcore-6.q16-3-extra \
 	libmagickwand-6.q16-3 \
-	libmagickwand-6.q16-6 \
-	libmagickwand-6.q16hdri-6 \
+	libmagickwand-6.q16hdri-3 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
@@ -865,7 +862,7 @@ RUN set -eux \
 	libvpx4 \
 	libwebp6 \
 	libwebpdemux2 \
-	libwebpmux3 \
+	libwebpmux2 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml
index d154fa4..b977e8f 100644
--- a/build/ansible/group_vars/all/mods.yml
+++ b/build/ansible/group_vars/all/mods.yml
@@ -1019,6 +1019,45 @@ extensions_available:
       configure: --enable-uploadprogress
   vips:
     disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.0]
+    7.0:
+      build_dep:
+        - fftw-dev
+        - gobject-introspection
+        - gtk-doc-tools
+        - libexif-dev
+        - libexpat1-dev
+        - libfftw3-dev
+        - libgif-dev
+        - libglib2.0-dev
+        - libmagick++-dev
+        - libmagickcore-6.q16-dev
+        - libmagickwand-dev
+        - libpoppler-glib-dev
+        - librsvg2-dev
+        - libtool
+        - libwebp-dev
+        - libwebpdemux2
+        - libwebpmux2
+      run_dep:
+        - fftw2
+        - gir1.2-poppler-0.18
+        - imagemagick-6.q16
+        - libexif12
+        - libexpat1
+        - libfftw3-3
+        - libgif7
+        - libglib2.0-0
+        - libmagick++-6.q16-7
+        - libmagick++-6.q16hdri-7
+        - libmagickcore-6.q16-3
+        - libmagickcore-6.q16-3-extra
+        - libmagickwand-6.q16-3
+        - libmagickwand-6.q16hdri-3
+        - libpoppler-glib8
+        - librsvg2-2
+        - libwebp6
+        - libwebpdemux2
+        - libwebpmux2
     all:
       type: pecl
       pre: |