Accepting request 234328 from home:timar:branches:LibreOffice:Factory

build fix on openSUSE 12.3

OBS-URL: https://build.opensuse.org/request/show/234328
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=152

0001-std-strlen-requires-cstring-include-to-build.patch

@@ -0,0 +1,44 @@
+From f12631e960a2b4123c96e96d2af7d43741d8e6a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@collabora.com>
+Date: Wed, 12 Mar 2014 13:44:29 +0100
+Subject: [PATCH] std::strlen requires cstring include to build
+
+Or, even simpler, don't bother with the needless namespacing.
+
+Change-Id: I4bbb115c1c2c89881a0bf88ccd54b0f5cb8b3518
+(cherry picked from commit da9bd301c6f62e829daadb2af6a6b9633d4f1cb9)
+Signed-off-by: Andras Timar <andras.timar@collabora.com>
+---
+ sc/source/filter/excel/xestream.cxx | 2 +-
+ sc/source/filter/qpro/qpro.cxx      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
+index 035a827..df08d2c 100644
+--- a/sc/source/filter/excel/xestream.cxx
++++ b/sc/source/filter/excel/xestream.cxx
+@@ -985,7 +985,7 @@ sax_fastparser::FSHelperPtr& XclExpXmlStream::WriteAttributesInternal( sal_Int32
+             rStream->write( " " )
+                 ->writeId( nAttribute )
+                 ->write( "=\"" )
+-                ->writeEscaped( OUString(pValue, std::strlen(pValue), RTL_TEXTENCODING_UTF8) )
++                ->writeEscaped( OUString(pValue, strlen(pValue), RTL_TEXTENCODING_UTF8) )
+                 ->write( "\"" );
+         }
+ 
+diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
+index c370492..793412a 100644
+--- a/sc/source/filter/qpro/qpro.cxx
++++ b/sc/source/filter/qpro/qpro.cxx
+@@ -229,7 +229,7 @@ void ScQProReader::readString( OUString &rString, sal_uInt16 nLength )
+     sal_Char* pText = new sal_Char[ nLength + 1 ];
+     mpStream->Read( pText, nLength );
+     pText[ nLength ] = 0;
+-    rString = OUString( pText, std::strlen(pText), mpStream->GetStreamCharSet() );
++    rString = OUString( pText, strlen(pText), mpStream->GetStreamCharSet() );
+     delete [] pText;
+ }
+ 
+-- 
+1.8.4.5
+

libreoffice.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 16 10:20:00 UTC 2014 - timar@fsf.hu
+
+- fix build on openSUSE 12.3
+
 -------------------------------------------------------------------
 Tue May  6 19:58:50 UTC 2014 - tchvatal@suse.com
 

libreoffice.spec

@@ -85,10 +85,12 @@ Patch11:        nlpsolver-no-broken-help.diff
 Patch12:        mediawiki-no-broken-help.diff
 # LO newer worked well with it
 Patch13:        jvmfwk-disable-gcj.diff
-# Fix running wizzards in py2 as the utf is not htere
+# Fix running wizards in py2 as the utf is not there
 Patch16:        wizards-create-temlates-with-python-2.6.diff
 # PATCH-FIX-UPSTREAM: fix kde hanging in 4.2.3.3
 Patch18:        kde4-4.2.3.3-timer-mutex.patch
+# Fix build on openSUSE 12.3
+Patch19:        0001-std-strlen-requires-cstring-include-to-build.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 BuildRequires:  ImageMagick
@@ -850,6 +852,7 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch13 -p1
 %patch16 -p1
 %patch18 -p1
+%patch19 -p1
 %patch990 -p1
 # 256x256 icons
 tar -xjf %{SOURCE20}