packages: sap/sap-utf8.patch, sap/sap.spec - rel 7; fix segfault on 64bit

[arekm]

Author: arekm                        Date: Wed Sep 16 19:32:07 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7; fix segfault on 64bit

---- Files affected:
packages/sap:
   sap-utf8.patch (1.1 -> 1.2) , sap.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/sap/sap-utf8.patch
diff -u packages/sap/sap-utf8.patch:1.1 packages/sap/sap-utf8.patch:1.2
--- packages/sap/sap-utf8.patch:1.1	Wed Sep 12 18:29:39 2007
+++ packages/sap/sap-utf8.patch	Wed Sep 16 21:32:02 2009
@@ -24,8 +24,8 @@
 +            char utf8_chars[8192*8];
 +            char *koniec=utf8_chars;
 +            char *buf=my_tempy1;
-+            int length=strlen(my_tempy1);
-+            int length_utf8=8192*8;
++            size_t length=strlen(my_tempy1);
++            size_t length_utf8=8192*8;
 +            iconv_t cd=iconv_open("UTF-8", "ISO-8859-2");
 +
 +            iconv(cd, &buf, &length, &koniec, &length_utf8);
@@ -46,8 +46,8 @@
 +    char buf[32];
 +    char *pbuf=buf;
 +    char *old_buf=slowo;
-+    int length_utf8=strlen(slowo);
-+    int length=32;
++    size_t length_utf8=strlen(slowo);
++    size_t length=32;
 +    iconv_t cd=iconv_open("ISO-8859-2", "UTF-8");
 +
 +    iconv(cd, &old_buf, &length_utf8, &pbuf, &length);

================================================================
Index: packages/sap/sap.spec
diff -u packages/sap/sap.spec:1.27 packages/sap/sap.spec:1.28
--- packages/sap/sap.spec:1.27	Wed Sep 12 18:29:48 2007
+++ packages/sap/sap.spec	Wed Sep 16 21:32:02 2009
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Słownik polsko-angielski i angielsko-polski
 Name:		sap
 Version:	0.2
-Release:	6
+Release:	7
 License:	GPL
 Vendor:		Bohdan R. Rau <ethanak at bigfoot.com>
 Group:		Applications/Dictionaries
@@ -29,7 +29,7 @@
 
 %build
 cd src
-%{__cc} %{rpmcflags} -o sap alt_unistd.c charfilter.c sap.c \
+%{__cc} %{rpmcppflags} %{rpmcflags} %{rpmldflags} -o sap alt_unistd.c charfilter.c sap.c \
 	-DDICTIONARIES_DIRECTORY=\"%{_datadir}/%{name}/\" \
 	-DGLOBAL_SAPRC_FULLPATH=\"%{_sysconfdir}/saprc\" \
 %ifarch ppc ppc64 sparc sparc64 sparcv9 s390 s390x
@@ -60,6 +60,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2009/09/16 19:32:02  arekm
+- rel 7; fix segfault on 64bit
+
 Revision 1.27  2007/09/12 16:29:48  witekfl
 - added the utf8.patch
 - Rel 6
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sap/sap-utf8.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sap/sap.spec?r1=1.27&r2=1.28&f=u