Fix build on 4.x.

Reported by:	pointyhat via kris

3 files changed, 67 insertions, 0 deletions

diff --git a/x11-wm/openbox/files/patch-openbox-menuframe.c b/x11-wm/openbox/files/patch-openbox-menuframe.c
new file mode 100644
index 000000000000..884096491726
--- /dev/null
+++ b/x11-wm/openbox/files/patch-openbox-menuframe.c
@@ -0,0 +1,18 @@
+--- openbox/menuframe.c.orig	Tue Sep 12 21:24:28 2006
++++ openbox/menuframe.c	Tue Sep 12 21:24:50 2006
+@@ -675,12 +675,14 @@
+ 
+ void menu_frame_hide_all()
+ {
++    GList *it;
++
+     if (config_submenu_show_delay) {
+         /* remove any submenu open requests */
+         ob_main_loop_timeout_remove(ob_main_loop,
+                                     menu_entry_frame_submenu_timeout);
+     }
+-    GList *it = g_list_last(menu_frame_visible);
++    it = g_list_last(menu_frame_visible);
+     if (it) 
+         menu_frame_hide(it->data);
+ }
diff --git a/x11-wm/openbox/files/patch-render-font.c b/x11-wm/openbox/files/patch-render-font.c
new file mode 100644
index 000000000000..9cc01386c6bf
--- /dev/null
+++ b/x11-wm/openbox/files/patch-render-font.c
@@ -0,0 +1,26 @@
+--- render/font.c.orig	Sat Aug 26 22:15:51 2006
++++ render/font.c	Tue Sep 12 21:14:46 2006
+@@ -92,6 +92,8 @@
+ #ifdef USE_PANGO
+     guchar *tmp_string = NULL;
+     gint tmp_int;
++    gchar *locale, *p;
++    PangoFontMetrics *metrics;
+ #endif /* USE_PANGO */
+ 
+     if (!(pat = XftNameParse(fontstring)))
+@@ -135,13 +137,12 @@
+     }
+ 
+     /* based on gtkmain.c gtk_get_default_language() */
+-    gchar *locale, *p;
+     locale = g_strdup(setlocale(LC_CTYPE, NULL));
+     if ((p = strchr(locale, '.')))
+         *p = '\0';
+     if ((p = strchr(locale, '@')))
+         *p = '\0';
+-    PangoFontMetrics *metrics = 
++    metrics = 
+         pango_context_get_metrics(context, out->pango_font_description,
+                                   pango_language_from_string(locale));
+     out->pango_ascent = pango_font_metrics_get_ascent(metrics);
diff --git a/x11-wm/openbox/files/patch-render-gradient.c b/x11-wm/openbox/files/patch-render-gradient.c
new file mode 100644
index 000000000000..5c8f7b789b42
--- /dev/null
+++ b/x11-wm/openbox/files/patch-render-gradient.c
@@ -0,0 +1,23 @@
+--- render/gradient.c.orig	Sat Aug 26 22:15:51 2006
++++ render/gradient.c	Tue Sep 12 21:14:46 2006
+@@ -371,6 +371,9 @@
+     RrPixel32 current;
+     RrColor *primary_light, *secondary_light;
+ 
++    VARS(y1);
++    VARS(y3);
++
+     r = sf->primary->r;
+     r += r >> 2;
+     g = sf->primary->g;
+@@ -393,10 +396,8 @@
+     if (b > 0xFF) b = 0xFF;
+     secondary_light = RrColorNew(a->inst, r, g, b);
+ 
+-    VARS(y1);
+     SETUP(y1, primary_light, sf->primary, (h / 2) -1);
+   
+-    VARS(y3);
+     SETUP(y3, sf->secondary, secondary_light,  (h / 2) -1);
+ 
+     for (y1 = h - 1; y1 > (h / 2) -1; --y1) {  /* 0 -> h-1 */