Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07a31f3d96a6b577385cfe65ab459975df0eebc7
commit 07a31f3d96a6b577385cfe65ab459975df0eebc7 Author: Miklos Vajna <[email protected]> Date: Mon Mar 31 09:24:14 2014 +0200 libreoffice-4.2.3.2-1-x86_64 - 4.2.2 -> 4.2.3 diff --git a/source/xapps/libreoffice/0001-std-strlen-requires-cstring-include-to-build.patch b/source/xapps/libreoffice/0001-std-strlen-requires-cstring-include-to-build.patch new file mode 100644 index 0000000..93c4f72 --- /dev/null +++ b/source/xapps/libreoffice/0001-std-strlen-requires-cstring-include-to-build.patch @@ -0,0 +1,42 @@ +From da9bd301c6f62e829daadb2af6a6b9633d4f1cb9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <[email protected]> +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 +--- + 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 6c3aa3b..289fc62 100644 +--- a/sc/source/filter/excel/xestream.cxx ++++ b/sc/source/filter/excel/xestream.cxx +@@ -988,7 +988,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 5767634..2e24dff 100644 +--- a/sc/source/filter/qpro/qpro.cxx ++++ b/sc/source/filter/qpro/qpro.cxx +@@ -226,7 +226,7 @@ void ScQProReader::readString( OUString &rString, sal_uInt16 nLength ) + sal_Char* pText = new sal_Char[ nLength + 1 ]; + nLength = 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 + diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index ff3a557..bc8dbbd 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -5,7 +5,7 @@ options+=('asneeded') pkgname=libreoffice -pkgver=4.2.2.1 +pkgver=4.2.3.2 buildfix="" minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y @@ -44,11 +44,11 @@ makedepends=('apache-ant' 'boost>=1.50.0' 'hunspell>=1.3.2' \ groups=('xapps') archs=('i686' 'x86_64') mirror="http://download.documentfoundation.org/libreoffice/src/$minor"; -#mirror="http://dev-builds.libreoffice.org/pre-releases/src"; +mirror="http://dev-builds.libreoffice.org/pre-releases/src"; up2date="Flasttar $mirror" modules=('' 'help-' 'translations-') -source=() -signatures=() +source=(0001-std-strlen-requires-cstring-include-to-build.patch) +signatures=('') for i in "${modules[@]}" do if [ "$i" != translations- ]; then @@ -228,6 +228,7 @@ build() --without-myspell-dicts \ --disable-gstreamer-0_10 --enable-gstreamer \ --disable-fetch-external \ + --enable-release-build \ --disable-dependency-tracking if [ ! -e src.built ]; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
