From 44d718a879c846baf065c5096de41962fe26dc98 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Mar 05 2009 16:41:40 +0000
Subject: adapt AcquireOnePixel usage for current ImageMagick api


---

diff --git a/q-7.11-AcquireOnePixel.patch b/q-7.11-AcquireOnePixel.patch
new file mode 100644
index 0000000..82c918d
--- /dev/null
+++ b/q-7.11-AcquireOnePixel.patch
@@ -0,0 +1,21 @@
+diff -ru q-7.11.orig/modules/magick/magick.c q-7.11/modules/magick/magick.c
+--- q-7.11.orig/modules/magick/magick.c	2009-03-05 16:21:46.000000000 +0000
++++ q-7.11/modules/magick/magick.c	2009-03-05 16:24:48.000000000 +0000
+@@ -2861,7 +2861,7 @@
+     if (m2)
+       set_pixels(&target, m2->v, 1, 1);
+     else {
+-      target = AcquireOnePixel(img, x, y, &exception);
++      AcquireOnePixel(img, x, y, &target, &exception);
+       if (check_exception(&exception)) {
+ 	DestroyDrawInfo(draw_info);
+ 	return mkapp(mksym(sym(magick_error)), mkstr(sys_to_utf8(msg)));
+@@ -2898,7 +2898,7 @@
+     if (m2)
+       set_pixels(&target, m2->v, 1, 1);
+     else {
+-      target = AcquireOnePixel(img, x, y, &exception);
++      AcquireOnePixel(img, x, y, &target, &exception);
+       if (check_exception(&exception))
+ 	return mkapp(mksym(sym(magick_error)), mkstr(sys_to_utf8(msg)));
+     }
diff --git a/q.spec b/q.spec
index 8d2e23b..563b03b 100644
--- a/q.spec
+++ b/q.spec
@@ -1,6 +1,6 @@
 Name: 		q
 Version: 	7.11
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
@@ -28,6 +28,8 @@ BuildRequires:	zlib-devel
 Requires(post): /sbin/ldconfig /sbin/install-info
 Requires(postun): /sbin/ldconfig /sbin/install-info
 
+Patch0: q-7.11-AcquireOnePixel.patch
+
 
 %description
 Q is a powerful and extensible functional programming language based
@@ -89,6 +91,7 @@ Requires:	libtool
 
 %prep
 %setup -q
+%patch0 -p1 -b .AcquireOnePixel
 sed -i 's|@libtool@|libtool|' src/Makefile.in
 
 %define _use_internal_dependency_generator 0
@@ -192,6 +195,9 @@ fi
 
 
 %changelog
+* Thu Mar 05 2009 Caolán McNamara <caolanm@redhat.com> - 7.11-4
+- adapt AcquireOnePixel usage for current ImageMagick api
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild