From 01ca03b2a4ef4adde90df474aa7ca5c023916b4e Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Tue, 12 May 2015 15:44:59 +0300
Subject: [PATCH] imagemagick: Update to 6.9.1-2

---
 mingw-w64-imagemagick/002-build-fixes.patch | 55 +++++++++++++++++++++
 mingw-w64-imagemagick/PKGBUILD              | 25 +++++-----
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/mingw-w64-imagemagick/002-build-fixes.patch b/mingw-w64-imagemagick/002-build-fixes.patch
index f4914416ef..21e8a52dff 100644
--- a/mingw-w64-imagemagick/002-build-fixes.patch
+++ b/mingw-w64-imagemagick/002-build-fixes.patch
@@ -20,3 +20,58 @@
  #if defined(_DEBUG) && !defined(__MINGW32__) && !defined(__MINGW64__)
  #include <crtdbg.h>
  #endif
+--- ImageMagick-6.9.0-4/magick/nt-base.c.orig	2015-02-22 22:02:34.000000000 +0100
++++ ImageMagick-6.9.0-4/magick/nt-base.c	2015-05-12 13:31:02.627609000 +0200
+@@ -1625,12 +1625,16 @@
+   wchar_t
+     file_specification[MaxTextExtent];
+
++  wchar_t WCDirectorySeparator[strlen(DirectorySeparator)+1];
++  MultiByteToWideChar(CP_UTF8,0,DirectorySeparator,-1,WCDirectorySeparator,
++                     strlen(DirectorySeparator)+1);
++
+   assert(path != (const char *) NULL);
+   length=MultiByteToWideChar(CP_UTF8,0,path,-1,file_specification,
+     MaxTextExtent);
+   if (length == 0)
+     return((DIR *) NULL);
+-  if(wcsncat(file_specification,(const wchar_t*) DirectorySeparator,
++  if(wcsncat(file_specification, WCDirectorySeparator,
+        MaxTextExtent-wcslen(file_specification)-1) == (wchar_t*) NULL)
+     return((DIR *) NULL);
+   entry=(DIR *) AcquireMagickMemory(sizeof(DIR));
+--- ImageMagick-6.9.1-2/magick/locale.c.orig	2015-05-12 14:33:17.733600000 +0300
++++ ImageMagick-6.9.1-2/magick/locale.c	2015-05-12 14:33:31.274400000 +0300
+@@ -254,7 +254,7 @@
+ #if defined(MAGICKCORE_HAVE_NEWLOCALE)
+   if (c_locale != (locale_t) NULL)
+     freelocale(c_locale);
+-#elif defined(MAGICKCORE_WINDOWS_SUPPORT)
++#elif defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
+   if (c_locale != (locale_t) NULL)
+     _free_locale(c_locale);
+ #endif
+--- ImageMagick-6.9.1-2/magick/random.c.orig	2015-05-12 14:27:08.310000000 +0300
++++ ImageMagick-6.9.1-2/magick/random.c	2015-05-12 14:27:31.008000000 +0300
+@@ -459,7 +459,9 @@
+     file=mkstemp(path);
+     if (file != -1)
+       {
++#ifndef _WIN32
+         (void) fchmod(file,0600);
++#endif
+ #if defined(__OS2__)
+         setmode(file,O_BINARY);
+ #endif
+--- ImageMagick-6.9.1-2/magick/resource.c.orig	2015-05-12 14:20:26.601600000 +0300
++++ ImageMagick-6.9.1-2/magick/resource.c	2015-05-12 14:27:38.090400000 +0300
+@@ -526,7 +526,9 @@
+     file=mkstemp(path);
+     if (file != -1)
+       {
++#ifndef _WIN32
+         (void) fchmod(file,0600);
++#endif
+ #if defined(__OS2__)
+         setmode(file,O_BINARY);
+ #endif
diff --git a/mingw-w64-imagemagick/PKGBUILD b/mingw-w64-imagemagick/PKGBUILD
index f8036c963d..d0f0572237 100644
--- a/mingw-w64-imagemagick/PKGBUILD
+++ b/mingw-w64-imagemagick/PKGBUILD
@@ -2,20 +2,21 @@
 
 _realname=imagemagick
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=6.9.0.7
+pkgver=6.9.1.2
 pkgrel=1
 pkgdesc="An image viewing/manipulation program (mingw-w64)"
 arch=('any')
 url="http://www.imagemagick.org/"
 license=("custom")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-            "${MINGW_PACKAGE_PREFIX}-pkg-config"
-            "${MINGW_PACKAGE_PREFIX}-pango"
-            "${MINGW_PACKAGE_PREFIX}-cairo"
-            "${MINGW_PACKAGE_PREFIX}-openexr"
-            "${MINGW_PACKAGE_PREFIX}-librsvg"
-            "${MINGW_PACKAGE_PREFIX}-libxml2"
-            "${MINGW_PACKAGE_PREFIX}-ghostscript")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cairo"
+             "${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-ghostscript"
+             "${MINGW_PACKAGE_PREFIX}-librsvg"
+             "${MINGW_PACKAGE_PREFIX}-libxml2"
+             "${MINGW_PACKAGE_PREFIX}-openexr"
+             "${MINGW_PACKAGE_PREFIX}-pango"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+            )
 depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-djvulibre"
          "${MINGW_PACKAGE_PREFIX}-fftw"
@@ -50,11 +51,11 @@ source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*
         001-relocate.patch
         002-build-fixes.patch
         winpath.patch)
-md5sums=('fcaf0ead3b5cafcb36c7642e2557dccb'
+md5sums=('57e8e138b05d8115c1ab7d9f151645bd'
          'SKIP'
          'c95a23e8562dbab4e6b0e5407da25209'
          '7821087a00c459c0d3482508fdc1e25e'
-         '144cbba6043eb70f8dd80c4e1713cf30'
+         '8f34b1dbab6cca5b33dee37ed8fe44a2'
          'b0b634231da667d7472522fc08fd3519')
 
 prepare() {
@@ -72,7 +73,7 @@ build() {
   [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
   [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
 
-  #cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
   mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
   ../ImageMagick-${pkgver%.*}-${pkgver##*.}/configure \
     --prefix=${MINGW_PREFIX} \