rpms/xchat/devel xchat-2.8.6-default-utf8.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 sources, 1.24, 1.25 xchat.spec, 1.91, 1.92 xc284-fix-scrollbfdleak.diff, 1.1, NONE xc284-improvescrollback.diff, 1.1, NONE xc284-scrollbmkdir.diff, 1.1, NONE

Sun Jun 15 12:53:06 UTC 2008

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8097/devel

Modified Files:
	.cvsignore sources xchat.spec 
Added Files:
	xchat-2.8.6-default-utf8.patch 
Removed Files:
	xc284-fix-scrollbfdleak.diff xc284-improvescrollback.diff 
	xc284-scrollbmkdir.diff 
Log Message:
* Sun Jun 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 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)

xchat-2.8.6-default-utf8.patch:

--- NEW FILE xchat-2.8.6-default-utf8.patch ---
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);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	4 Jul 2007 10:17:05 -0000	1.25
+++ .cvsignore	15 Jun 2008 12:52:14 -0000	1.26
@@ -1 +1 @@
-xchat-2.8.4.tar.bz2
+xchat-2.8.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	4 Jul 2007 10:17:05 -0000	1.24
+++ sources	15 Jun 2008 12:52:14 -0000	1.25
@@ -1 +1 @@
-66d60febc62a01bafac9bb3a35fb37ae  xchat-2.8.4.tar.bz2
+1f2670865d43a23a9abc596dde999aca  xchat-2.8.6.tar.bz2


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- xchat.spec	22 May 2008 23:00:20 -0000	1.91
+++ xchat.spec	15 Jun 2008 12:52:14 -0000	1.92
@@ -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 @@
 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 @@
 # 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 @@
 
 %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 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Sun Jun 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 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 <Kevin at tigcc.ticalc.org> - 1:2.8.4-16
 - fix more bugs in xchat-2.8.4-shm-pixmaps.patch (#282691)
 


--- xc284-fix-scrollbfdleak.diff DELETED ---


--- xc284-improvescrollback.diff DELETED ---


--- xc284-scrollbmkdir.diff DELETED ---


