ports/97196: x11-wm/sawfish2 patches needed for amd64

Yoshiaki Kasahara kasahara at nc.kyushu-u.ac.jp
Sun May 14 15:44:33 UTC 2006


Oh, I'm really sorry that the patch I submitted was somewhat broken.
I used the web form of send-pr and I pasted patches, so tabs were
converted into multiple spaces.....

Index: src/functions.c
===================================================================
RCS file: /cvs/gnome/sawfish/src/functions.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- src/functions.c	3 Nov 2002 21:00:36 -0000	1.98
+++ src/functions.c	30 Oct 2003 05:35:18 -0000	1.99
@@ -1,5 +1,5 @@
 /* functions.c -- useful window manager Lisp functions
-   $Id: functions.c,v 1.98 2002/11/03 21:00:36 jsh Exp $
+   $Id: functions.c,v 1.99 2003/10/30 05:35:18 jsh Exp $
 
    Copyright (C) 1999 John Harper <john at dcs.warwick.ac.uk>
 
@@ -704,8 +704,10 @@
 	    repv name;
 	    if (type == XA_ATOM && (name = x_atom_symbol (l_data[i])) != Qnil)
 		rep_VECTI(ret_data, i) = name;
+	    else if (type == XA_INTEGER)
+		rep_VECTI(ret_data, i) = rep_make_long_int((long) l_data[i]);
 	    else
-		rep_VECTI(ret_data, i) = rep_make_long_uint(l_data[i]);
+		rep_VECTI(ret_data, i) = rep_make_long_uint(l_data[i] & 0xffffffffUL);
 	}
 	break;
     }


--- src/sawmill.h.orig	Sat May 13 17:31:12 2006
+++ src/sawmill.h	Mon May 15 00:41:12 2006
@@ -153,7 +153,7 @@
     /* Frame data */
     Window frame;
     struct frame_part *frame_parts;
-    u_int frame_x, frame_y;		/* relative to client-window */
+    int frame_x, frame_y;		/* relative to client-window */
     u_int frame_width, frame_height;
     void (*destroy_frame)(struct lisp_window *w);
     void (*focus_change)(struct lisp_window *w);




More information about the freebsd-gnome mailing list