[68959] trunk/dports/irc/xchat2
snc at macports.org
snc at macports.org
Fri Jun 18 13:00:34 PDT 2010
Revision: 68959
http://trac.macports.org/changeset/68959
Author: snc at macports.org
Date: 2010-06-18 13:00:31 -0700 (Fri, 18 Jun 2010)
Log Message:
-----------
update version, #25238. maintainer timeout
Modified Paths:
--------------
trunk/dports/irc/xchat2/Portfile
trunk/dports/irc/xchat2/files/patch-gtk2.19.7.diff
Removed Paths:
-------------
trunk/dports/irc/xchat2/files/patch-xtext.h
Modified: trunk/dports/irc/xchat2/Portfile
===================================================================
--- trunk/dports/irc/xchat2/Portfile 2010-06-18 19:42:55 UTC (rev 68958)
+++ trunk/dports/irc/xchat2/Portfile 2010-06-18 20:00:31 UTC (rev 68959)
@@ -4,8 +4,7 @@
PortSystem 1.0
name xchat2
-version 2.8.6
-revision 3
+version 2.8.8
set branch [join [lrange [split ${version} .] 0 1] .]
categories irc
maintainers afb openmaintainer
@@ -22,14 +21,13 @@
distname xchat-${version}
-patchfiles xc286-smallfixes.diff patch-xtext.h patch-gtk2.19.7.diff
+patchfiles patch-gtk2.19.7.diff
-checksums xchat-${version}.tar.bz2 md5 1f2670865d43a23a9abc596dde999aca \
- xchat-${version}.tar.bz2 sha1 7a7463e65cb26c680ed70dd96cec98bcc05435a4 \
- xchat-${version}.tar.bz2 rmd160 bc199e3b58a9db3dfd9f2af6bac7fb6162c53d6e \
- xc286-smallfixes.diff md5 eb68b6261bf6740cb5f223627eb8f384 \
- xc286-smallfixes.diff sha1 b13eb421f6d72fca195b398c606d9413aec57fc4 \
- xc286-smallfixes.diff rmd160 91c654320b7b1f9d6b13f7b226fb4cec26054319
+checksums xchat-${version}.tar.bz2 \
+ md5 6775c44f38e84d06c06c336b32c4a452 \
+ sha1 a4ac161e4e40f4bbabc492675a1ff4380dba8d68 \
+ rmd160 1bc3e0ff00e15c83588dd21a3ef3e8e34f953331 \
+ sha256 0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0
use_bzip2 yes
@@ -41,7 +39,7 @@
configure.args --disable-python --disable-mmx --enable-ipv6
-variant xft { configure.args-append --enable-xft }
+variant xft conflicts quartz { configure.args-append --enable-xft }
variant ssl { configure.args-append --enable-openssl }
variant quartz conflicts xft { configure.args-append --disable-xlib }
Modified: trunk/dports/irc/xchat2/files/patch-gtk2.19.7.diff
===================================================================
--- trunk/dports/irc/xchat2/files/patch-gtk2.19.7.diff 2010-06-18 19:42:55 UTC (rev 68958)
+++ trunk/dports/irc/xchat2/files/patch-gtk2.19.7.diff 2010-06-18 20:00:31 UTC (rev 68959)
@@ -1,54 +1,8 @@
# http://sourceforge.net/tracker/?func=detail&aid=2974436&group_id=239&atid=100239
-Index: xchat-2.8.6/src/fe-gtk/dccgui.c
+Index: xchat-2.8.8/src/fe-gtk/maingui.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;
@@ -61,31 +15,3 @@
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);
-
-
Deleted: trunk/dports/irc/xchat2/files/patch-xtext.h
===================================================================
--- trunk/dports/irc/xchat2/files/patch-xtext.h 2010-06-18 19:42:55 UTC (rev 68958)
+++ trunk/dports/irc/xchat2/files/patch-xtext.h 2010-06-18 20:00:31 UTC (rev 68959)
@@ -1,12 +0,0 @@
-# http://bugs.gentoo.org/show_bug.cgi?id=234458
-# http://bugs.gentoo.org/attachment.cgi?id=164726
---- xchat-2.8.6/src/fe-gtk/xtext.h.orig 2008-02-24 05:48:02.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/xtext.h 2008-09-06 02:18:39.000000000 +0200
-@@ -270,6 +270,6 @@
- xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext);
- void gtk_xtext_buffer_free (xtext_buffer *buf);
- void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
--GtkType gtk_xtext_get_type (void);
-+GType gtk_xtext_get_type (void);
-
- #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100618/729c3ec3/attachment.html>
More information about the macports-changes
mailing list