[debbugs-tracker] bug#17790: closed (build failure with giflib-5.1.0)

[GNU bug Tracking System]

Your message dated Wed, 18 Jun 2014 18:17:31 +0300
with message-id <address@hidden>
and subject line Re: bug#17790: GIFlib-5.1.0 or former conditional
has caused the debbugs.gnu.org bug report #17790,
regarding build failure with giflib-5.1.0
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
17790: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17790
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> build failure with giflib-5.1.0
>
>
>
>
> Date: 
>
> Sun, 15 Jun 2014 17:23:38 +0900
>
>
>
>
> User-agent: 
>
> Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
>
>
>
>
> Package: emacs
> Severity: important
>
> Hi, should be already fixed, I am presume, but I needed
> attached remedy to build,
>
> Thanks a lot, 
> ---
> Makoto Fujiwara, 
> Chiba, Japan, Narita Airport and Disneyland prefecture.
>
> $NetBSD$
>
> mage.c:7417:7: error: too few arguments to function 'DGifCloseFile'
> emacs-current/work/.buildlink/include/gif_lib.h:183:9:
> note: declared here
>
> --- ./src/image.c.orig  2014-06-14 13:15:41.000000000 +0900
> +++ ./src/image.c       2014-06-15 08:39:42.000000000 +0900
> @@ -7409,13 +7409,13 @@
>         }
>  #endif
>      }
> -
> +  int * return_value;
>    /* Before reading entire contents, check the declared image size. */
>    if (!check_image_size (f, gif->SWidth, gif->SHeight))
>      {
>        image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
> -      fn_DGifCloseFile (gif);
> -      return 0;
> +      fn_DGifCloseFile (gif, return_value);
> +      return return_value;
>      }
>  
>    /* Read entire contents.  */
> @@ -7423,8 +7423,8 @@
>    if (rc == GIF_ERROR || gif->ImageCount <= 0)
>      {
>        image_error ("Error reading `%s'", img->spec, Qnil);
> -      fn_DGifCloseFile (gif);
> -      return 0;
> +      fn_DGifCloseFile (gif, return_value);
> +      return return_value;
>      }
>  
>    /* Which sub-image are we to display?  */
> @@ -7435,8 +7435,8 @@
>        {
>         image_error ("Invalid image number `%s' in image `%s'",
>                      image_number, img->spec);
> -       fn_DGifCloseFile (gif);
> -       return 0;
> +       fn_DGifCloseFile (gif, return_value);
> +       return return_value;
>        }
>    }
>  
> @@ -7453,8 +7453,8 @@
>    if (!check_image_size (f, width, height))
>      {
>        image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
> -      fn_DGifCloseFile (gif);
> -      return 0;
> +      fn_DGifCloseFile (gif, return_value);
> +      return return_value;
>      }
>  
>    /* Check that the selected subimages fit.  It's not clear whether
> @@ -7471,16 +7471,16 @@
>              && 0 <= subimg_left && subimg_left <= width - subimg_width))
>         {
>           image_error ("Subimage does not fit in image", Qnil, Qnil);
> -         fn_DGifCloseFile (gif);
> -         return 0;
> +         fn_DGifCloseFile (gif, return_value);
> +         return return_value;
>         }
>      }
>  
>    /* Create the X image and pixmap.  */
>    if (!image_create_x_image_and_pixmap (f, img, width, height, 0, &ximg, 0))
>      {
> -      fn_DGifCloseFile (gif);
> -      return 0;
> +      fn_DGifCloseFile (gif, return_value);
> +      return return_value;
>      }
>  
>    /* Clear the part of the screen image not covered by the image.
> @@ -7650,7 +7650,7 @@
>                             Fcons (make_number (gif->ImageCount),
>                                    img->lisp_data));
>  
> -  fn_DGifCloseFile (gif);
> +  fn_DGifCloseFile (gif, return_value);
>  
>    /* Maybe fill in the background field while we have ximg handy. */
>    if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#17790: GIFlib-5.1.0 or former conditional
>
>
>
>
> Date: 
>
> Wed, 18 Jun 2014 18:17:31 +0300
>
>
>
>
> > From: Stefan Monnier <address@hidden>
> > Cc: Andreas Schwab <address@hidden>,  "Eric S. Raymond" <address@hidden>,  
> > address@hidden
> > Date: Tue, 17 Jun 2014 12:18:02 -0400
> > 
> > > some problem with it, I will commit soon.  (I guess this should go to
> > > the release branch, right? Stefan? Glenn?)
> > 
> > Yes.
>
> Committed as emacs-24 revision 17254.
>
>
> --- End Message ---