Fix build with clang.

7 files changed, 143 insertions, 0 deletions

diff --git a/x11/9box/files/patch-src__9box.c b/x11/9box/files/patch-src__9box.c
new file mode 100644
index 00000000000..a3346b65604
--- /dev/null
+++ b/x11/9box/files/patch-src__9box.c
@@ -0,0 +1,30 @@
+--- src/9box.c.orig	2002-12-05 07:13:33.000000000 +0800
++++ src/9box.c	2011-09-08 14:37:25.000000000 +0800
+@@ -20,6 +20,7 @@
+ /* $Id: 9box.c,v 1.14 2002/07/29 13:02:59 benj Exp $ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>
+ #include <X11/X.h>
+ #include <X11/cursorfont.h>
+@@ -186,8 +187,8 @@ main (int argc, char ** argv)
+ 		      Window root_return;
+ 		      int x_return, y_return, width_return, height_return, border_width_return, depth_return;
+ 		      XGetGeometry(box.dpy, box.win, &root_return, &x_return,
+-				   &y_return, &width_return, &height_return,
+-				   &border_width_return, &depth_return);
++				   &y_return, (unsigned int *)&width_return, (unsigned int *)&height_return,
++				   (unsigned int *)&border_width_return, (unsigned int *)&depth_return);
+ 		      XMoveWindow(box.dpy,
+ 				  box.boxed_windows[i]->button, i*BUTTON_DEFAULT_WIDTH, height_return-20);
+ 		      XResizeWindow(box.dpy, box.boxed_windows[i]->client, 
+@@ -435,7 +436,7 @@ XButtonEvent *e;
+ 
+ 
+ 
+-Window
++void
+ reparent_window(Box * box)
+ {
+   Window win, win2;
diff --git a/x11/9box/files/patch-src__buttons.c b/x11/9box/files/patch-src__buttons.c
new file mode 100644
index 00000000000..15f47a1b260
--- /dev/null
+++ b/x11/9box/files/patch-src__buttons.c
@@ -0,0 +1,11 @@
+--- src/buttons.c.orig	2003-01-06 21:25:41.000000000 +0800
++++ src/buttons.c	2011-09-08 14:25:06.000000000 +0800
+@@ -21,6 +21,8 @@
+ 
+ #include "dat.h"
+ #include "fns.h"
++#include <stdio.h>
++#include <string.h>
+ #include <X11/cursorfont.h>
+ 
+ void
diff --git a/x11/9box/files/patch-src__fns.h b/x11/9box/files/patch-src__fns.h
new file mode 100644
index 00000000000..8825ecb6abb
--- /dev/null
+++ b/x11/9box/files/patch-src__fns.h
@@ -0,0 +1,35 @@
+--- src/fns.h.orig	2003-01-06 18:23:16.000000000 +0800
++++ src/fns.h	2011-09-08 14:36:30.000000000 +0800
+@@ -7,7 +7,8 @@
+ Window selectwin(Box *);
+ Window dump_tree(Box *, Window, int);
+ char * getprop(Box *, Window, Atom);
+-Window reparent_window(Box *);
++void reparent_window(Box *);
++int nobuttons(XButtonEvent *);
+ 
+ 
+ /* grab.c */
+@@ -21,9 +22,14 @@ void select_window(BoxedWindow *);
+ void remove_window(BoxedWindow *);
+ void release_window(BoxedWindow *);
+ void update_buttons_position(Box *);
++void destroy_window(BoxedWindow *);
+ 
++/* menu.c */
++int menu(Box *, char **, int);
++void b2menu(Box *);
+ 
+ /* buttons.c */
++void move_button(Box *);
+ void draw_button(BoxedWindow *);
+ int button_height();
+ void move_button_to(Box *, int);
+@@ -32,6 +38,7 @@ void move_button_to(Box *, int);
+ BoxedWindow * search_boxedwindow(Box *, Window);
+ BoxedWindow * search_boxedwindow_client(Box *, Window);
+ BoxedWindow * search_boxedwindow_button(Box *, Window);
++void resize_box_for_client(Box *, int);
+ 
+ /* wm.c */
+ void set_title(Box *, char *);
diff --git a/x11/9box/files/patch-src__manage.c b/x11/9box/files/patch-src__manage.c
new file mode 100644
index 00000000000..99c73334bbe
--- /dev/null
+++ b/x11/9box/files/patch-src__manage.c
@@ -0,0 +1,33 @@
+--- src/manage.c.orig	2002-12-05 05:44:23.000000000 +0800
++++ src/manage.c	2011-09-08 14:33:13.000000000 +0800
+@@ -21,6 +21,8 @@
+ 
+ #include "dat.h"
+ #include "fns.h"
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ void
+ resize_window(BoxedWindow * window)
+@@ -30,8 +32,8 @@ resize_window(BoxedWindow * window)
+   
+   XGetGeometry(window->box->dpy, window->box->win,
+ 	       &root_return, &x_return, &y_return, 
+-	       &width_return, &height_return,
+-	       &border_width_return, &depth_return);
++	       (unsigned int *)&width_return, (unsigned int *)&height_return,
++	       (unsigned int *)&border_width_return, (unsigned int *)&depth_return);
+   XMoveWindow(window->box->dpy, window->button,
+ 	      window->number * BUTTON_DEFAULT_WIDTH, height_return - button_height());
+   printf(">> %d; %d\n", width_return, height_return);
+@@ -144,8 +146,8 @@ update_buttons_position(Box * box)
+   
+   XGetGeometry(box->dpy, box->win,
+ 	       &root_return, &x_return, &y_return, 
+-	       &width_return, &height_return,
+-	       &border_width_return, &depth_return);
++	       (unsigned int *)&width_return, (unsigned int *)&height_return,
++	       (unsigned int *)&border_width_return, (unsigned int *)&depth_return);
+ 
+   for (i=0; i<MAX_BOXED_WINDOWS && box->boxed_windows[i]; i++)
+     {
diff --git a/x11/9box/files/patch-src__menu.c b/x11/9box/files/patch-src__menu.c
new file mode 100644
index 00000000000..edbf5b2147a
--- /dev/null
+++ b/x11/9box/files/patch-src__menu.c
@@ -0,0 +1,10 @@
+--- src/menu.c.orig	2003-01-06 21:27:35.000000000 +0800
++++ src/menu.c	2011-09-08 14:29:36.000000000 +0800
+@@ -20,6 +20,7 @@
+ /* $Id$ */
+ #include "dat.h"
+ #include "fns.h"
++#include <string.h>
+ 
+ char * b2items[4] = 
+ {
diff --git a/x11/9box/files/patch-src__utils.c b/x11/9box/files/patch-src__utils.c
new file mode 100644
index 00000000000..83ca5fb0ae5
--- /dev/null
+++ b/x11/9box/files/patch-src__utils.c
@@ -0,0 +1,13 @@
+--- src/utils.c.orig	2002-10-30 19:30:09.000000000 +0800
++++ src/utils.c	2011-09-08 14:27:51.000000000 +0800
+@@ -89,8 +89,8 @@ resize_box_for_client(Box * box, int cli
+ 
+   XGetGeometry(box->dpy, box->boxed_windows[client]->client,
+ 	       &root_return, &x_return, &y_return, 
+-	       &width_return, &height_return,
+-	       &border_width_return, &depth_return);
++	       (unsigned int *)&width_return, (unsigned int*)&height_return,
++	       (unsigned int *)&border_width_return, (unsigned int *)&depth_return);
+ 
+   XResizeWindow(box->dpy, box->win, width_return, height_return+button_height());
+   box->box_width = width_return;
diff --git a/x11/9box/files/patch-src__wm.c b/x11/9box/files/patch-src__wm.c
new file mode 100644
index 00000000000..d08da87ae27
--- /dev/null
+++ b/x11/9box/files/patch-src__wm.c
@@ -0,0 +1,11 @@
+--- src/wm.c.orig	2011-09-08 14:25:35.000000000 +0800
++++ src/wm.c	2011-09-08 14:25:46.000000000 +0800
+@@ -19,6 +19,8 @@
+ 
+ /* $Id: wm.c,v 1.1 2002/04/23 23:42:36 benj Exp $ */
+ 
++#include <stdio.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+