Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=ca99870736b84122bf0067c765922e0139bffb8b
commit ca99870736b84122bf0067c765922e0139bffb8b Author: Miklos Vajna <[email protected]> Date: Tue Apr 29 20:49:39 2014 +0200 libreoffice-4.3.0.0.alpha1-1-x86_64 - 4.2 -> 4.3 alpha 1 - bundle internal coinmp, gltf and glm for now - no need to disable afms anymore (it's disabled by default) 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 deleted file mode 100644 index 93c4f72..0000000 --- a/source/xapps/libreoffice/0001-std-strlen-requires-cstring-include-to-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 bc8dbbd..842dbea 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -5,7 +5,7 @@ options+=('asneeded') pkgname=libreoffice -pkgver=4.2.3.2 +pkgver=4.3.0.0.alpha1 buildfix="" minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y @@ -17,11 +17,13 @@ unset install depends=('libxml2' 'libsndfile' 'openjre' 'fontconfig' 'libpng>=1.4.1' \ 'flex' 'neon>=0.26.1' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 'perl-archive-zip' \ 'unixodbc>=2.3.1' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' \ - 'libvisio>=0.0.24-2' 'libcdr>=0.0.10' 'libetonyek' 'libfreehand' 'libmspub' 'libe-book' 'libabw' 'liborcus>=0.5.1-3' \ + 'libvisio>=0.0.24-2' 'libcdr>=0.0.10' 'libetonyek' 'libfreehand' 'libmspub' 'libe-book' 'libabw' 'liborcus>=0.7.0' \ 'sane-backends' 'lp_solve' 'silgraphite' 'libexttextcat>=3.4.0' 'librdf' 'graphite2' 'libcmis>=0.3.0-2' 'clucene' \ 'liblangtag' 'python-3.0' 'poppler-glib>=0.18' 'libodfgen' 'libmwaw>=0.2.0' 'hyphen' 'mythes' \ # required by Base - 'libfbembed') + 'libfbembed' \ + # required by avmedia, chart2, svx and vcl + 'glew>=1.10.0') makedepends=('apache-ant' 'boost>=1.50.0' 'hunspell>=1.3.2' \ 'xalan-j' 'xorg-server' 'gstreamer1' 'gst1-plugins-base' \ 'xulrunner' "kdelibs-compiletime>=$_F_kde_ver" 'libwps>=0.2.7-2' 'mdbtools' \ @@ -47,8 +49,8 @@ mirror="http://download.documentfoundation.org/libreoffice/src/$minor" mirror="http://dev-builds.libreoffice.org/pre-releases/src" up2date="Flasttar $mirror" modules=('' 'help-' 'translations-') -source=(0001-std-strlen-requires-cstring-include-to-build.patch) -signatures=('') +source=() +signatures=() for i in "${modules[@]}" do if [ "$i" != translations- ]; then @@ -59,12 +61,16 @@ do signatures=("${signatures[@]}" $mirror/libreoffice-$i$pkgver$buildfix.tar.xz.asc) fi done +# TODO system-coinmp, system-gltf, system-glm ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll \ http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \ http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \ http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \ http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip \ - http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) + http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz \ + http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz \ + http://dev-www.libreoffice.org/src/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz \ + http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip) for i in ${ext_source[@]} do source=(${source[@]} $i) @@ -220,8 +226,8 @@ build() --with-system-libs \ --with-system-headers \ --without-system-hsqldb \ + --without-system-glm \ --with-external-tar=`pwd`/ext_source \ - --without-afms \ --with-system-jars \ --with-system-dicts \ --with-external-dict-dir=/usr/share/myspell \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
