Date: Wed, 24 Mar 2004 09:41:06 +0100 (CET) From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: trevor@FreeBSD.org Subject: ports/64645: [patch] x11-wm/obconf: unbreak on -stable Message-ID: <200403240841.i2O8f6Ui014455@menelaos.informatik.rwth-aachen.de> Resent-Message-ID: <200403240850.i2O8oMTw046933@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64645 >Category: ports >Synopsis: [patch] x11-wm/obconf: unbreak on -stable >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 24 00:50:22 PST 2004 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 4.9-STABLE i386 >Organization: Lehrstuhl für Informatik II >Environment: System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-STABLE FreeBSD 4.9-STABLE #13: Tue Mar 23 15:21:17 CET 2004 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386 >Description: One file isn't c89-compliant, cf. http://bento.freebsd.org/errorlogs/i386-4-latest/obconf-1.5_1.log >How-To-Repeat: >Fix: Add new patch-file files/patch-src-handlers.c --- obconf begins here --- diff -urN /usr/ports/x11-wm/obconf/Makefile obconf/Makefile --- /usr/ports/x11-wm/obconf/Makefile Mon Feb 23 01:15:48 2004 +++ obconf/Makefile Wed Mar 24 09:37:33 2004 @@ -26,12 +26,6 @@ USE_GNOME= gtk20 libglade2 USE_X_PREFIX= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile" -.endif - pre-configure: @${CAT} ${PKGMESSAGE} @${ECHO_CMD} @@ -65,4 +59,4 @@ ${INSTALL_DATA} ${WRKSRC}/src/obconf.glade \ ${PREFIX}/share/openbox/obconf -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/x11-wm/obconf/files/patch-src-handlers.c obconf/files/patch-src-handlers.c --- /usr/ports/x11-wm/obconf/files/patch-src-handlers.c Thu Jan 1 01:00:00 1970 +++ obconf/files/patch-src-handlers.c Wed Mar 24 09:36:54 2004 @@ -0,0 +1,70 @@ +--- src/handlers.c.orig Wed Mar 24 09:36:08 2004 ++++ src/handlers.c Wed Mar 24 09:36:16 2004 +@@ -41,6 +41,10 @@ + + void setup_behavior_tab() + { ++ GtkWidget *winresist_l; ++ GtkWidget *edgeresist_l; ++ GtkSizeGroup *group2; ++ + GtkWidget *winresist = glade_xml_get_widget(glade, "resist_window"); + GtkWidget *edgeresist = glade_xml_get_widget(glade, "resist_edge"); + GtkSizeGroup *group1 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); +@@ -48,9 +52,9 @@ + gtk_size_group_add_widget(group1, winresist); + gtk_size_group_add_widget(group1, edgeresist); + +- GtkWidget *winresist_l = glade_xml_get_widget(glade, "resist_window_label"); +- GtkWidget *edgeresist_l = glade_xml_get_widget(glade, "resist_edge_label"); +- GtkSizeGroup *group2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); ++ winresist_l = glade_xml_get_widget(glade, "resist_window_label"); ++ edgeresist_l = glade_xml_get_widget(glade, "resist_edge_label"); ++ group2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + + gtk_size_group_add_widget(group2, winresist_l); + gtk_size_group_add_widget(group2, edgeresist_l); +@@ -58,6 +62,10 @@ + + void setup_dock_tab() + { ++ GtkWidget *posi_l; ++ GtkWidget *dir_l; ++ GtkSizeGroup *group2; ++ + GtkWidget *posi = glade_xml_get_widget(glade, "dock_position"); + GtkWidget *dir = glade_xml_get_widget(glade, "dock_direction"); + GtkSizeGroup *group1 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); +@@ -65,9 +73,9 @@ + gtk_size_group_add_widget(group1, posi); + gtk_size_group_add_widget(group1, dir); + +- GtkWidget *posi_l = glade_xml_get_widget(glade, "dock_position_label"); +- GtkWidget *dir_l = glade_xml_get_widget(glade, "dock_direction_label"); +- GtkSizeGroup *group2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); ++ posi_l = glade_xml_get_widget(glade, "dock_position_label"); ++ dir_l = glade_xml_get_widget(glade, "dock_direction_label"); ++ group2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + + gtk_size_group_add_widget(group2, posi_l); + gtk_size_group_add_widget(group2, dir_l); +@@ -979,15 +987,16 @@ + const gchar *new_text, + gpointer data) + { +- if (mapping) return; +- +- GtkTreePath *path = gtk_tree_path_new_from_string (path_string); ++ GtkTreePath *path; + GtkTreeIter it; + gchar *old_text; + GList *lit; + gint i; + xmlNodePtr n, c; + ++ if (mapping) return; ++ ++ path = gtk_tree_path_new_from_string (path_string); + gtk_tree_model_get_iter(GTK_TREE_MODEL(desktop_store), &it, path); + + gtk_tree_model_get(GTK_TREE_MODEL(desktop_store), &it, 0, &old_text, -1); --- obconf ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403240841.i2O8f6Ui014455>