[67999] trunk/dports/irc/xchat2

[afb at macports.org]

Revision: 67999
          http://trac.macports.org/changeset/67999
Author:   afb at macports.org
Date:     2010-05-24 00:40:19 -0700 (Mon, 24 May 2010)
Log Message:
-----------
make xchat2 work with latest gtk2 (#24979)

Modified Paths:
--------------
    trunk/dports/irc/xchat2/Portfile

Added Paths:
-----------
    trunk/dports/irc/xchat2/files/patch-gtk2.19.7.diff

Modified: trunk/dports/irc/xchat2/Portfile
===================================================================
--- trunk/dports/irc/xchat2/Portfile	2010-05-23 23:47:54 UTC (rev 67998)
+++ trunk/dports/irc/xchat2/Portfile	2010-05-24 07:40:19 UTC (rev 67999)
@@ -4,7 +4,7 @@
 
 name		xchat2
 version		2.8.6
-revision	2
+revision	3
 set branch	[join [lrange [split ${version} .] 0 1] .]
 categories	irc
 maintainers	afb openmaintainer
@@ -21,7 +21,7 @@
 
 distname	xchat-${version}
 
-patchfiles	xc286-smallfixes.diff patch-xtext.h
+patchfiles	xc286-smallfixes.diff patch-xtext.h patch-gtk2.19.7.diff
 
 checksums	xchat-${version}.tar.bz2 md5 1f2670865d43a23a9abc596dde999aca \
 		xchat-${version}.tar.bz2 sha1 7a7463e65cb26c680ed70dd96cec98bcc05435a4 \
@@ -34,7 +34,7 @@
 
 depends_lib	port:gtk2 path:bin/perl:perl5
 
-patch.args	-p1
+patch.pre_args	-p1
 
 configure.cppflags-append -no-cpp-precomp
 

Added: trunk/dports/irc/xchat2/files/patch-gtk2.19.7.diff
===================================================================
--- trunk/dports/irc/xchat2/files/patch-gtk2.19.7.diff	                        (rev 0)
+++ trunk/dports/irc/xchat2/files/patch-gtk2.19.7.diff	2010-05-24 07:40:19 UTC (rev 67999)
@@ -0,0 +1,91 @@
+# http://sourceforge.net/tracker/?func=detail&aid=2974436&group_id=239&atid=100239
+Index: xchat-2.8.6/src/fe-gtk/dccgui.c
+===================================================================
+--- ./src/fe-gtk/dccgui.c.orig
++++ ./src/fe-gtk/dccgui.c
+@@ -700,7 +700,7 @@ dcc_detail_label (char *text, GtkWidget
+ static void
+ dcc_exp_cb (GtkWidget *exp, GtkWidget *box)
+ {
+-	if (GTK_WIDGET_VISIBLE (box))
++	if (gtk_widget_get_visible (box))
+ 		gtk_widget_hide (box);
+ 	else
+ 		gtk_widget_show (box);
+Index: xchat-2.8.6/src/fe-gtk/fe-gtk.c
+===================================================================
+--- ./src/fe-gtk/fe-gtk.c.orig
++++ ./src/fe-gtk/fe-gtk.c
+@@ -819,7 +819,7 @@ fe_gui_info (session *sess, int info_typ
+ 	switch (info_type)
+ 	{
+ 	case 0:	/* window status */
+-		if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window)))
++		if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window)))
+ 			return 2;	/* hidden (iconified or systray) */
+ #if GTK_CHECK_VERSION(2,4,0)
+ 		if (gtk_window_is_active (GTK_WINDOW (sess->gui->window)))
+Index: xchat-2.8.6/src/fe-gtk/maingui.c
+===================================================================
+--- ./src/fe-gtk/maingui.c.orig
++++ ./src/fe-gtk/maingui.c
+@@ -599,7 +599,7 @@ mg_show_generic_tab (GtkWidget *box)
+ 	int num;
+ 	GtkWidget *f = NULL;
+ 
+-	if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box))
++	if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box))
+ 		f = current_sess->gui->input_box;
+ 
+ 	num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box);
+@@ -809,8 +809,8 @@ mg_set_topic_tip (session *sess)
+ static void
+ mg_hide_empty_pane (GtkPaned *pane)
+ {
+-	if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) &&
+-		 (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2)))
++	if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) &&
++		 (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2)))
+ 	{
+ 		gtk_widget_hide (GTK_WIDGET (pane));
+ 		return;
+@@ -2585,9 +2585,9 @@ mg_rightpane_cb (GtkPaned *pane, GParamS
+ {
+ 	int handle_size;
+ 
+-/*	if (pane->child1 == NULL || (!GTK_WIDGET_VISIBLE (pane->child1)))
++/*	if (pane->child1 == NULL || (!gtk_widget_get_visible (pane->child1)))
+ 		return;
+-	if (pane->child2 == NULL || (!GTK_WIDGET_VISIBLE (pane->child2)))
++	if (pane->child2 == NULL || (!gtk_widget_get_visible (pane->child2)))
+ 		return;*/
+ 
+ 	gtk_widget_style_get (GTK_WIDGET (pane), "handle-size", &handle_size, NULL);
+Index: xchat-2.8.6/src/fe-gtk/menu.c
+===================================================================
+--- ./src/fe-gtk/menu.c.orig
++++ ./src/fe-gtk/menu.c
+@@ -1670,7 +1670,7 @@ static gboolean
+ menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
+ {
+ 	/* GTK2.2 behaviour */
+-	return GTK_WIDGET_IS_SENSITIVE (widget);
++	return gtk_widget_is_sensitive (widget);
+ }
+ 
+ #endif
+Index: xchat-2.8.6/src/fe-gtk/plugin-tray.c
+===================================================================
+--- ./src/fe-gtk/plugin-tray.c.orig
++++ ./src/fe-gtk/plugin-tray.c
+@@ -457,7 +457,7 @@ tray_toggle_visibility (gboolean force_h
+ 	if (!win)
+ 		return FALSE;
+ 
+-	if (force_hide || GTK_WIDGET_VISIBLE (win))
++	if (force_hide || gtk_widget_get_visible (win))
+ 	{
+ 		gtk_window_get_position (win, &x, &y);
+ 		screen = gtk_window_get_screen (win);
+
+ 	  	 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100524/12aceb13/attachment.html>