Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
19782835 imagemagick doesn't build on s12_58
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 09 Oct 2014 18:23:12 -0700
changeset 2144 96440b7aa33e
parent 2143 82f79e5e7f43
child 2145 bdf83a99948d
19782835 imagemagick doesn't build on s12_58
components/imagemagick/patches/uselocale.patch file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/imagemagick/patches/uselocale.patch	Thu Oct 09 18:23:12 2014 -0700
@@ -0,0 +1,23 @@
+This patch has been submitted upstream:
+http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26362
+
+--- ImageMagick-6.8.3/magick/locale.c.orig	2012-12-07 05:14:16.000000000 -0800
++++ ImageMagick-6.8.3/magick/locale.c	2014-10-09 13:32:28.333380432 -0700
[email protected]@ -256,7 +256,7 @@
+ #endif
+   }
+ #else
+-#if defined(MAGICKCORE_HAVE_USELOCALE)
++#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L)
+   {
+     locale_t
+       locale,
[email protected]@ -347,7 +347,7 @@
+ #endif
+   }
+ #elif defined(MAGICKCORE_HAVE_VSNPRINTF)
+-#if defined(MAGICKCORE_HAVE_USELOCALE)
++#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L)
+   {
+     locale_t
+       locale,
upstream/oracle/userland-gate