- GraphicsMagick-png.patch: disabled a conditional block of code

  which doesn't compile. Warning: the comment says that the block
  disables thread-unsafe features.

Changed files:
    GraphicsMagick-png.patch -> 1.1
    GraphicsMagick.spec -> 1.11

diff --git a/GraphicsMagick-png.patch b/GraphicsMagick-png.patch
new file mode 100644 (file)
index 0000000..3a21f5c
--- /dev/null
+++ b/GraphicsMagick-png.patch
@@ -0,0 +1,11 @@
+--- GraphicsMagick-1.1.7/coders/png.c~ 2004-11-11 00:14:54.000000000 +0100
++++ GraphicsMagick-1.1.7/coders/png.c  2007-02-23 13:01:01.000000000 +0100
+@@ -1706,7 +1706,7 @@
+      (int)sizeof(unused_chunks)/5);
+ #endif
+ 
+-#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
++#if 0 && defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
+ && (PNG_LIBPNG_VER >= 10200)
+   /* Disable thread-unsafe features of pnggccrd */
+   if (png_access_version() >= 10200)

diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 766ffc27120a740b505ae542f6c257ed7477f8df..52415705fb8a50f0f65d619442628c7550284e1e 100644 (file)
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -28,6 +28,7 @@ Source0:      ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/%{name}-%{version}.tar.
 Patch0:                %{name}-libpath.patch
 Patch1:                %{name}-system-libltdl.patch
 Patch2:                %{name}-link.patch
+Patch3:                %{name}-png.patch
 URL:           http://www.graphicsmagick.org/
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake >= 1:1.8
@@ -546,6 +547,7 @@ Dokumentacja do GraphicsMagick.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/perl=!%{__perl}=' {} \;