rpms/pan/FC-4 pan-0.14.2.91-linewrap.patch, NONE, 1.1 pan.spec, 1.3, 1.4

[Michael A. Peters (mpeters)]

Author: mpeters

Update of /cvs/extras/rpms/pan/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893/FC-4

Modified Files:
	pan.spec 
Added Files:
	pan-0.14.2.91-linewrap.patch 
Log Message:
auto-import pan-0.14.2.91-3.1 on branch FC-4 from pan-0.14.2.91-3.1.src.rpm

pan-0.14.2.91-linewrap.patch:

--- NEW FILE pan-0.14.2.91-linewrap.patch ---
--- patch-text-massager.c::wrap begins here ---
--- pan/base/text-massager.c.orig	Mon Jan 26 00:51:26 2004
+++ pan/base/text-massager.c	Mon Jan 26 00:55:48 2004
@@ -250,23 +250,29 @@
 	char * pch;
 	char * line_start;
 	char * end;
+	int    pos;
 
 	/* walk through the entire string */
 	linefeed_here = NULL;
-	for (line_start=pch=str->str, end=line_start+str->len; pch!=end; )
+	for (pos = 0, line_start=pch=str->str, end=line_start+str->len; pch<end; )
 	{
 		/* a linefeed could go here; remember this space */
-		if (isspace((guchar)*pch) || *pch=='\n')
+		if (g_unichar_isspace(g_utf8_get_char (pch)) || *pch=='\n')
 			linefeed_here = pch;
 
 		/* line's too long; add a linefeed if we can */
-		if (pch-line_start>=column && linefeed_here!=NULL)
+		if (pos>=column && linefeed_here!=NULL)
 		{
 			*linefeed_here = '\n';
 			pch = line_start = linefeed_here + 1;
 			linefeed_here = NULL;
+			pos = 0;
+		}
+		else 
+		{
+			pch = g_utf8_next_char (pch);
+			++ pos;
 		}
-		else ++pch;
 	}
 }
 
--- patch-text-massager.c::wrap ends here ---


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-4/pan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pan.spec	22 Jun 2005 05:18:14 -0000	1.3
+++ pan.spec	11 Sep 2005 11:34:19 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
 Version: 0.14.2.91
-Release: 2.1%{?dist}
+Release: 3.1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
@@ -15,6 +15,7 @@
 #Patch9: pan-0.14.2-gmime-crash-120007.patch
 #Patch10: pan-desktop-rh-119909.patch
 Patch11: pan-0.14.2.91-gcc4-2.patch
+Patch12: pan-0.14.2.91-linewrap.patch
 URL: http://pan.rebelbase.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel >= 2.4.22
@@ -46,6 +47,8 @@
 # add rh defs to upstream desktop file
 #%patch10 -p1 -b .rh
 %patch11 -p1 -b .gcc4
+%patch12 -p0 -b .linewrap
+
 echo "StartupNotify=true" >> pan.desktop.in
 
 
@@ -80,6 +83,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Sun Sep 11 2005 Michael A. Peters <mpeters at mac.com> - 1:0.14.2.91-3.1
+- added patch12 to fix bug 165626
+
 * Tue Jun 21 2005 Michael A. Peters <mpeters at mac.com> - 1:0.14.2.91-2.1
 - added gettext BuildRequires