From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#11678: Trunk fails to compile on RHEL 5 machines Date: Mon, 11 Jun 2012 18:21:14 -0700 Organization: UCLA Computer Science Department Message-ID: <4FD6998A.4010906@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1339464153 7123 80.91.229.3 (12 Jun 2012 01:22:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 12 Jun 2012 01:22:33 +0000 (UTC) Cc: Manoj Srivastava To: 11678@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 12 03:22:30 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SeFoU-0005pN-87 for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Jun 2012 03:22:30 +0200 Original-Received: from localhost ([::1]:56038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeFoT-0004HI-ND for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Jun 2012 21:22:29 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:35922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeFoP-0004Gm-Hm for bug-gnu-emacs@gnu.org; Mon, 11 Jun 2012 21:22:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SeFoN-0006no-Lh for bug-gnu-emacs@gnu.org; Mon, 11 Jun 2012 21:22:25 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeFoN-0006ne-IK for bug-gnu-emacs@gnu.org; Mon, 11 Jun 2012 21:22:23 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SeFqw-0005Y1-DF for bug-gnu-emacs@gnu.org; Mon, 11 Jun 2012 21:25:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 12 Jun 2012 01:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11678 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.133946425221267 (code B ref -1); Tue, 12 Jun 2012 01:25:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 Jun 2012 01:24:12 +0000 Original-Received: from localhost ([127.0.0.1]:38532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SeFq7-0005Wy-G7 for submit@debbugs.gnu.org; Mon, 11 Jun 2012 21:24:11 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:40782) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SeFq3-0005Wn-Hv for submit@debbugs.gnu.org; Mon, 11 Jun 2012 21:24:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SeFnS-0006St-Fl for submit@debbugs.gnu.org; Mon, 11 Jun 2012 21:21:27 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:37277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeFnS-0006Sc-By for submit@debbugs.gnu.org; Mon, 11 Jun 2012 21:21:26 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:35680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeFnQ-00049f-Ga for bug-gnu-emacs@gnu.org; Mon, 11 Jun 2012 21:21:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SeFnO-0006RF-Bw for bug-gnu-emacs@gnu.org; Mon, 11 Jun 2012 21:21:23 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:47565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeFnO-0006OV-3S for bug-gnu-emacs@gnu.org; Mon, 11 Jun 2012 21:21:22 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id EBF31A60002; Mon, 11 Jun 2012 18:21:12 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LtbPyCFY2wEc; Mon, 11 Jun 2012 18:21:12 -0700 (PDT) Original-Received: from [192.168.1.10] (pool-71-189-109-235.lsanca.fios.verizon.net [71.189.109.235]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 2312639E8007; Mon, 11 Jun 2012 18:21:12 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:60882 Archived-At: Tags: patch The Emacs trunk doesn't build on CentOS 5 due to an ImageMagick problem. Here's a proposed patch. I'm CC:ing this to Manoj Srivastava, since he reported it on emacs-devel in . I don't have easy access to CentOS 5 with ImageMagick so I haven't tested this there, but it does work on Ubuntu 12.04. === modified file 'ChangeLog' --- ChangeLog 2012-06-11 23:17:11 +0000 +++ ChangeLog 2012-06-12 01:13:39 +0000 @@ -1,3 +1,8 @@ +2012-06-12 Paul Eggert + + * configure.in: When using ImageMagick, check for + MagickMergeImageLayers. + 2012-06-11 Glenn Morris * configure.in (SYSTEM_TYPE): New AC_DEFINE. === modified file 'configure.in' --- configure.in 2012-06-11 23:17:11 +0000 +++ configure.in 2012-06-12 01:13:39 +0000 @@ -1854,7 +1854,7 @@ AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" LIBS="$IMAGEMAGICK_LIBS $LIBS" - AC_CHECK_FUNCS(MagickExportImagePixels) + AC_CHECK_FUNCS(MagickExportImagePixels MagickMergeImageLayers) fi fi fi === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-06-10 13:20:58 +0000 +++ etc/ChangeLog 2012-06-12 01:13:39 +0000 @@ -1,3 +1,7 @@ +2012-06-12 Paul Eggert + + * NEWS: Transparency support requires ImageMagic 6.3.8 or later. + 2012-06-04 Paul Eggert * PROBLEMS (68000 C compiler problems): Remove obsolete section. === modified file 'etc/NEWS' --- etc/NEWS 2012-06-11 14:42:55 +0000 +++ etc/NEWS 2012-06-12 01:13:39 +0000 @@ -81,7 +81,8 @@ treated as images. *** Images displayed via ImageMagick now support transparency and the -:background image spec property. +:background image spec property. Transparency support requires +ImageMagick 6.3.8 or later. ** String values for `initial-buffer-choice' also apply to emacsclient frames, if emacsclient is only told to open a new frame without === modified file 'src/ChangeLog' --- src/ChangeLog 2012-06-12 00:30:18 +0000 +++ src/ChangeLog 2012-06-12 01:13:39 +0000 @@ -1,5 +1,8 @@ 2012-06-12 Paul Eggert + * image.c (imagemagick_load_image) [!HAVE_MAGICKMERGEIMAGELAYERS]: + Don't invoke MagickMergeImageLayers. + * image.c (imagemagick_load_image): Remove unused label. 2012-06-11 Glenn Morris === modified file 'src/image.c' --- src/image.c 2012-06-12 00:30:18 +0000 +++ src/image.c 2012-06-12 01:13:39 +0000 @@ -7776,6 +7776,7 @@ height = MagickGetImageHeight (image_wand); width = MagickGetImageWidth (image_wand); +#if HAVE_MAGICKMERGEIMAGELAYERS /* Set the canvas background color to the frame or specified background, and flatten the image. Note: as of ImageMagick 6.6.0, SVG image transparency is not handled properly @@ -7787,6 +7788,7 @@ DestroyMagickWand (image_wand); image_wand = new_wand; } +#endif if (! (width <= INT_MAX && height <= INT_MAX && check_image_size (f, width, height)))