Attachment #28419 for bug #47816

View | Details | Raw Unified | Return to bug 47816
Collapse All | Expand All




#

PORTNAME=	thefish
PORTVERSION=	0.3
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	http://energyhq.homeip.net/files/


.else
LIB_DEPENDS=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20
USE_X_PREFIX=	yes
.endif

.if defined(WITH_CDK)
LIB_DEPENDS+=	cdk:${PORTSDIR}/devel/cdk
.endif

MAN1=		thefish.1

Line 1 Link Here

(-)thefish/distinfo (-1 / +1 lines)
1	MD5 (thefish-0.2.5.1.tar.gz) = 3cb9611006f0e4e21d0b6b174fa4601b	1	MD5 (thefish-0.3.tar.gz) = f51b20b4a3c4714f0902138e23765adf




--- gtk_ui.c.orig	Mon Jan 27 23:14:16 2003
+++ gtk_ui.c	Thu Jan 30 21:53:48 2003
@@ -24,7 +24,7 @@
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$Id: //depot/fish/gtk_ui.c#25 $
+$Id: //depot/fish/gtk_ui.c#26 $
 
 */
 
@@ -268,22 +268,22 @@
 	gtk_box_pack_start((GtkBox *)h_buttons, about_button, FALSE, FALSE, 0);
 	gtk_box_pack_start((GtkBox *) h_buttons, quit_button, FALSE, FALSE, 0);
 
