Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=0ad9eeabb971da6bb3a6bd9a74cc2c117ae99d12
commit 0ad9eeabb971da6bb3a6bd9a74cc2c117ae99d12 Author: Miklos Vajna <[email protected]> Date: Sat Nov 28 13:12:33 2015 +0100 libreoffice-5.1.0.0.beta1_buildfix1-1-x86_64 - 5.0 -> 5.1 beta 1 - depend on newer liborcus - drop obsolete mdbtools dependency - fix incremental unpacking - gconf is now gone upstream diff --git a/source/xoffice/libreoffice/FrugalBuild b/source/xoffice/libreoffice/FrugalBuild index 86ab60e..4e82d06 100644 --- a/source/xoffice/libreoffice/FrugalBuild +++ b/source/xoffice/libreoffice/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik <[email protected]> pkgname=libreoffice -pkgver=5.0.3.2 +pkgver=5.1.0.0.beta1_buildfix1 minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y pkgrel=1 @@ -34,7 +34,7 @@ depends=( 'libmspub' 'libmwaw>=0.2.0' 'libodfgen' - 'liborcus>=0.7.1' + 'liborcus>=0.9.2' 'libpagemaker' 'libpng>=1.4.1' 'librdf' @@ -76,7 +76,6 @@ makedepends=( 'junit' 'kdelibs-compiletime' 'krb5' - 'mdbtools' 'mdds>=0.11.2' 'pentaho-reporting-flow-engine' 'postgresql' @@ -88,7 +87,7 @@ makedepends=( groups=('xoffice') 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"; _F_archive_grepv="beta" up2date="Flasttar $mirror" modules=('' 'help-' 'translations-') @@ -200,13 +199,15 @@ build() do Fextract libreoffice-$i${pkgver/_/-}.tar.xz done - Fcd libreoffice-${pkgver/_/-} + Fcd libreoffice-${pkgver%%_buildfix?} mkdir -p ext_source for i in ${ext_source[@]} do f=$(strip_url $i) ln -sf $Fsrcdir/$f ext_source/$f done + else + Fcd libreoffice-${pkgver%%_buildfix?} fi touch src.downloaded @@ -257,11 +258,10 @@ build() --without-myspell-dicts \ --disable-fetch-external \ --enable-release-build \ - --disable-dependency-tracking \ - --disable-gconf - # --disable-gconf will be the default in LO 5.1 + --disable-dependency-tracking sed -i '/sw_ooxmlimport/d' sw/Module_sw.mk sed -i '/sw_ww8import/d' sw/Module_sw.mk + sed -i '/sw_uiwriter/d' sw/Module_sw.mk sed -i '/sc_subsequent_filters_test/d' sc/Module_sc.mk sed -i '/sd_tiledrendering/d' sd/Module_sd.mk _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
