sawfish-ui broken?

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

sawfish-ui broken?

Pedro Martelletto
(Sending this here since the port has no maintainer)

pedro@rhubarb:~ > sawfish-ui
(rep:15769): Gtk-CRITICAL **:
gtk_radio_menu_item_new_with_label_from_widget: assertion
GTK_IS_RADIO_MENU_ITEM (group)' failed
*** Bad argument: #<subr gtk-menu-shell-append>, (), 2
pedro@rhubarb:~ >

This is on -current.

-p.

Reply | Threaded
Open this post in threaded view
|

Re: sawfish-ui broken?

Pedro Martelletto
On Fri, Apr 28, 2006 at 04:46:41PM -0300, Pedro Martelletto wrote:

> (Sending this here since the port has no maintainer)
>
> pedro@rhubarb:~ > sawfish-ui
> (rep:15769): Gtk-CRITICAL **:
> gtk_radio_menu_item_new_with_label_from_widget: assertion
> GTK_IS_RADIO_MENU_ITEM (group)' failed
> *** Bad argument: #<subr gtk-menu-shell-append>, (), 2
> pedro@rhubarb:~ >
>
> This is on -current.

Couldn't resist, here's a fix.

-p.

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/rep-gtk/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 22 Jan 2006 23:21:46 -0000 1.17
+++ Makefile 29 Apr 2006 00:26:34 -0000
@@ -4,7 +4,7 @@
 
 VERSION= 0.18
 DISTNAME= rep-gtk-${VERSION}
-PKGNAME= ${DISTNAME}p4
+PKGNAME= ${DISTNAME}p5
 CATEGORIES=     x11
 
 HOMEPAGE=       http://rep-gtk.sourceforge.net/
Index: patches/patch-gtk-compat_c
===================================================================
RCS file: /cvs/ports/x11/rep-gtk/patches/patch-gtk-compat_c,v
retrieving revision 1.1
diff -u -r1.1 patch-gtk-compat_c
--- patches/patch-gtk-compat_c 3 Jun 2005 19:08:30 -0000 1.1
+++ patches/patch-gtk-compat_c 29 Apr 2006 00:26:34 -0000
@@ -1,19 +1,21 @@
 $OpenBSD: patch-gtk-compat_c,v 1.1 2005/06/03 19:08:30 sturm Exp $
---- gtk-compat.c.orig Fri Jun  3 12:02:25 2005
-+++ gtk-compat.c Fri Jun  3 12:02:47 2005
-@@ -62,6 +62,7 @@ gtk_menu_popup_interp (GtkMenu *menu,
-  func, func_data, button, activate_time);
- }
+--- gtk-compat.c.orig Fri Jul 12 01:19:22 2002
++++ gtk-compat.c Fri Apr 28 20:35:19 2006
+@@ -64,7 +64,7 @@ gtk_menu_popup_interp (GtkMenu *menu,
 
-+#if 0
  GtkWidget*
  gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
- gchar            *label)
-@@ -77,6 +78,7 @@ gtk_radio_menu_item_new_with_mnemonic_fr
+- gchar            *label)
++ const gchar            *label)
+ {
    GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
-   return gtk_radio_menu_item_new_with_mnemonic (g, label);
- }
-+#endif
+   return gtk_radio_menu_item_new_with_label (g, label);
+@@ -72,7 +72,7 @@ gtk_radio_menu_item_new_with_label_from_
 
  GtkWidget*
- gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group)
+ gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+-   gchar            *label)
++   const gchar            *label)
+ {
+   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+   return gtk_radio_menu_item_new_with_mnemonic (g, label);
Index: patches/patch-rep-gtk_h
===================================================================
RCS file: /cvs/ports/x11/rep-gtk/patches/patch-rep-gtk_h,v
retrieving revision 1.1
diff -u -r1.1 patch-rep-gtk_h
--- patches/patch-rep-gtk_h 3 Jun 2005 19:08:30 -0000 1.1
+++ patches/patch-rep-gtk_h 29 Apr 2006 00:26:34 -0000
@@ -1,18 +1,16 @@
 $OpenBSD: patch-rep-gtk_h,v 1.1 2005/06/03 19:08:30 sturm Exp $
---- rep-gtk.h.orig Fri Jun  3 12:03:02 2005
-+++ rep-gtk.h Fri Jun  3 12:03:31 2005
-@@ -289,12 +289,15 @@ void gtk_menu_popup_interp (GtkMenu *men
-    guint32 activate_time,
-    repv position);
+--- rep-gtk.h.orig Wed Feb 12 06:51:45 2003
++++ rep-gtk.h Fri Apr 28 20:35:59 2006
+@@ -291,10 +291,11 @@ void gtk_menu_popup_interp (GtkMenu *men
 
-+#if 0
  GtkWidget*
  gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
- gchar            *label);
+- gchar            *label);
++ const gchar            *label);
  GtkWidget*
  gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
-   gchar            *label);
-+#endif
+-   gchar            *label);
++   const gchar            *label);
 +
  GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
  GtkWidget* gtk_pixmap_new_interp (char *file, GtkWidget *intended_parent);