Funny, minutes ago I made the first and third changes to the 21.4
sources that I had cloned yesterday. Could someone please apply all
three to the 21.4 sources?
Thanks.
--- Vladimir
xemacs-21.4 $ hg tip
changeset:   735:dd5b194a4588
tag:         tip
user:        vins
date:        Mon Oct 08 01:22:26 2007 +0000
summary:     [xemacs-21-4-hg @ 2007-10-08 01:22:26 by vins]
on 09/30/2008 09:54 AM Stephen J. Turnbull said the following:
 BTW, sending to xemacs-buildreports is likely to get you ignored;
 moving to xemacs-beta.
 
 David A. Cobb writes:
 
  > However, sad to say, the build ends with some undefined symbols in
  > a GTK+ routine.
 
 Actually, those are just null macros.  It was careless coding practice
 to use #if instead of #ifdef, but it shouldn't be a problem.
 
 The real problem is that the code hasn't been updated in quite a
 while, and GCC has gotten pickier in the meantime.  You could update
 to current Mercurial head, or for now try applying this patch:
 
 diff -r 1af222c75869 src/glyphs-gtk.c
 --- a/src/glyphs-gtk.c	Mon May 21 05:02:43 2007 +0000
 +++ b/src/glyphs-gtk.c	Wed Oct 01 01:47:14 2008 +0900
 @@ -796,7 +796,7 @@
      find_keyword_in_vector (instantiator, Q_file);
  
    IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
 -  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
 +  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
    IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width;
    IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height;
    IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth;
 @@ -1614,7 +1614,7 @@
  	    alist = Fcons (Fcons (Q_hotspot_y, make_int (yhot)),
  			   alist);
  
 -	  alist = xbm_mask_file_munging (alist, filename, Qnil, console_type);
 +	  alist = xbm_mask_file_munging (alist, filename, Qt, console_type);
  
  	  {
  	    Lisp_Object result = alist_to_tagged_vector (Qxbm, alist);
 @@ -2972,7 +2972,7 @@
        IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP;
        /* Make sure there aren't two pointers to the same mask, causing
  	 it to get freed twice. */
 -      IMAGE_INSTANCE_GTK_MASK (p) = 0;
 +      IMAGE_INSTANCE_PIXMAP_MASK (p) = 0;
        break;
  
      default:
 
 _______________________________________________
 XEmacs-Beta mailing list
 XEmacs-Beta(a)xemacs.org
 
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
  
-- 
Vladimir G. Ivanovic
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org