From 22b21a1817eb5975741e0cd9808f6a3da870ae49 Mon Sep 17 00:00:00 2001
From: Mario Lubenka <mario.lubenka@googlemail.com>
Date: Wed, 4 Sep 2024 01:18:37 +0200
Subject: [PATCH] feat: add SVG support for ImageMagick (#6519)

---
 containers/ddev-webserver/Dockerfile                            | 1 +
 .../ddev-webserver-base-files/etc/ImageMagick-6/policy.xml      | 1 +
 pkg/versionconstants/versionconstants.go                        | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/containers/ddev-webserver/Dockerfile b/containers/ddev-webserver/Dockerfile
index 7ff2368d69b..7cb2fac447e 100644
--- a/containers/ddev-webserver/Dockerfile
+++ b/containers/ddev-webserver/Dockerfile
@@ -36,6 +36,7 @@ RUN apt-get install -y postgresql-common && yes | /usr/share/postgresql-common/p
 RUN apt-get -qq update
 RUN DEBIAN_FRONTEND=noninteractive apt-get -qq install -y -o Dpkg::Options::="--force-confold" --no-install-recommends --no-install-suggests -y \
     libcap2-bin \
+    librsvg2-bin libmagickcore-6.q16-6-extra \
     locales-all \
     mariadb-client \
     postgresql-client \
diff --git a/containers/ddev-webserver/ddev-webserver-base-files/etc/ImageMagick-6/policy.xml b/containers/ddev-webserver/ddev-webserver-base-files/etc/ImageMagick-6/policy.xml
index ec2a7b15e8e..c9ca1d35bb4 100644
--- a/containers/ddev-webserver/ddev-webserver-base-files/etc/ImageMagick-6/policy.xml
+++ b/containers/ddev-webserver/ddev-webserver-base-files/etc/ImageMagick-6/policy.xml
@@ -94,4 +94,5 @@
   <!-- Enable processing of PDF files to ensure TYPO3 is able to create thumbnails and previews -->
   <!-- <policy domain="coder" rights="none" pattern="PDF" /> -->
   <policy domain="coder" rights="none" pattern="XPS" />
+  <policy domain="coder" rights="none" pattern="SVG" />
 </policymap>
diff --git a/pkg/versionconstants/versionconstants.go b/pkg/versionconstants/versionconstants.go
index 5033082aab1..8a2708767a8 100644
--- a/pkg/versionconstants/versionconstants.go
+++ b/pkg/versionconstants/versionconstants.go
@@ -11,7 +11,7 @@ var AmplitudeAPIKey = ""
 var WebImg = "ddev/ddev-webserver"
 
 // WebTag defines the default web image tag
-var WebTag = "v1.23.4" // Note that this can be overridden by make
+var WebTag = "20240830_saitho_imagemagick_svg" // Note that this can be overridden by make
 
 // DBImg defines the default db image used for applications.
 var DBImg = "ddev/ddev-dbserver"