gtk+ 2.20 deprecated some macros, causing fallout (surprise, surprise!)

5 files changed, 57 insertions, 4 deletions

diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 26a3690544d..c5e33e50b62 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.65 2009/12/20 10:09:42 tron Exp $
+# $NetBSD: Makefile,v 1.66 2010/06/02 18:24:47 tnn Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME}pl1
-PKGREVISION=	2
+PKGREVISION=	3
 OWNER=		tron@NetBSD.org
 COMMENT=	X11 (X Window System) IRC client, using the GTK2 toolkit
 
@@ -24,7 +24,7 @@ LDFLAGS.IRIX+=		-lX11
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.10.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.20.0
 .include "../../x11/gtk2/buildlink3.mk"
 
 .if ${OPSYS} == "Darwin"
diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index 7b1dfc3fd60..b9448221b4c 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2008/10/17 11:03:43 tron Exp $
+$NetBSD: distinfo,v 1.41 2010/06/02 18:24:47 tnn Exp $
 
 SHA1 (xc286-smallfixes.diff) = b13eb421f6d72fca195b398c606d9413aec57fc4
 RMD160 (xc286-smallfixes.diff) = 91c654320b7b1f9d6b13f7b226fb4cec26054319
@@ -9,3 +9,6 @@ Size (xchat-2.8.6.tar.bz2) = 1423645 bytes
 SHA1 (patch-aa) = 99ec48125bc394745b5e5d0d8ebd8323d1aca4af
 SHA1 (patch-ab) = 109d61363f040d4f9716b6698a002b804847da33
 SHA1 (patch-ac) = 79530959fffa5271cc83aadd32d8340a3e6f27f6
+SHA1 (patch-ad) = 07bbde70d7df4c52ebddf32ad1e42b6f4148880c
+SHA1 (patch-ae) = 8fa6087af55651d131d155e6c969dc10eaa09a38
+SHA1 (patch-af) = 1dee71a702424355b48d06ed29577b43881548e8
diff --git a/chat/xchat/patches/patch-ad b/chat/xchat/patches/patch-ad
new file mode 100644
index 00000000000..8841f3862ac
--- /dev/null
+++ b/chat/xchat/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.8 2010/06/02 18:24:47 tnn Exp $
+
+--- src/fe-gtk/fe-gtk.c.orig	2008-02-24 08:39:44.000000000 +0000
++++ 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)))
diff --git a/chat/xchat/patches/patch-ae b/chat/xchat/patches/patch-ae
new file mode 100644
index 00000000000..a9dfda25db8
--- /dev/null
+++ b/chat/xchat/patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.5 2010/06/02 18:24:47 tnn Exp $
+
+--- src/fe-gtk/maingui.c.orig	2008-04-01 08:53:41.000000000 +0000
++++ 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;
diff --git a/chat/xchat/patches/patch-af b/chat/xchat/patches/patch-af
new file mode 100644
index 00000000000..8190a8420b6
--- /dev/null
+++ b/chat/xchat/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2010/06/02 18:24:47 tnn Exp $
+
+--- src/fe-gtk/menu.c.orig	2008-06-08 07:59:37.000000000 +0000
++++ 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