-	g_signal_connect_swapped(GTK_OBJECT(window), "delete_event",\
+	g_signal_connect(GTK_OBJECT(window), "delete_event",\
 		      GTK_SIGNAL_FUNC(delete_event), NULL);
 
-	g_signal_connect_swapped(GTK_OBJECT(window), "destroy",\
+	g_signal_connect(GTK_OBJECT(window), "destroy",\
 		      GTK_SIGNAL_FUNC(destroy), NULL);
 
-	g_signal_connect_swapped(GTK_OBJECT(commit_button), "clicked",\
+	g_signal_connect(GTK_OBJECT(commit_button), "clicked",\
 		      GTK_SIGNAL_FUNC(commit_pressed), NULL);
 			  
-  	g_signal_connect_swapped(GTK_OBJECT(quit_button), "clicked",\
+  	g_signal_connect(GTK_OBJECT(quit_button), "clicked",\
 		      GTK_SIGNAL_FUNC(quit_pressed), NULL);
 
-	g_signal_connect_swapped(GTK_OBJECT(about_button), "clicked",\
+	g_signal_connect(GTK_OBJECT(about_button), "clicked",\
 		      GTK_SIGNAL_FUNC(about_pressed), NULL);
 
-	g_signal_connect_swapped(GTK_OBJECT(add_button), "clicked",\
+	g_signal_connect(GTK_OBJECT(add_button), "clicked",\
 		      GTK_SIGNAL_FUNC(add_pressed), NULL);
 			  			  
 	mytable1=gtk_table_new(num_knobs*2,3,FALSE);
@@ -323,10 +323,10 @@
 		
 		} 
 
-		g_signal_connect_swapped(GTK_OBJECT(radio_yes1[i]), "pressed",\
+		g_signal_connect(GTK_OBJECT(radio_yes1[i]), "pressed",\
 		      GTK_SIGNAL_FUNC(radio_yes_pressed), NULL);
 
-		g_signal_connect_swapped(GTK_OBJECT(radio_no1[i]), "pressed",\
+		g_signal_connect(GTK_OBJECT(radio_no1[i]), "pressed",\
 		      GTK_SIGNAL_FUNC(radio_no_pressed), NULL);
 
 
@@ -424,7 +424,7 @@
 
 		gtk_entry_set_text((GtkEntry *)str_entry[i],work->value);
 		
-		g_signal_connect_swapped(GTK_OBJECT(str_entry[i]), "changed",\
+		g_signal_connect(GTK_OBJECT(str_entry[i]), "changed",\
 						GTK_SIGNAL_FUNC(entry_modified), NULL);
 						
 		gtk_table_attach((GtkTable *)mytable2, (GtkWidget *) str_label[i]
@@ -914,13 +914,13 @@
 	
 	add_yes_button = gtk_button_new_with_label("OK");
 	
-	g_signal_connect_swapped(GTK_OBJECT(add_yes_button), "clicked",\
+	g_signal_connect(GTK_OBJECT(add_yes_button), "clicked",\
 		      GTK_SIGNAL_FUNC(add_yes_pressed), NULL);
 
 
 	add_no_button = gtk_button_new_with_label("Cancel");
 	
-	g_signal_connect_swapped(GTK_OBJECT(add_no_button), "clicked",\
+	g_signal_connect(GTK_OBJECT(add_no_button), "clicked",\
 		      GTK_SIGNAL_FUNC(add_no_pressed), NULL);
 			  
 	add_hsep = gtk_hseparator_new ();
@@ -1062,10 +1062,10 @@
 		
 			} 
 
-			g_signal_connect_swapped(GTK_OBJECT(radio_yes1[r_num]), "pressed",\
+			g_signal_connect(GTK_OBJECT(radio_yes1[r_num]), "pressed",\
 			      GTK_SIGNAL_FUNC(radio_yes_pressed), NULL);
 
-			g_signal_connect_swapped(GTK_OBJECT(radio_no1[r_num]), "pressed",\
+			g_signal_connect(GTK_OBJECT(radio_no1[r_num]), "pressed",\
 			      GTK_SIGNAL_FUNC(radio_no_pressed), NULL);
 
 			knob_label[r_num]=gtk_label_new(r_ptr[r_num].name);
@@ -1102,7 +1102,7 @@
 
 			gtk_entry_set_text((GtkEntry *)str_entry[s_num],s_ptr[s_num].value);
 		
-			g_signal_connect_swapped(GTK_OBJECT(str_entry[s_num]), "changed",\
+			g_signal_connect(GTK_OBJECT(str_entry[s_num]), "changed",\
 						GTK_SIGNAL_FUNC(entry_modified), NULL);
 						
 			gtk_table_attach((GtkTable *) mytable2, (GtkWidget *) str_label[s_num], 

Lines 1-5 Link Here

(-)thefish/pkg-message (-5 / +4 lines)
1	**********************************************************************	1	***********************************************************************
2	HEADS UP: GTK+ 1.2 support has been dropped.	2	To build The Fish without the GTK+ UI, define NO_GUI or WITHOUT_X11
3	---------------------------------------------------------------------	3	To enable the new (experimental) CDK console UI, define WITH_CDK
4	If you want to build The Fish without the GTK+ UI, use make -DNO_GUI	4	***********************************************************************
5	**********************************************************************

Return to bug 47816

Lines 6-13 Link Here

(-)thefish/Makefile (-2 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= thefish	8	PORTNAME= thefish
9	PORTVERSION= 0.2.5.1	9	PORTVERSION= 0.3
10	PORTREVISION= 1
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= http://energyhq.homeip.net/files/	11	MASTER_SITES= http://energyhq.homeip.net/files/
13		12
Lines 19-24 Link Here
19	.else	18	.else
20	LIB_DEPENDS= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20	19	LIB_DEPENDS= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20
21	USE_X_PREFIX= yes	20	USE_X_PREFIX= yes
		21	.endif
		22
		23	.if defined(WITH_CDK)
		24	LIB_DEPENDS+= cdk:${PORTSDIR}/devel/cdk
22	.endif	25	.endif
23		26
24	MAN1= thefish.1	27	MAN1= thefish.1

Lines 1-100 Link Here

(-)thefish/files/patch-aa (-100 lines)
1	--- gtk_ui.c.orig Mon Jan 27 23:14:16 2003
2	+++ gtk_ui.c Thu Jan 30 21:53:48 2003
3	@@ -24,7 +24,7 @@
4	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6
7	-$Id: //depot/fish/gtk_ui.c#25 $
8	+$Id: //depot/fish/gtk_ui.c#26 $
9
10	*/
11
12	@@ -268,22 +268,22 @@
13	gtk_box_pack_start((GtkBox *)h_buttons, about_button, FALSE, FALSE, 0);
14	gtk_box_pack_start((GtkBox *) h_buttons, quit_button, FALSE, FALSE, 0);
15
16	- g_signal_connect_swapped(GTK_OBJECT(window), "delete_event",\
17	+ g_signal_connect(GTK_OBJECT(window), "delete_event",\
18	GTK_SIGNAL_FUNC(delete_event), NULL);
19
20	- g_signal_connect_swapped(GTK_OBJECT(window), "destroy",\
21	+ g_signal_connect(GTK_OBJECT(window), "destroy",\
22	GTK_SIGNAL_FUNC(destroy), NULL);
23
24	- g_signal_connect_swapped(GTK_OBJECT(commit_button), "clicked",\
25	+ g_signal_connect(GTK_OBJECT(commit_button), "clicked",\
26	GTK_SIGNAL_FUNC(commit_pressed), NULL);
27
28	- g_signal_connect_swapped(GTK_OBJECT(quit_button), "clicked",\
29	+ g_signal_connect(GTK_OBJECT(quit_button), "clicked",\
30	GTK_SIGNAL_FUNC(quit_pressed), NULL);
31
32	- g_signal_connect_swapped(GTK_OBJECT(about_button), "clicked",\
33	+ g_signal_connect(GTK_OBJECT(about_button), "clicked",\
34	GTK_SIGNAL_FUNC(about_pressed), NULL);
35
36	- g_signal_connect_swapped(GTK_OBJECT(add_button), "clicked",\
37	+ g_signal_connect(GTK_OBJECT(add_button), "clicked",\
38	GTK_SIGNAL_FUNC(add_pressed), NULL);
39
40	mytable1=gtk_table_new(num_knobs*2,3,FALSE);
41	@@ -323,10 +323,10 @@
42
43	}
44
45	- g_signal_connect_swapped(GTK_OBJECT(radio_yes1[i]), "pressed",\
46	+ g_signal_connect(GTK_OBJECT(radio_yes1[i]), "pressed",\
47	GTK_SIGNAL_FUNC(radio_yes_pressed), NULL);
48
49	- g_signal_connect_swapped(GTK_OBJECT(radio_no1[i]), "pressed",\
50	+ g_signal_connect(GTK_OBJECT(radio_no1[i]), "pressed",\
51	GTK_SIGNAL_FUNC(radio_no_pressed), NULL);
52
53
54	@@ -424,7 +424,7 @@
55
56	gtk_entry_set_text((GtkEntry *)str_entry[i],work->value);
57
58	- g_signal_connect_swapped(GTK_OBJECT(str_entry[i]), "changed",\
59	+ g_signal_connect(GTK_OBJECT(str_entry[i]), "changed",\
60	GTK_SIGNAL_FUNC(entry_modified), NULL);
61
62	gtk_table_attach((GtkTable )mytable2, (GtkWidget ) str_label[i]
63	@@ -914,13 +914,13 @@
64
65	add_yes_button = gtk_button_new_with_label("OK");
66
67	- g_signal_connect_swapped(GTK_OBJECT(add_yes_button), "clicked",\
68	+ g_signal_connect(GTK_OBJECT(add_yes_button), "clicked",\
69	GTK_SIGNAL_FUNC(add_yes_pressed), NULL);
70
71
72	add_no_button = gtk_button_new_with_label("Cancel");
73
74	- g_signal_connect_swapped(GTK_OBJECT(add_no_button), "clicked",\
75	+ g_signal_connect(GTK_OBJECT(add_no_button), "clicked",\
76	GTK_SIGNAL_FUNC(add_no_pressed), NULL);
77
78	add_hsep = gtk_hseparator_new ();
79	@@ -1062,10 +1062,10 @@
80
81	}
82
83	- g_signal_connect_swapped(GTK_OBJECT(radio_yes1[r_num]), "pressed",\
84	+ g_signal_connect(GTK_OBJECT(radio_yes1[r_num]), "pressed",\
85	GTK_SIGNAL_FUNC(radio_yes_pressed), NULL);
86
87	- g_signal_connect_swapped(GTK_OBJECT(radio_no1[r_num]), "pressed",\
88	+ g_signal_connect(GTK_OBJECT(radio_no1[r_num]), "pressed",\
89	GTK_SIGNAL_FUNC(radio_no_pressed), NULL);
90
91	knob_label[r_num]=gtk_label_new(r_ptr[r_num].name);
92	@@ -1102,7 +1102,7 @@
93
94	gtk_entry_set_text((GtkEntry *)str_entry[s_num],s_ptr[s_num].value);
95
96	- g_signal_connect_swapped(GTK_OBJECT(str_entry[s_num]), "changed",\
97	+ g_signal_connect(GTK_OBJECT(str_entry[s_num]), "changed",\
98	GTK_SIGNAL_FUNC(entry_modified), NULL);
99
100	gtk_table_attach((GtkTable ) mytable2, (GtkWidget ) str_label[s_num],