From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joakim@verona.se Newsgroups: gmane.emacs.bugs Subject: bug#7955: patch for imagemagick header rename Date: Sat, 12 Feb 2011 00:38:30 +0100 Message-ID: References: <2evd137anm.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1297469194 9802 80.91.229.12 (12 Feb 2011 00:06:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 12 Feb 2011 00:06:34 +0000 (UTC) To: 7955@debbugs.gnu.org, rgm@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Feb 12 01:06:29 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Po30O-0004Og-Us for geb-bug-gnu-emacs@m.gmane.org; Sat, 12 Feb 2011 01:06:29 +0100 Original-Received: from localhost ([127.0.0.1]:45157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Po30N-0004Sk-Uc for geb-bug-gnu-emacs@m.gmane.org; Fri, 11 Feb 2011 19:06:27 -0500 Original-Received: from [140.186.70.92] (port=55575 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Po30E-0004RM-8W for bug-gnu-emacs@gnu.org; Fri, 11 Feb 2011 19:06:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Po30D-0002ZP-5m for bug-gnu-emacs@gnu.org; Fri, 11 Feb 2011 19:06:18 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Po30D-0002ZL-3F for bug-gnu-emacs@gnu.org; Fri, 11 Feb 2011 19:06:17 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Po2R9-0004RG-GL; Fri, 11 Feb 2011 18:30:03 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <2evd137anm.fsf@fencepost.gnu.org> Resent-From: joakim@verona.se Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 11 Feb 2011 23:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 7955 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 7955-submit@debbugs.gnu.org id=B7955.129746698517021 (code B ref 7955); Fri, 11 Feb 2011 23:30:03 +0000 Original-Received: (at 7955) by debbugs.gnu.org; 11 Feb 2011 23:29:45 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Po2Qq-0004QU-Q0 for submit@debbugs.gnu.org; Fri, 11 Feb 2011 18:29:45 -0500 Original-Received: from iwfs.imcode.com ([82.115.149.64] helo=gate.verona.se) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Po2Qn-0004QH-M4 for 7955@debbugs.gnu.org; Fri, 11 Feb 2011 18:29:42 -0500 Original-Received: from chopper (IDENT:1005@localhost [127.0.0.1]) by gate.verona.se (8.13.4/8.11.4) with ESMTP id p1BNcUsN001513; Sat, 12 Feb 2011 00:38:30 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 11 Feb 2011 18:30:03 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:44047 Archived-At: I have a patch attempt now. I was going to test it and push it to the imagemagick branch but experienced some infuriating setbacks. If you could help me test and commit that would be spectacular. === modified file 'src/image.c' --- src/image.c 2011-02-01 19:46:21 +0000 +++ src/image.c 2011-02-11 23:23:42 +0000 @@ -7452,7 +7452,12 @@ /* The GIF library also defines DrawRectangle, but its never used in Emacs. Therefore rename the function so it doesnt collide with ImageMagick. */ #define DrawRectangle DrawRectangleGif +#if defined (HAVE_WAND_MAGICKWAND_H) #include +#else +#include +#endif /* HAVE_MAGICKWAND_H */ + /* imagemagick_load_image is a helper function for imagemagick_load, which does the actual loading given contents and size, apart from === modified file 'configure.in' --- configure.in 2011-01-31 23:54:50 +0000 +++ configure.in 2011-02-11 23:20:24 +0000 @@ -1832,6 +1832,7 @@ CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" LIBS="$IMAGEMAGICK_LIBS $LIBS" AC_CHECK_FUNCS(MagickExportImagePixels) + AC_CHECK_HEADERS(wand/MagickWand.h) fi fi fi -- Joakim Verona