From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: "Patrick J. LoPresti" Newsgroups: gmane.emacs.devel Subject: [PATCH] Fix Emacs 26.3 compilation on RHEL/CentOS 5 Date: Thu, 29 Aug 2019 10:40:14 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="0000000000004df4b305914500f0" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="215265"; mail-complaints-to="usenet@blaine.gmane.org" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 29 20:08:04 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.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1i3Oq3-000trh-8h for ged-emacs-devel@m.gmane.org; Thu, 29 Aug 2019 20:08:03 +0200 Original-Received: from localhost ([::1]:53148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3Oq1-0000oY-46 for ged-emacs-devel@m.gmane.org; Thu, 29 Aug 2019 14:08:02 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34159) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3OPO-0002RY-4n for emacs-devel@gnu.org; Thu, 29 Aug 2019 13:40:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3OPN-00045q-2T for emacs-devel@gnu.org; Thu, 29 Aug 2019 13:40:29 -0400 Original-Received: from mail-vk1-xa43.google.com ([2607:f8b0:4864:20::a43]:43633) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i3OPM-00043F-U1 for emacs-devel@gnu.org; Thu, 29 Aug 2019 13:40:29 -0400 Original-Received: by mail-vk1-xa43.google.com with SMTP id b11so971332vkk.10 for ; Thu, 29 Aug 2019 10:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=PJ5hVLjM6tV78V6khBiKqsqo9gWBsxGDlXOTurfptTQ=; b=GWWTcAN2VcwFIASMAuW0cvcME41yPDMES50+SkbtEJ+34Pst7okQbc8viofbSNkdLq dZT4H5crZZm2bmsjYEhWU0yL+E8sbEbGj8WKZl1Ard8jk+MEmenqysqGiSaozmeHwYtz NxEJm5/td42IDCqKXuaemqaRhhFAby1EP3bNdMTVKUh3WJa6Prc8lqsFgeWXFqXIys1+ 2mzhAnv8N9s9H+qmxiKIIejVu3D8f+XWSc2Zj/bXa6Prf5K557igN62biUJLUicX/TLs qQbm/ytJyu7GFzxF4gENiuU9uBhhgamGZlk5M+yR1FGlCQM0L1+XpiTTEc3sD4OxHD1F gTEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=PJ5hVLjM6tV78V6khBiKqsqo9gWBsxGDlXOTurfptTQ=; b=sdjNPO70nuD7oXpPmQ0Q4oH8iIkHDFfRH5cjA0evahcrBxZgGGMmj3jSq+RS49UIXY 7e03VSl4f2rzlH/HF53umakmHNklyNcJyMx3k9Gh9mqnyb214pW5b26t0lKUc0PBZG9w VGBYwa0zcC6pTpgUpcDRC22UmUzjTZGh99666kB46/miffEeU+/jOrN6D1ZZNrH3NhXN RwQlyH9msGgZYw+wH+j93WktgNNsyt4lVhpyq9v19RqmBvdKkJAQo9ZQ/mXktv/8mahb zXokcYkhGIbQ7eoE+WXEFeCwRWzstB0WzXP5GWiSLG/4gme0eykiKRaFwHXz2RkqCK9L OuMg== X-Gm-Message-State: APjAAAWdNhaktOh1u0ZmeBJpyE5zSy4w1c3OKA3QXu5JS/os67G/YA/G A42NGNsYW9hBA+CqsFFCPVNWCMjcmxN8g5BvIKQDir4w X-Google-Smtp-Source: APXvYqxGaJ0plW+AMLX3vqaBaxcPRwmGnTw0LJgj26CP3hY8q+rRJN0oFbSIJ4QeCjimqtNE4jNHMgGLTxYwhZbc9vo= X-Received: by 2002:a1f:4fc7:: with SMTP id d190mr5756615vkb.73.1567100427431; Thu, 29 Aug 2019 10:40:27 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::a43 X-Mailman-Approved-At: Thu, 29 Aug 2019 14:07:15 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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:239684 Archived-At: --0000000000004df4b305914500f0 Content-Type: text/plain; charset="UTF-8" Not sure whether anyone cares about supporting ancient Linux versions... But RHEL 5.x shipped with librsvg2 2.16.1, which did not provide the LIBSRVG_CHECK_VERSION macro. Simple patch below allows Emacs 26.3 to compile on RHEL/CentOS 5. - Pat diff -u -r emacs-26.3-orig/src/image.c emacs-26.3/src/image.c --- emacs-26.3-orig/src/image.c 2019-06-12 03:50:42.000000000 -0700 +++ emacs-26.3/src/image.c 2019-08-29 10:13:13.000000000 -0700 @@ -9313,9 +9313,11 @@ #if GNUC_PREREQ (4, 6, 0) #pragma GCC diagnostic push #endif + #if defined(LIBSRVG_CHECK_VERSION) #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif + #endif /* Parse the contents argument and fill in the rsvg_handle. */ rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err); --0000000000004df4b305914500f0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Not sure whether anyone cares about supporting ancien= t Linux versions... But RHEL 5.x shipped with librsvg2 2.16.1, which did no= t provide the LIBSRVG_CHECK_VERSION macro.

Simple = patch below allows Emacs 26.3 to compile on RHEL/CentOS 5.
=C2=A0- Pat

diff -u -r emacs-26.3-orig/src/i= mage.c emacs-26.3/src/image.c
--- emacs-26.3-orig/src/image.c 2019-06-12= 03:50:42.000000000 -0700
+++ emacs-26.3/src/image.c =C2=A0 =C2=A0 =C2= =A02019-08-29 10:13:13.000000000 -0700
@@ -9313,9 +9313,11 @@
=C2=A0 = =C2=A0#if GNUC_PREREQ (4, 6, 0)
=C2=A0 =C2=A0 #pragma GCC diagnostic pus= h
=C2=A0 =C2=A0#endif
+ =C2=A0#if defined(LIBSRVG_CHECK_VERSION)
= =C2=A0 =C2=A0#if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4= , 2, 0)
=C2=A0 =C2=A0 #pragma GCC diagnostic ignored "-Wdeprecated-= declarations"
=C2=A0 =C2=A0#endif
+ =C2=A0#endif

=C2=A0 = =C2=A0/* Parse the contents argument and fill in the rsvg_handle. =C2=A0*/<= br>=C2=A0 =C2=A0rsvg_handle_write (rsvg_handle, (unsigned char *) contents,= size, &err);
--0000000000004df4b305914500f0--