From 068e72b2cdfa02bbee2072935ff8f169c0abcb75 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Sun, 24 Feb 2019 20:20:36 +0000
Subject: [PATCH] rebase to 3.9, use imagemagick6 repo version

---
 Dockerfile         | 36 ++----------------------------------
 Dockerfile.aarch64 | 36 ++----------------------------------
 Dockerfile.armhf   | 36 ++----------------------------------
 3 files changed, 6 insertions(+), 102 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f60f535..c25df86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.python:3.8
+FROM lsiobase/alpine.python:3.9
 
 # set version label
 ARG BUILD_DATE
@@ -34,6 +34,7 @@ RUN \
 	fontconfig \
 	freetype \
 	ghostscript \
+	imagemagick6 \
 	jq \
 	lcms2 \
 	libjpeg-turbo \
@@ -44,39 +45,6 @@ RUN \
 	libxslt \
 	tiff \
 	zlib && \
- echo "**** compile imagemagic ****" && \
- IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \
-	| grep ImageMagick-6.*tar.gz | sed 's/\(.*\).tar.*/\1/' \
-	| sed 's/^.*ImageMagick-/ImageMagick-/') && \
- mkdir -p \
-	/tmp/imagemagick && \
- curl -o \
- /tmp/imagemagick-src.tar.xz -L \
-	"http://www.imagemagick.org/download/${IMAGEMAGICK_VER}.tar.xz" && \
- tar xf \
- /tmp/imagemagick-src.tar.xz -C \
-	/tmp/imagemagick --strip-components=1 && \
- cd /tmp/imagemagick && \
- sed -i -e \
-	's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/imagemagick":g' \
-	configure && \
- ./configure \
-	--infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--with-gs-font-dir=/usr/share/fonts/Type1 \
-	--with-gslib \
-	--with-lcms2 \
-	--with-modules \
-	--without-threads \
-	--without-x \
-	--with-tiff \
-	--with-xml && \
- make && \
- make install && \
- find / -name '.packlist' -o -name 'perllocal.pod' \
-	-o -name '*.bs' -delete && \
  echo "**** install calibre-web ****" && \
  if [ -z ${CALIBRE_COMMIT+x} ]; then \
 	CALIBRE_COMMIT=$(curl -sX GET https://api.github.com/repos/janeczku/calibre-web/commits/master \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index f692c27..f334f83 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.python.arm64:3.8
+FROM lsiobase/alpine.python.arm64:3.9
 
 # Add qemu to build on x86_64 systems
 COPY qemu-aarch64-static /usr/bin
@@ -37,6 +37,7 @@ RUN \
 	fontconfig \
 	freetype \
 	ghostscript \
+	imagemagick6 \
 	jq \
 	lcms2 \
 	libjpeg-turbo \
@@ -47,39 +48,6 @@ RUN \
 	libxslt \
 	tiff \
 	zlib && \
- echo "**** compile imagemagic ****" && \
- IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \
-	| grep ImageMagick-6.*tar.gz | sed 's/\(.*\).tar.*/\1/' \
-	| sed 's/^.*ImageMagick-/ImageMagick-/') && \
- mkdir -p \
-	/tmp/imagemagick && \
- curl -o \
- /tmp/imagemagick-src.tar.xz -L \
-	"http://www.imagemagick.org/download/${IMAGEMAGICK_VER}.tar.xz" && \
- tar xf \
- /tmp/imagemagick-src.tar.xz -C \
-	/tmp/imagemagick --strip-components=1 && \
- cd /tmp/imagemagick && \
- sed -i -e \
-	's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/imagemagick":g' \
-	configure && \
- ./configure \
-	--infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--with-gs-font-dir=/usr/share/fonts/Type1 \
-	--with-gslib \
-	--with-lcms2 \
-	--with-modules \
-	--without-threads \
-	--without-x \
-	--with-tiff \
-	--with-xml && \
- make && \
- make install && \
- find / -name '.packlist' -o -name 'perllocal.pod' \
-	-o -name '*.bs' -delete && \
  echo "**** install calibre-web ****" && \
  if [ -z ${CALIBRE_COMMIT+x} ]; then \
 	CALIBRE_COMMIT=$(curl -sX GET https://api.github.com/repos/janeczku/calibre-web/commits/master \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 7a044a7..28a5842 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.python.armhf:3.8
+FROM lsiobase/alpine.python.armhf:3.9
 
 # Add qemu to build on x86_64 systems
 COPY qemu-arm-static /usr/bin
@@ -37,6 +37,7 @@ RUN \
 	fontconfig \
 	freetype \
 	ghostscript \
+	imagemagick6 \
 	jq \
 	lcms2 \
 	libjpeg-turbo \
@@ -47,39 +48,6 @@ RUN \
 	libxslt \
 	tiff \
 	zlib && \
- echo "**** compile imagemagic ****" && \
- IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \
-	| grep ImageMagick-6.*tar.gz | sed 's/\(.*\).tar.*/\1/' \
-	| sed 's/^.*ImageMagick-/ImageMagick-/') && \
- mkdir -p \
-	/tmp/imagemagick && \
- curl -o \
- /tmp/imagemagick-src.tar.xz -L \
-	"http://www.imagemagick.org/download/${IMAGEMAGICK_VER}.tar.xz" && \
- tar xf \
- /tmp/imagemagick-src.tar.xz -C \
-	/tmp/imagemagick --strip-components=1 && \
- cd /tmp/imagemagick && \
- sed -i -e \
-	's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/imagemagick":g' \
-	configure && \
- ./configure \
-	--infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--with-gs-font-dir=/usr/share/fonts/Type1 \
-	--with-gslib \
-	--with-lcms2 \
-	--with-modules \
-	--without-threads \
-	--without-x \
-	--with-tiff \
-	--with-xml && \
- make && \
- make install && \
- find / -name '.packlist' -o -name 'perllocal.pod' \
-	-o -name '*.bs' -delete && \
  echo "**** install calibre-web ****" && \
  if [ -z ${CALIBRE_COMMIT+x} ]; then \
 	CALIBRE_COMMIT=$(curl -sX GET https://api.github.com/repos/janeczku/calibre-web/commits/master \