From dbc16cb5ef5b5840f1fa9627a13be2beb1fd299f Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Thu, 14 Oct 2004 17:52:47 +0000 Subject: [PATCH] Update to 0.2. Approved by: pav (mentor) --- irc/xchat-gnome/Makefile | 7 +-- irc/xchat-gnome/distinfo | 4 +- .../files/patch-src-fe-gnome-channel_list.c | 22 +++---- .../files/patch-src-fe-gnome-userlist_gui.c | 31 +++++----- .../files/patch-src_fe-gnome_fe-gnome.c | 29 --------- .../files/patch-src_fe-gnome_userlist_gui.c | 48 --------------- irc/xchat-gnome/pkg-plist | 59 +++++++++++-------- 7 files changed, 65 insertions(+), 135 deletions(-) delete mode 100644 irc/xchat-gnome/files/patch-src_fe-gnome_fe-gnome.c delete mode 100644 irc/xchat-gnome/files/patch-src_fe-gnome_userlist_gui.c diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index 0d164dfd9cad..1bcd368ec398 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -6,20 +6,17 @@ # PORTNAME= xchat -PORTVERSION= 0.1 -PORTREVISION= 1 +PORTVERSION= 0.2 CATEGORIES= irc gnome ipv6 MASTER_SITES= http://navi.cx/releases/ \ http://members.chello.nl/~g.mast/distfiles/ PKGNAMESUFFIX= -gnome DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} -MAINTAINER= kwm@rainbow-runner.nl +MAINTAINER= kwm@FreeBSD.org COMMENT= An IRC client for GNOME 2 (development version) USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${XCHAT_VER} -XCHAT_VER= 2.0.8 USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui USE_REINPLACE= yes diff --git a/irc/xchat-gnome/distinfo b/irc/xchat-gnome/distinfo index 4921023c5b62..051f0e21c3fe 100644 --- a/irc/xchat-gnome/distinfo +++ b/irc/xchat-gnome/distinfo @@ -1,2 +1,2 @@ -MD5 (xchat-gnome-0.1.tar.gz) = 6a736ee186d06df90a610eeb19459e7d -SIZE (xchat-gnome-0.1.tar.gz) = 2558977 +MD5 (xchat-gnome-0.2.tar.gz) = 0411cd4146ccb484163d3fd145c0f114 +SIZE (xchat-gnome-0.2.tar.gz) = 2860304 diff --git a/irc/xchat-gnome/files/patch-src-fe-gnome-channel_list.c b/irc/xchat-gnome/files/patch-src-fe-gnome-channel_list.c index 0f7200433846..c3a01c638b6b 100644 --- a/irc/xchat-gnome/files/patch-src-fe-gnome-channel_list.c +++ b/irc/xchat-gnome/files/patch-src-fe-gnome-channel_list.c @@ -1,19 +1,19 @@ ---- src/fe-gnome/channel_list.c.orig Sun Apr 25 01:14:31 2004 -+++ src/fe-gnome/channel_list.c Wed May 5 00:02:05 2004 -@@ -98,6 +98,7 @@ +--- src/fe-gnome/channel_list.c.orig Wed Oct 13 10:27:41 2004 ++++ src/fe-gnome/channel_list.c Wed Oct 13 10:28:10 2004 +@@ -118,6 +118,7 @@ GtkSizeGroup *group; GtkTreeSelection *select; int width, height; + gchar *title; - if(sess == NULL) + if (sess == NULL) return; -@@ -122,7 +123,7 @@ +@@ -142,7 +143,7 @@ } - widget = glade_xml_get_widget(win->xml, "window 1"); -- gchar *title = g_strdup_printf("%s Channel List", sess->server->networkname); -+ title = g_strdup_printf("%s Channel List", sess->server->networkname); - gtk_window_set_title(GTK_WINDOW(widget), title); - g_free(title); - g_signal_connect(G_OBJECT(widget), "delete-event", G_CALLBACK(chanlist_delete), win); + widget = glade_xml_get_widget (win->xml, "window 1"); +- gchar *title = g_strdup_printf ("%s Channel List", get_network (sess)); ++ title = g_strdup_printf ("%s Channel List", get_network (sess)); + gtk_window_set_title (GTK_WINDOW (widget), title); + g_free (title); + g_signal_connect (G_OBJECT (widget), "delete-event", G_CALLBACK (chanlist_delete), win); diff --git a/irc/xchat-gnome/files/patch-src-fe-gnome-userlist_gui.c b/irc/xchat-gnome/files/patch-src-fe-gnome-userlist_gui.c index 03a57b46abd0..b0d65ad1e682 100644 --- a/irc/xchat-gnome/files/patch-src-fe-gnome-userlist_gui.c +++ b/irc/xchat-gnome/files/patch-src-fe-gnome-userlist_gui.c @@ -1,18 +1,19 @@ ---- src/fe-gnome/userlist_gui.c.orig Sun Apr 25 01:14:29 2004 -+++ src/fe-gnome/userlist_gui.c Wed May 5 00:16:02 2004 -@@ -64,13 +64,14 @@ - } +--- src/fe-gnome/userlist_gui.c.orig Wed Oct 13 10:27:32 2004 ++++ src/fe-gnome/userlist_gui.c Wed Oct 13 10:28:46 2004 +@@ -82,6 +82,7 @@ + { + GtkTreePath *path; + GtkTreeSelection *select; ++ struct User *u; + if (!event) + return FALSE; - if(event->button == 3) { -+ struct User *u; - if(gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(view), event->x, event->y, &path, 0, 0, 0)) { - select = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); - gtk_tree_selection_unselect_all(select); - gtk_tree_selection_select_path(select, path); - gtk_tree_path_free(path); +@@ -105,7 +106,7 @@ + gtk_tree_selection_select_path (select, path); + gtk_tree_path_free (path); } -- struct User *u = userlist_get_selected(); -+ u = userlist_get_selected(); - if(u != NULL) - userlist_context(view, u); +- struct User *u = userlist_get_selected (); ++ u = userlist_get_selected (); + if (u != NULL) + userlist_context (view, u); return TRUE; diff --git a/irc/xchat-gnome/files/patch-src_fe-gnome_fe-gnome.c b/irc/xchat-gnome/files/patch-src_fe-gnome_fe-gnome.c deleted file mode 100644 index c700cb9bbd4c..000000000000 --- a/irc/xchat-gnome/files/patch-src_fe-gnome_fe-gnome.c +++ /dev/null @@ -1,29 +0,0 @@ ---- src/fe-gnome/fe-gnome.c.orig Wed Apr 28 02:38:33 2004 -+++ src/fe-gnome/fe-gnome.c Wed Sep 1 14:16:10 2004 -@@ -249,7 +249,7 @@ - add_transfer(dcc); - break; - -- default: -+ default: ; - } - } - -@@ -260,7 +260,7 @@ - update_transfer(dcc); - break; - -- default: -+ default: ; - } - } - -@@ -272,7 +272,7 @@ - remove_transfer(dcc); - break; - -- default: -+ default: ; - } - } - diff --git a/irc/xchat-gnome/files/patch-src_fe-gnome_userlist_gui.c b/irc/xchat-gnome/files/patch-src_fe-gnome_userlist_gui.c deleted file mode 100644 index 5e61adbbe728..000000000000 --- a/irc/xchat-gnome/files/patch-src_fe-gnome_userlist_gui.c +++ /dev/null @@ -1,48 +0,0 @@ ---- src/fe-gnome/userlist_gui.c.orig Wed Sep 1 14:19:24 2004 -+++ src/fe-gnome/userlist_gui.c Wed Sep 1 14:21:39 2004 -@@ -52,6 +52,22 @@ - g_signal_connect(G_OBJECT(userlist_view), "button_press_event", G_CALLBACK(userlist_click), NULL); - } - -+struct User *userlist_get_selected() { -+ GtkWidget *treeview; -+ GtkTreeSelection *select; -+ GtkTreeModel *model; -+ GtkTreeIter iter; -+ struct User *u; -+ -+ treeview = glade_xml_get_widget(gui.xml, "userlist"); -+ select = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); -+ if(gtk_tree_selection_get_selected(select, &model, &iter)) { -+ gtk_tree_model_get(model, &iter, 2, &u, -1); -+ return u; -+ } -+ return NULL; -+} -+ - gboolean userlist_click(GtkWidget *view, GdkEventButton *event, gpointer data) { - GtkTreePath *path; - GtkTreeSelection *select; -@@ -77,22 +93,6 @@ - return TRUE; - } - return FALSE; --} -- --struct User *userlist_get_selected() { -- GtkWidget *treeview; -- GtkTreeSelection *select; -- GtkTreeModel *model; -- GtkTreeIter iter; -- struct User *u; -- -- treeview = glade_xml_get_widget(gui.xml, "userlist"); -- select = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); -- if(gtk_tree_selection_get_selected(select, &model, &iter)) { -- gtk_tree_model_get(model, &iter, 2, &u, -1); -- return u; -- } -- return NULL; - } - - void userlist_context(GtkWidget *treeview, struct User *user) { diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist index 7053b90ea3b4..803fbc804673 100644 --- a/irc/xchat-gnome/pkg-plist +++ b/irc/xchat-gnome/pkg-plist @@ -4,7 +4,9 @@ etc/gconf/schemas/apps_xchat.schemas.in.in %%PERL%%lib/xchat/plugins/perl.so %%PYTHON%%lib/xchat/plugins/python.so %%TCL%%lib/xchat/plugins/tcl.so +share/gnome/applications/xchat-gnome.desktop share/gnome/applications/xchat.desktop +share/gnome/pixmaps/xchat-gnome.png share/gnome/pixmaps/xchat.png share/gnome/xchat/channel-list.glade share/gnome/xchat/color.png @@ -15,37 +17,44 @@ share/gnome/xchat/newdata.png share/gnome/xchat/nicksaid.png share/gnome/xchat/plugin-manager.png share/gnome/xchat/servers.png +share/gnome/xchat/setup-dialog.glade share/gnome/xchat/soap.png share/gnome/xchat/stock_link.png share/gnome/xchat/toilet-paper.png share/gnome/xchat/transfers.glade share/gnome/xchat/xchat-gnome-small.png share/gnome/xchat/xchat-gnome.glade -share/locale/am/LC_MESSAGES/xchat.mo -share/locale/az/LC_MESSAGES/xchat.mo -share/locale/ca/LC_MESSAGES/xchat.mo -share/locale/cs/LC_MESSAGES/xchat.mo -share/locale/de/LC_MESSAGES/xchat.mo -share/locale/el/LC_MESSAGES/xchat.mo -share/locale/es/LC_MESSAGES/xchat.mo -share/locale/et/LC_MESSAGES/xchat.mo -share/locale/fi/LC_MESSAGES/xchat.mo -share/locale/fr/LC_MESSAGES/xchat.mo -share/locale/ja/LC_MESSAGES/xchat.mo -share/locale/lt/LC_MESSAGES/xchat.mo -share/locale/lv/LC_MESSAGES/xchat.mo -share/locale/mk/LC_MESSAGES/xchat.mo -share/locale/ms/LC_MESSAGES/xchat.mo -share/locale/nl/LC_MESSAGES/xchat.mo -share/locale/no/LC_MESSAGES/xchat.mo -share/locale/pt/LC_MESSAGES/xchat.mo -share/locale/ru/LC_MESSAGES/xchat.mo -share/locale/sk/LC_MESSAGES/xchat.mo -share/locale/sl/LC_MESSAGES/xchat.mo -share/locale/sr/LC_MESSAGES/xchat.mo -share/locale/sv/LC_MESSAGES/xchat.mo -share/locale/uk/LC_MESSAGES/xchat.mo -share/locale/zh_CN/LC_MESSAGES/xchat.mo +share/locale/am/LC_MESSAGES/xchat-gnome.mo +share/locale/az/LC_MESSAGES/xchat-gnome.mo +share/locale/bg/LC_MESSAGES/xchat-gnome.mo +share/locale/ca/LC_MESSAGES/xchat-gnome.mo +share/locale/cs/LC_MESSAGES/xchat-gnome.mo +share/locale/de/LC_MESSAGES/xchat-gnome.mo +share/locale/el/LC_MESSAGES/xchat-gnome.mo +share/locale/en_GB/LC_MESSAGES/xchat-gnome.mo +share/locale/es/LC_MESSAGES/xchat-gnome.mo +share/locale/et/LC_MESSAGES/xchat-gnome.mo +share/locale/eu/LC_MESSAGES/xchat-gnome.mo +share/locale/fi/LC_MESSAGES/xchat-gnome.mo +share/locale/fr/LC_MESSAGES/xchat-gnome.mo +share/locale/it/LC_MESSAGES/xchat-gnome.mo +share/locale/ja/LC_MESSAGES/xchat-gnome.mo +share/locale/ko/LC_MESSAGES/xchat-gnome.mo +share/locale/lt/LC_MESSAGES/xchat-gnome.mo +share/locale/lv/LC_MESSAGES/xchat-gnome.mo +share/locale/mk/LC_MESSAGES/xchat-gnome.mo +share/locale/ms/LC_MESSAGES/xchat-gnome.mo +share/locale/nl/LC_MESSAGES/xchat-gnome.mo +share/locale/no/LC_MESSAGES/xchat-gnome.mo +share/locale/pt/LC_MESSAGES/xchat-gnome.mo +share/locale/ru/LC_MESSAGES/xchat-gnome.mo +share/locale/sk/LC_MESSAGES/xchat-gnome.mo +share/locale/sl/LC_MESSAGES/xchat-gnome.mo +share/locale/sr/LC_MESSAGES/xchat-gnome.mo +share/locale/sv/LC_MESSAGES/xchat-gnome.mo +share/locale/uk/LC_MESSAGES/xchat-gnome.mo +share/locale/wa/LC_MESSAGES/xchat-gnome.mo +share/locale/zh_CN/LC_MESSAGES/xchat-gnome.mo @exec mkdir -p %D/lib/xchat/plugins @dirrm share/gnome/xchat @dirrm lib/xchat/plugins