From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Emacs master build failing on RHEL 6.8 Date: Wed, 8 May 2019 08:41:27 -0700 Organization: UCLA Computer Science Department Message-ID: <45a18dba-b330-9f9f-4f83-4eae71254bac@cs.ucla.edu> References: <834l66jpty.fsf@gnu.org> <831s1ajo0w.fsf@gnu.org> <83zhnyi7o2.fsf@gnu.org> <83woj2i0qf.fsf@gnu.org> <83mujxijjn.fsf@gnu.org> <834l65i11n.fsf@gnu.org> <83zhnxgkqf.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------AECB232D00436374B5D169F3" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="97818"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 Cc: Stefan Monnier , Emacs developers To: Kaushal Modi , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 08 17:41:44 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hOOhT-000PK7-92 for ged-emacs-devel@m.gmane.org; Wed, 08 May 2019 17:41:43 +0200 Original-Received: from localhost ([127.0.0.1]:39299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOOhS-0001iy-2m for ged-emacs-devel@m.gmane.org; Wed, 08 May 2019 11:41:42 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:44309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOOhM-0001gs-8B for emacs-devel@gnu.org; Wed, 08 May 2019 11:41:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOOhL-0001vf-9w for emacs-devel@gnu.org; Wed, 08 May 2019 11:41:36 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:53106) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOOhJ-0001tm-KR; Wed, 08 May 2019 11:41:33 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 3A4CC1618EE; Wed, 8 May 2019 08:41:29 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id RthkYPpSje1b; Wed, 8 May 2019 08:41:28 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 566E916196E; Wed, 8 May 2019 08:41:28 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id aEkB4MVl1158; Wed, 8 May 2019 08:41:28 -0700 (PDT) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 30FFA161962; Wed, 8 May 2019 08:41:28 -0700 (PDT) Openpgp: preference=signencrypt Autocrypt: addr=eggert@cs.ucla.edu; prefer-encrypt=mutual; keydata= xsFNBEyAcmQBEADAAyH2xoTu7ppG5D3a8FMZEon74dCvc4+q1XA2J2tBy2pwaTqfhpxxdGA9 Jj50UJ3PD4bSUEgN8tLZ0san47l5XTAFLi2456ciSl5m8sKaHlGdt9XmAAtmXqeZVIYX/UFS 96fDzf4xhEmm/y7LbYEPQdUdxu47xA5KhTYp5bltF3WYDz1Ygd7gx07Auwp7iw7eNvnoDTAl KAl8KYDZzbDNCQGEbpY3efZIvPdeI+FWQN4W+kghy+P6au6PrIIhYraeua7XDdb2LS1en3Ss mE3QjqfRqI/A2ue8JMwsvXe/WK38Ezs6x74iTaqI3AFH6ilAhDqpMnd/msSESNFt76DiO1ZK QMr9amVPknjfPmJISqdhgB1DlEdw34sROf6V8mZw0xfqT6PKE46LcFefzs0kbg4GORf8vjG2 Sf1tk5eU8MBiyN/bZ03bKNjNYMpODDQQwuP84kYLkX2wBxxMAhBxwbDVZudzxDZJ1C2VXujC OJVxq2kljBM9ETYuUGqd75AW2LXrLw6+MuIsHFAYAgRr7+KcwDgBAfwhPBYX34nSSiHlmLC+ KaHLeCLF5ZI2vKm3HEeCTtlOg7xZEONgwzL+fdKo+D6SoC8RRxJKs8a3sVfI4t6CnrQzvJbB n6gxdgCu5i29J1QCYrCYvql2UyFPAK+do99/1jOXT4m2836j1wARAQABzSBQYXVsIEVnZ2Vy dCA8ZWdnZXJ0QGNzLnVjbGEuZWR1PsLBfgQTAQIAKAUCTIByZAIbAwUJEswDAAYLCQgHAwIG FQgCCQoLBBYCAwECH In-Reply-To: Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:236296 Archived-At: This is a multi-part message in MIME format. --------------AECB232D00436374B5D169F3 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 5/8/19 8:07 AM, Kaushal Modi wrote: > > image.c:9468:62: error: missing binary operator before token "(" > =C2=A0=C2=A0 #if defined LIBRSVG_CHECK_VERSION && LIBRSVG_CHECK_VERSION= (2, 45, 1) \ I installed the attached to try to fix that. --------------AECB232D00436374B5D169F3 Content-Type: text/x-patch; name="0001-Port-LIBRSVG_CHECK_VERSION-fix-to-picky-cpp.patch" Content-Disposition: attachment; filename="0001-Port-LIBRSVG_CHECK_VERSION-fix-to-picky-cpp.patch" Content-Transfer-Encoding: quoted-printable >From e8e4ba1fd2b93eed3088791d7cd30048693612e1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 8 May 2019 08:37:40 -0700 Subject: [PATCH] Port LIBRSVG_CHECK_VERSION fix to picky cpp MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * src/image.c (LIBRSVG_CHECK_VERSION): Define to yield false if it isn=E2=80=99t already defined. (svg_load_image): Port to C preprocessors that check the syntax of the entire preprocessing expression before evaluating any of it. --- src/image.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/image.c b/src/image.c index 725eb4b8d0..e8cb434177 100644 --- a/src/image.c +++ b/src/image.c @@ -9248,6 +9248,11 @@ svg_image_p (Lisp_Object object) =20 # include =20 +/* librsvg is too old for us if it doesn't define this macro. */ +# ifndef LIBRSVG_CHECK_VERSION +# define LIBRSVG_CHECK_VERSION(v, w, x) false +# endif + # ifdef WINDOWSNT =20 /* Restore the original definition of __MINGW_MAJOR_VERSION. */ @@ -9465,8 +9470,7 @@ svg_load_image (struct frame *f, struct image *img,= char *contents, #if GNUC_PREREQ (4, 6, 0) #pragma GCC diagnostic push #endif - #if defined LIBRSVG_CHECK_VERSION && LIBRSVG_CHECK_VERSION (2, 45, 1) = \ - && GNUC_PREREQ (4, 2, 0) + #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif =20 --=20 2.21.0 --------------AECB232D00436374B5D169F3--