From 10f012badf61eb49258799a02322f2e08c8334bd Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jun 15 2008 12:52:14 +0000 Subject: - update to 2.8.6 - drop upstream patches (already applied in 2.8.6) - set default charset to UTF-8 (2.8.6 changed it to Latin1) --- diff --git a/.cvsignore b/.cvsignore index 01fb2f4..b916783 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xchat-2.8.4.tar.bz2 +xchat-2.8.6.tar.bz2 diff --git a/sources b/sources index 79c3a17..1bcf67b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66d60febc62a01bafac9bb3a35fb37ae xchat-2.8.4.tar.bz2 +1f2670865d43a23a9abc596dde999aca xchat-2.8.6.tar.bz2 diff --git a/xc284-fix-scrollbfdleak.diff b/xc284-fix-scrollbfdleak.diff deleted file mode 100644 index a5dbf2a..0000000 --- a/xc284-fix-scrollbfdleak.diff +++ /dev/null @@ -1,14 +0,0 @@ -# -# Scrollback shrinking code forgets to close(). -# ---- xchat-2.8.4/src/common/text.c 2007-06-13 19:59:56.000000000 +1000 -+++ xchat-2.8.4p1/src/common/text.c 2007-11-02 23:52:57.000000000 +1100 -@@ -141,6 +146,7 @@ - } - - *len = st.st_size; -+ close (fh); - return buf; - } - - diff --git a/xc284-improvescrollback.diff b/xc284-improvescrollback.diff deleted file mode 100644 index 4bada74..0000000 --- a/xc284-improvescrollback.diff +++ /dev/null @@ -1,28 +0,0 @@ -# -# 1) Stops scrollback files growing too large by fixing the file-shrink code. -# 2) Puts a "Display scrollback from previous session" into the Setup GUI -# (logging section) so people can turn this off without typing commands. -# ---- xchat-2.8.4/src/common/text.c 29 Jul 2007 05:02:36 -0000 1.90 -+++ xchat-2.8.4p1/src/common/text.c 26 Sep 2007 07:29:55 -0000 -@@ -285,6 +285,8 @@ - } - } - -+ sess->scrollwritten = lines; -+ - if (lines) - { - text = ctime (&stamp); ---- xchat-2.8.4/src/fe-gtk/setup.c 9 Sep 2007 04:57:07 -0000 1.100 -+++ xchat-2.8.4p1/src/fe-gtk/setup.c 26 Sep 2007 07:29:57 -0000 -@@ -382,7 +382,8 @@ - static const setting logging_settings[] = - { - {ST_HEADER, N_("Logging"),0,0,0}, -- {ST_TOGGLE, N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2}, -+ {ST_TOGGLE, N_("Display scrollback from previous session"), P_OFFINTNL(text_replay), 0, 0, 0}, -+ {ST_TOGGLE, N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2}, - {ST_ENTRY, N_("Log filename:"), P_OFFSETNL(logmask), 0, 0, sizeof prefs.logmask}, - {ST_LABEL, N_("%s=Server %c=Channel %n=Network.")}, - diff --git a/xc284-scrollbmkdir.diff b/xc284-scrollbmkdir.diff deleted file mode 100644 index e2caa28..0000000 --- a/xc284-scrollbmkdir.diff +++ /dev/null @@ -1,33 +0,0 @@ -# -# Fix creation of ~/.xchat2/scrollback/ paths. -# ---- xchat-2.8.4/src/common/text.c 15 Jun 2007 03:53:42 -0000 1.89 -+++ xchat-2.8.4p1/src/common/text.c 8 Jul 2007 08:59:02 -0000 -@@ -49,20 +49,25 @@ - - - static void mkdir_p (char *dir); -+static char *log_create_filename (char *channame); - - - static char * - scrollback_get_filename (session *sess, char *buf, int max) - { -- char *net; -+ char *net, *chan; - - net = server_get_network (sess->server, FALSE); - if (!net) - return NULL; - -- snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, sess->channel); -+ snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, ""); - mkdir_p (buf); - -+ chan = log_create_filename (sess->channel); -+ snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, chan); -+ free (chan); -+ - return buf; - } - diff --git a/xchat-2.8.6-default-utf8.patch b/xchat-2.8.6-default-utf8.patch new file mode 100644 index 0000000..358a438 --- /dev/null +++ b/xchat-2.8.6-default-utf8.patch @@ -0,0 +1,24 @@ +diff -ur xchat-2.8.6/src/common/servlist.c xchat-2.8.6-default-utf8/src/common/servlist.c +--- xchat-2.8.6/src/common/servlist.c 2008-04-01 10:22:34.000000000 +0200 ++++ xchat-2.8.6-default-utf8/src/common/servlist.c 2008-06-15 14:43:35.000000000 +0200 +@@ -892,7 +892,7 @@ + if (def[i].network) + { + net = servlist_net_add (def[i].network, def[i].host, FALSE); +- net->encoding = strdup ("IRC (Latin/Unicode Hybrid)"); ++ net->encoding = strdup ("UTF-8 (Unicode)"); + if (def[i].channel) + net->autojoin = strdup (def[i].channel); + if (def[i].charset) +diff -ur xchat-2.8.6/src/fe-gtk/servlistgui.c xchat-2.8.6-default-utf8/src/fe-gtk/servlistgui.c +--- xchat-2.8.6/src/fe-gtk/servlistgui.c 2008-06-08 10:04:48.000000000 +0200 ++++ xchat-2.8.6-default-utf8/src/fe-gtk/servlistgui.c 2008-06-15 14:36:03.000000000 +0200 +@@ -267,7 +267,7 @@ + ircnet *net; + + net = servlist_net_add (_("New Network"), "", TRUE); +- net->encoding = strdup ("IRC (Latin/Unicode Hybrid)"); ++ net->encoding = strdup ("UTF-8 (Unicode)"); + servlist_server_add (net, "newserver/6667"); + + store = (GtkListStore *)gtk_tree_view_get_model (treeview); diff --git a/xchat.spec b/xchat.spec index d72b0a3..6c9559e 100644 --- a/xchat.spec +++ b/xchat.spec @@ -2,8 +2,8 @@ Summary: A popular and easy to use graphical IRC (chat) client Name: xchat -Version: 2.8.4 -Release: 16%{?dist} +Version: 2.8.6 +Release: 1%{?dist} Epoch: 1 Group: Applications/Internet License: GPLv2+ @@ -12,14 +12,6 @@ Source: http://www.xchat.org/files/source/2.8/xchat-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Patches 0-9 reserved for official xchat.org patches -# Fix creation of ~/.xchat2/scrollback/ paths. -Patch0: xc284-scrollbmkdir.diff -# 1) Stops scrollback files growing too large by fixing the file-shrink code. -# 2) Puts a "Display scrollback from previous session" into the Setup GUI -# (logging section) so people can turn this off without typing commands. -Patch1: xc284-improvescrollback.diff -# Scrollback shrinking code forgets to close(). -Patch2: xc284-fix-scrollbfdleak.diff Patch10: xchat-2.8.4-redhat-desktop.patch Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch @@ -27,6 +19,12 @@ Patch19: xchat-2.0.2-freenode.patch # see #241923 Patch35: xchat-2.8.4-disable-tray-icon-by-default.patch Patch40: xchat-2.8.4-shm-pixmaps.patch +# Upstream XChat 2.8.6 defaults to Latin1 (what upstream calls the "IRC" +# encoding). Default to UTF-8 instead (as previous versions did, at least when +# running under a UTF-8 locale). +# Both the "IRC" and "UTF-8" settings will try to accept both Latin1 and UTF-8 +# when it comes in, however "IRC" sends Latin1, "UTF-8" sends UTF-8. +Patch41: xchat-2.8.6-default-utf8.patch BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel BuildRequires: GConf2-devel @@ -66,15 +64,13 @@ This package contains the X-Chat plugin providing the Tcl scripting interface. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %patch10 -p1 -b .desktop-file %patch12 -p0 -b .use-sysconf-to-detect-cpus %patch19 -p0 -b .freenode %patch35 -p1 -b .tray-icon %patch40 -p1 -b .shm-pixmaps +%patch41 -p1 -b .default-utf8 %build # Remove CVS files from source dirs so they're not installed into doc dirs. @@ -162,6 +158,11 @@ fi %{_libdir}/xchat/plugins/tcl.so %changelog +* Sun Jun 15 2008 Kevin Kofler - 1:2.8.6-1 +- update to 2.8.6 +- drop upstream patches (already applied in 2.8.6) +- set default charset to UTF-8 (2.8.6 changed it to Latin1) + * Thu May 22 2008 Kevin Kofler - 1:2.8.4-16 - fix more bugs in xchat-2.8.4-shm-pixmaps.patch (#282691)