Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd7898aaaf0c9a927786de50acbdaaff9afa5150
commit fd7898aaaf0c9a927786de50acbdaaff9afa5150 Author: Miklos Vajna <vmik...@frugalware.org> Date: Thu Jun 16 15:10:42 2016 +0200 libreoffice-5.1.4.2-1-x86_64 - 5.1.3 -> 5.1.4 - rebuild with poppler-glib>=0.44.0 - fall back to internal mdds till we can use mdds-1.2 - no longer replace 'kexi' and 'krita' - disable junit till it's clear how to fix that package diff --git a/source/xoffice/libreoffice/FrugalBuild b/source/xoffice/libreoffice/FrugalBuild index 81aa943..0eff287 100644 --- a/source/xoffice/libreoffice/FrugalBuild +++ b/source/xoffice/libreoffice/FrugalBuild @@ -3,10 +3,10 @@ # Contributor: Laszlo Dvornik <dvor...@gnome.hu> pkgname=libreoffice -pkgver=5.1.3.2 +pkgver=5.1.4.2 minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y -pkgrel=2 +pkgrel=1 pkgdesc="Free Software Productivity Suite" url="http://www.libreoffice.org/" Finclude gnome-scriptlet @@ -51,7 +51,7 @@ depends=( 'opencollada' 'openjre' 'perl-archive-zip' - 'poppler-glib>=0.18' + 'poppler-glib>=0.44.0' 'python3' 'sane-backends' 'startup-notification>=0.9-3' @@ -115,7 +115,8 @@ ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3 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/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) + http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 \ + http://dev-www.libreoffice.org/src/mdds_0.12.1.tar.bz2) for i in ${ext_source[@]} do source=(${source[@]} $i) @@ -125,7 +126,7 @@ NOEXTRACT=1 options+=('scriptlet') replaces=('calligra' 'calligra-libs' 'calligra-data' 'calligra-tools' 'calligra-docs' \ - 'braindump' 'flow' 'karbon' 'kexi' 'krita' 'plan' 'stage' 'sheets' 'words') + 'braindump' 'flow' 'karbon' 'plan' 'stage' 'sheets' 'words') conflicts=("$replaces[@]}") @@ -250,10 +251,12 @@ build() Fpatchall export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser' - export MDDS_CFLAGS=`pkg-config --cflags mdds-1.0` + export MDDS_CFLAGS=`pkg-config --cflags mdds-1.2` export MDDS_LIBS=' ' _F_conf_configure="./autogen.sh" Fconfopts+=" --prefix=/usr --sysconfdir=/etc --localstatedir=/var --docdir=/usr/share/doc/libreoffice-$pkgver --infodir=/usr/share/info --mandir=/usr/share/man" + # FIXME fix junit and enable it again + # FIXME use system mdds again when 1.2 is supported Fconf --with-vendor="Frugalware Linux" \ --with-build-version="$pkgver-$pkgrel" \ --with-lang="en-US ${completelangiso[*]}" \ @@ -271,6 +274,8 @@ build() --with-system-jars \ --with-system-dicts \ --with-external-dict-dir=/usr/share/myspell \ + --without-junit \ + --without-system-mdds \ --disable-fetch-external \ --enable-release-build \ --disable-dependency-tracking _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git