From 4cf75efb715bf705691c58fa2f504357d2e68afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Fri, 27 Dec 2019 19:47:30 +0000
Subject: vars/build.vars:imagemagick: upgraded to v7.0.9-12.
 vars/build.vars:imagemagick:${PKG_CFLAGS_CONFIGURE_EXTRA}: configure w/
 -I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include/sltdl.
 vars/build.vars:imagemagick:${PKG_DISABLED}: enabled.
 patches/imagemagick-7.0.9-12.local.patch: upgraded to v7.0.9-12.

---
 patches/imagemagick-7.0.9-10.local.patch | 17 -----------------
 patches/imagemagick-7.0.9-12.local.patch | 16 ++++++++++++++++
 vars/build.vars                          |  9 ++++-----
 3 files changed, 20 insertions(+), 22 deletions(-)
 delete mode 100644 patches/imagemagick-7.0.9-10.local.patch
 create mode 100644 patches/imagemagick-7.0.9-12.local.patch

diff --git a/patches/imagemagick-7.0.9-10.local.patch b/patches/imagemagick-7.0.9-10.local.patch
deleted file mode 100644
index 811a602f..00000000
--- a/patches/imagemagick-7.0.9-10.local.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru ImageMagick-7.0.9-10.orig/configure ImageMagick-7.0.9-10/configure
---- ImageMagick-7.0.9-10.orig/configure	2019-12-22 16:01:03.000000000 +0100
-+++ ImageMagick-7.0.9-10/configure	2019-12-24 14:17:48.641714511 +0100
-@@ -22639,13 +22639,7 @@
- 
- # Only allow building loadable modules if we are building shared libraries
- if test "$with_modules" != 'no' ; then
--    if test "$libtool_build_shared_libs" = 'no'; then
--        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Modules may only be built if building shared libraries is enabled." >&5
--$as_echo "$as_me: WARNING: Modules may only be built if building shared libraries is enabled." >&2;}
--    build_modules='no'
--  else
-     build_modules='yes'
--  fi
- fi
- if test "$build_modules" != 'no' ; then
- 
diff --git a/patches/imagemagick-7.0.9-12.local.patch b/patches/imagemagick-7.0.9-12.local.patch
new file mode 100644
index 00000000..1c2722a2
--- /dev/null
+++ b/patches/imagemagick-7.0.9-12.local.patch
@@ -0,0 +1,16 @@
+--- ImageMagick-7.0.9-12/configure.orig	2019-12-27 01:06:32.000000000 +0000
++++ ImageMagick-7.0.9-12/configure	2019-12-27 19:40:26.904000000 +0000
+@@ -22639,13 +22639,7 @@
+ 
+ # Only allow building loadable modules if we are building shared libraries
+ if test "$with_modules" != 'no' ; then
+-    if test "$libtool_build_shared_libs" = 'no'; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Modules may only be built if building shared libraries is enabled." >&5
+-$as_echo "$as_me: WARNING: Modules may only be built if building shared libraries is enabled." >&2;}
+-    build_modules='no'
+-  else
+     build_modules='yes'
+-  fi
+ fi
+ if test "$build_modules" != 'no' ; then
+ 
diff --git a/vars/build.vars b/vars/build.vars
index ce239489..1802a872 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1623,12 +1623,11 @@ tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd";
 : ${PKG_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master};
 : ${PKG_INFOZIP_IN_TREE:=1};
 : ${PKG_INFOZIP_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
-: ${PKG_IMAGEMAGICK_SHA256SUM:=0ac3a0b695180d715908352d79db1ce24c42771def15d4ee3d6540dd622b4389};
-: ${PKG_IMAGEMAGICK_VERSION:=7.0.9-10};
-: ${PKG_IMAGEMAGICK_URL:=https://imagemagick.org/download/ImageMagick-${PKG_IMAGEMAGICK_VERSION}.tar.xz};
-: ${PKG_IMAGEMAGICK_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
+: ${PKG_IMAGEMAGICK_SHA256SUM:=67859f9cba97f2c06b5e416898216e49216be00c7cba3dd89896e49331aef96d};
+: ${PKG_IMAGEMAGICK_VERSION:=7.0.9-12};
+: ${PKG_IMAGEMAGICK_URL:=https://imagemagick.org/download/releases/ImageMagick-${PKG_IMAGEMAGICK_VERSION}.tar.xz};
+: ${PKG_IMAGEMAGICK_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include/sltdl"};
 : ${PKG_IMAGEMAGICK_CONFIGURE_ARGS_EXTRA:="--enable-shared=yes --with-modules=yes --without-x --without-pango"};
-: ${PKG_IMAGEMAGICK_DISABLED:=1};
 : ${PKG_IMAGEMAGICK_IN_TREE:=1};
 : ${PKG_JAMVM_SHA256SUM:=76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da};
 : ${PKG_JAMVM_VERSION:=2.0.0};
-- 
cgit v1.2.3