Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12556/net
Modified Files:
wireshark.info xchat.info xchat.patch
Log Message:
Moving latest xchat & wireshark to stable
Index: xchat.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/xchat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xchat.patch 14 Jan 2010 22:30:54 -0000 1.4
+++ xchat.patch 22 Oct 2010 23:14:35 -0000 1.5
@@ -10,82 +10,3 @@
PY_CFLAGS="-I$PY_INC"
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
-#
-# Various small fixes from CVS that are considered safe to apply to 2.8.6.
-#
---- xchat-2.8.6/src/common/cfgfiles.c 2008-02-05 21:02:47.000000000 +1100
-+++ xchat-2.8.6p1/src/common/cfgfiles.c 2008-06-15 13:45:43.000000000
+1000
-@@ -886,7 +886,6 @@
- set_showval (session *sess, const struct prefs *var, char *tbuf)
- {
- int len, dots, j;
-- static const char *offon[] = { "OFF", "ON" };
-
- len = strlen (var->name);
- memcpy (tbuf, var->name, len);
-@@ -909,8 +908,10 @@
- *((int *) &prefs + var->offset));
- break;
- case TYPE_BOOL:
-- sprintf (tbuf + len, "\0033:\017 %s\n", offon[
-- *((int *) &prefs + var->offset)]);
-+ if (*((int *) &prefs + var->offset))
-+ sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
-+ else
-+ sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
- break;
- }
- PrintText (sess, tbuf);
---- xchat-2.8.6/src/common/chanopt.c 2008-06-10 22:00:55.000000000 +1000
-+++ xchat-2.8.6p1/src/common/chanopt.c 2008-06-15 13:48:04.000000000 +1000
-@@ -32,7 +32,7 @@
-
- #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
-
--channel_options chanopt[] =
-+static const channel_options chanopt[] =
- {
- {"alert_beep", "BEEP", S_F(alert_beep)},
- {"alert_taskbar", NULL, S_F(alert_taskbar)},
---- xchat-2.8.6/src/common/servlist.c 2008-04-01 19:22:34.000000000 +1100
-+++ xchat-2.8.6p1/src/common/servlist.c 2008-06-15 13:57:41.000000000
+1000
-@@ -509,6 +509,8 @@
- list = g_slist_nth (net->servlist, net->selected);
- if (!list)
- list = net->servlist;
-+ if (!list)
-+ return;
- ircserv = list->data;
-
- /* incase a protocol switch is added to the servlist gui */
---- xchat-2.8.6/src/common/text.c 2008-03-28 13:20:04.000000000 +1100
-+++ xchat-2.8.6p1/src/common/text.c 2008-06-15 13:59:59.000000000 +1000
-@@ -216,7 +216,7 @@
- static void
- scrollback_save (session *sess, char *text)
- {
-- char buf[1024];
-+ char buf[512 * 4];
- time_t stamp;
- int len;
-
-@@ -266,7 +266,7 @@
- scrollback_load (session *sess)
- {
- int fh;
-- char buf[1024];
-+ char buf[512 * 4];
- char *text;
- time_t stamp;
- int lines;
---- 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
-
\ No newline at end of file
Index: wireshark.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/wireshark.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wireshark.info 1 Feb 2010 18:56:33 -0000 1.7
+++ wireshark.info 22 Oct 2010 23:14:35 -0000 1.8
@@ -15,11 +15,10 @@
# maintainership of) the affected package.
Package: wireshark
-Version: 1.2.6
+Version: 1.4.1
Revision: 1
Maintainer: Max Horn <[email protected]>
BuildDepends: <<
- libpng3,
cairo (>= 1.6-1),
expat1,
fink (>= 0.28),
@@ -27,7 +26,7 @@
freetype219 (>= 2.3.5-1),
glitz,
pkgconfig (>= 0.21-1),
- libpcap,
+ libpcap1,
libcares2,
lua51-dev,
portaudio,
@@ -37,7 +36,7 @@
pango1-xft2-ft219-dev (>= 1.18.4-4),
pixman (>= 0.10.0-1),
gtk+2-dev (>= 2.12.0-1),
- libgettext3-dev,
+ libgettext8-dev,
gettext-bin,
gettext-tools,
libiconv-dev,
@@ -45,7 +44,7 @@
xft2-dev
<<
Depends: <<
- libpcap-shlibs,
+ libpcap1-shlibs,
libcares2-shlibs,
lua51-shlibs,
portaudio-shlibs,
@@ -53,12 +52,12 @@
gtk+2 (>= 2.12.0-1),
glib2-shlibs (>= 2.14.0-1),
pango1-xft2-ft219 (>= 1.18.4-4),
- libgettext3-shlibs
+ libgettext8-shlibs
<<
-Conflicts: wireshark-ssl, ethereal (<< 1.0-1), ethereal-ssl (<< 1.0-1)
-Replaces: wireshark-ssl, ethereal (<< 1.0-1), ethereal-ssl (<< 1.0-1)
+Conflicts: wireshark, wireshark-ssl, ethereal (<< 1.0-1), ethereal-ssl (<<
1.0-1)
+Replaces: wireshark, wireshark-ssl, ethereal (<< 1.0-1), ethereal-ssl (<<
1.0-1)
Source: mirror:sourceforge:wireshark/wireshark-%v.tar.bz2
-Source-MD5: f3e0917ed393366bbf96c53b58cb0931
+Source-MD5: 1719d20a10990e7c2cb261df7021aab6
ConfigureParams: <<
--mandir=%p/share/man \
--with-lua=%p \
Index: xchat.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/xchat.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- xchat.info 23 Jan 2010 23:23:49 -0000 1.13
+++ xchat.info 22 Oct 2010 23:14:35 -0000 1.14
@@ -15,13 +15,12 @@
# maintainership of) the affected package.
Package: xchat
-Version: 2.8.6
-Revision: 1
+Version: 2.8.8
+Revision: 2
Maintainer: Max Horn <[email protected]>
BuildDepends: <<
system-openssl-dev,
cairo (>= 1.6-1),
- libpng3,
expat1,
glitz,
fontconfig2-dev (>= 2.4.1-1),
@@ -41,8 +40,7 @@
dbus-dev (>= 1.0-1),
tcltk,
tcltk-dev,
- libgettext3-dev,
- gettext-bin,
+ libgettext8-dev,
gettext-tools,
libiconv-dev,
fink (>= 0.24.12-1)
@@ -54,17 +52,16 @@
dbus (>= 1.0-1),
tcltk-shlibs,
python25,
- libgettext3-shlibs
+ libgettext8-shlibs
<<
Conflicts: xchat-ssl (<< 2.6.8-1022)
Replaces: xchat-ssl (<< 2.6.8-1022)
Source: http://xchat.org/files/source/2.8/xchat-%v.tar.bz2
-Source-MD5: 1f2670865d43a23a9abc596dde999aca
+Source-MD5: 6775c44f38e84d06c06c336b32c4a452
PatchFile: %n.patch
-PatchFile-MD5: c537af7cb886a09ebc48b070fe9cb2f1
+PatchFile-MD5: 731c5e62819224c4627b9fea2905ab15
ConfigureParams: <<
--enable-openssl \
- --enable-hebrew \
--enable-tcl=%p/lib \
--enable-ipv6 \
--enable-spell=gtkspell \
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
