Re: Emacs master build failing on RHEL 6.8 [image.c]

[Richard Kim]

Kaushal Modi <kaushal.modi@gmail.com> writes:

> Hello Paul,
>
> On Tue, Jun 4, 2019 at 3:17 PM Paul Eggert <eggert@cs.ucla.edu> wrote:
>
>  This looks like some other glitch in your build process, something you 
>  should fix but unrelated to the GifErrorString problem.
>
> You are right! I reverted to the old commit where I was last able to build 
> and I am seeing the same error.
>
> I need to now figure out what change on my side could have caused this. Sorry 
> for this false alarm.
>
> I'll update here if I figure this out.

Actually I too ran into compile failure on Red Hat 6.6. The root cause
was that the change shown below added code referring to
LIBRSVG_CHECK_VERSION macro which is not defined for me.

I have been using the same build script to build emacs on Red Hat 6.6
for a long time for both master and emacs-26 branches. This is the first
time that emacs build failed for me on RH 6 in many months if not over a
year.

--------------------------------------------------------------------------------
Author:     Paul Eggert <eggert@cs.ucla.edu>
AuthorDate: Thu May 30 15:06:39 2019 -0700
Commit:     Paul Eggert <eggert@cs.ucla.edu>
CommitDate: Thu May 30 15:29:50 2019 -0700

Parent:     d93f4bda7a Simplify xd_signature to pacify GCC 9
Contained:  emacs-26 master
Follows:    emacs-26.2 (78)

Pacify librsvg 2.45.1 and later

* src/image.c (svg_load_image): Pacify librsvg 2.45.1 and later,
and add a FIXME comment about the deprecated librsvg functions.
Backport from master.

1 file changed, 15 insertions(+)
src/image.c | 15 +++++++++++++++

modified   src/image.c
@@ -9306,6 +9306,17 @@ svg_load_image (struct frame *f, struct image *img, char 
*contents,
   if (filename)
     rsvg_handle_set_base_uri(rsvg_handle, filename);

+  /* Suppress GCC deprecation warnings starting in librsvg 2.45.1 for
+     rsvg_handle_write and rsvg_handle_close.  FIXME: Use functions
+     like rsvg_handle_new_from_gfile_sync on newer librsvg versions,
+     and remove this hack.  */
+  #if GNUC_PREREQ (4, 6, 0)
+   #pragma GCC diagnostic push
+  #endif
+  #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0)
+   #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+  #endif
+
   /* Parse the contents argument and fill in the rsvg_handle.  */
   rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err);
   if (err) goto rsvg_error;
@@ -9315,6 +9326,10 @@ svg_load_image (struct frame *f, struct image *img, char 
*contents,
   rsvg_handle_close (rsvg_handle, &err);
   if (err) goto rsvg_error;

+  #if GNUC_PREREQ (4, 6, 0)
+   #pragma GCC diagnostic pop
+  #endif
+
   rsvg_handle_get_dimensions (rsvg_handle, &dimension_data);
   if (! check_image_size (f, dimension_data.width, dimension_data.height))
     {