rpms/slang/FC-4 slang-refresh.patch, NONE, 1.1 slang-utf8-acs.patch, 1.2, 1.3 slang.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: praszyk

Update of /cvs/dist/rpms/slang/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23396

Modified Files:
	slang-utf8-acs.patch slang.spec 
Added Files:
	slang-refresh.patch 
Log Message:
One line in the patch 'slang-utf8-acs.ptach' commented out (#138445) and
Patch to resolve the problem with displaying the 'x' character
in the latin2 mode (#139127)


slang-refresh.patch:
 sldisply.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

--- NEW FILE slang-refresh.patch ---
--- slang-1.4.9.utf8/src/sldisply.c
+++ slang-1.4.9.utf8/src/sldisply.c
@@ -1432,7 +1432,11 @@
 #else
 #define COLOR_OF(x) (((x)&COLOR_MASK)>>8)
 #endif
+#ifdef UTF8
+# define CHAR_OF(x) ((x)&0x80FFFFFF)
+#else
 #define CHAR_OF(x) ((x)&0x80FF)
+#endif
 
 #if SLTT_HAS_NON_BCE_SUPPORT
 #ifdef UTF8
@@ -1471,14 +1475,8 @@
     :  (Ansi_Color_Map[COLOR_OF(a)].mono == Ansi_Color_Map[COLOR_OF(b)].mono))
 #endif
 
-#ifdef UTF8
-#define CHAR_EQS(a, b) ((a) == (b)\
-			|| (SLSMG_EXTRACT_CHAR(a) == SLSMG_EXTRACT_CHAR(b)\
-			    && COLOR_EQS((a), (b))))
-#else
 #define CHAR_EQS(a, b) (((a) == (b))\
 			|| ((CHAR_OF(a)==CHAR_OF(b)) && COLOR_EQS(a,b)))
-#endif
 
 /* The whole point of this routine is to prevent writing to the last column
  * and last row on terminals with automatic margins.

slang-utf8-acs.patch:
 slang.h    |  101 +++++++++++++++++++++++++++++++++++++++++++++++--------------
 slcurses.c |   75 +++++++++++++++++++++++++++++----------------
 slcurses.h |   25 +++++++--------
 slsmg.c    |   50 ++++++++++++++++++++++--------
 4 files changed, 178 insertions(+), 73 deletions(-)

Index: slang-utf8-acs.patch
===================================================================
RCS file: /cvs/dist/rpms/slang/FC-4/slang-utf8-acs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slang-utf8-acs.patch	9 Sep 2004 12:29:11 -0000	1.2
+++ slang-utf8-acs.patch	5 Sep 2005 13:07:18 -0000	1.3
@@ -389,7 +389,7 @@
  
 -   SLsmg_write_nchars ((char *) hbuf, n % 16);
 -   while (count-- > 0)
-+   SLsmg_draw_object(This_Row, This_Col, ch);
++   /* SLsmg_draw_object(This_Row, This_Col, ch); (Bugzilla Bug 138445) */
 +   while (n-- > 0)
       {
 -	SLsmg_write_nchars ((char *) hbuf, 16);


Index: slang.spec
===================================================================
RCS file: /cvs/dist/rpms/slang/FC-4/slang.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- slang.spec	18 Mar 2005 07:16:02 -0000	1.22
+++ slang.spec	5 Sep 2005 13:07:18 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The shared library for the S-Lang extension language.
 Name: slang
 Version: 1.4.9
-Release: 17
+Release: 19
 License: GPL
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v1.4/slang-%{version}.tar.bz2
@@ -11,6 +11,7 @@
 Patch3: slang-1.4.5-utf8-segv.patch
 Patch4: slang-utf8-fix.patch
 Patch5: slang-1.4.9-gcc4.patch
+Patch6: slang-refresh.patch
 Url: http://www.s-lang.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libtool, libtermcap-devel
@@ -46,6 +47,7 @@
 %patch3 -p1 -b .segv
 %patch4 -p1 -b .utf8-fix
 %patch5 -p1 -b .gcc4
+%patch6 -p1 -b .refresh
 
 cp %{SOURCE2} .
 
@@ -88,6 +90,11 @@
 %{_includedir}/slang
 
 %changelog
+* Mon Sep  5 2005 Petr Raszyk <praszyk at redhat.com> - 1.4.9-19
+- One line in the patch 'slang-utf8-acs.ptach' commented out (#138445).
+- Patch (slang-refresh.patcht) to resolve the problem with displaying 
+  the 'x' character in the latin2 mode (#139127)
+
 * Fri Mar 18 2005 Petr Rockai <prockai at redhat.com> - 1.4.9-17
 - Patch to compile with gcc4 by Robert Scheck (#151029). (Weeird,
   probably on march 2nd the used buildroot wasn't updated with