packages: libreoffice/libreoffice.spec, libreoffice/libreoffice-libexttextc...

[arekm]

Author: arekm                        Date: Mon May 28 21:00:32 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fix from upstream for new libexttextcat

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.945 -> 1.946) , libreoffice-libexttextcat.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.945 packages/libreoffice/libreoffice.spec:1.946
--- packages/libreoffice/libreoffice.spec:1.945	Sun May 27 17:23:07 2012
+++ packages/libreoffice/libreoffice.spec	Mon May 28 23:00:26 2012
@@ -50,7 +50,7 @@
 Summary(pl.UTF-8):	LibreOffice - potężny pakiet biurowy
 Name:		libreoffice
 Version:	%{major_ver}.2
-Release:	3
+Release:	4
 License:	GPL/LGPL
 Group:		X11/Applications
 # we use git because released tarballs are buggy too often
@@ -88,6 +88,7 @@
 # Source30-md5:	17410483b5b5f267aa18b7e00b65e6e0
 Patch0:		%{name}-hamcrest.patch
 Patch1:		%{name}-poppler.patch
+Patch2:		%{name}-libexttextcat.patch
 URL:		http://www.documentfoundation.org/
 BuildRequires:	/usr/bin/getopt
 BuildRequires:	GConf2-devel
@@ -2429,6 +2430,7 @@
 
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 for dir in *-%{version}; do
 	[ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
@@ -4099,6 +4101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.946  2012/05/28 21:00:26  arekm
+- rel 4; fix from upstream for new libexttextcat
+
 Revision 1.945  2012/05/27 15:23:07  arekm
 - rel 3; poppler build fix
 

================================================================
Index: packages/libreoffice/libreoffice-libexttextcat.patch
diff -u /dev/null packages/libreoffice/libreoffice-libexttextcat.patch:1.1
--- /dev/null	Mon May 28 23:00:32 2012
+++ packages/libreoffice/libreoffice-libexttextcat.patch	Mon May 28 23:00:26 2012
@@ -0,0 +1,12 @@
+--- libreoffice-core-3.5.3.2/lingucomponent/source/languageguessing/simpleguesser.cxx~	2012-04-24 16:08:03.000000000 +0200
++++ libreoffice-core-3.5.3.2/lingucomponent/source/languageguessing/simpleguesser.cxx	2012-05-28 21:39:22.945899024 +0200
+@@ -117,8 +117,7 @@
+     if (!h)
+         return guesses;
+ 
+-    //calculate le number of unicode charcters (symbols)
+-    int len = utfstrlen(text);
++    int len = strlen(text);
+ 
+     if (len > MAX_STRING_LENGTH_TO_ANALYSE)
+         len = MAX_STRING_LENGTH_TO_ANALYSE;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/libreoffice/libreoffice.spec?r1=1.945&r2=1.946