Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=766385eba6f318c9ab2cf8dc2aa43bd64cfa5ff3
commit 766385eba6f318c9ab2cf8dc2aa43bd64cfa5ff3 Author: Miklos Vajna <[email protected]> Date: Sat Jan 27 17:58:34 2018 +0100 libreoffice-6.0.0.3-1-x86_64 - 5.4 -> 6.0 diff --git a/source/xoffice/libreoffice/FrugalBuild b/source/xoffice/libreoffice/FrugalBuild index 452b38a..bf31d51 100644 --- a/source/xoffice/libreoffice/FrugalBuild +++ b/source/xoffice/libreoffice/FrugalBuild @@ -3,10 +3,10 @@ # Contributor: Laszlo Dvornik <[email protected]> pkgname=libreoffice -pkgver=5.4.4.2 +pkgver=6.0.0.3 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 @@ -34,7 +34,7 @@ depends=( 'libmspub' 'libmwaw>=0.2.0' 'libodfgen' - 'liborcus>=0.12.1' + 'liborcus>=0.13.1' 'libpagemaker' 'libpng>=1.4.1' 'librdf' @@ -61,6 +61,8 @@ depends=( 'zip' 'libgpgmepp' 'xmlsec1>=1.2.25-2' + 'libepubgen' + 'libqxp' ) makedepends=( 'apache-ant' @@ -104,12 +106,12 @@ do signatures=("${signatures[@]}" $mirror/libreoffice-$i${pkgver/_/-}.tar.xz.asc) done # .patch files here. -source+=(build.patch) +source+=() # One '' for each .patch here. -signatures+=('') +signatures+=() ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll \ - http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz \ + http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.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 \ @@ -246,7 +248,7 @@ build() # SMP build if [ ! -z "$MAKEFLAGS" ]; then - local _makeflags=$(MAKEFLAGS) + local _makeflags="$MAKEFLAGS" Fconfopts+=" --with-parallelism=${_makeflags/-j}" unset MAKEFLAGS fi @@ -271,7 +273,6 @@ build() --with-help \ --without-fonts \ --with-system-libs \ - --with-system-opencollada \ --with-system-headers \ --with-system-ucpp \ --without-system-hsqldb \ diff --git a/source/xoffice/libreoffice/build.patch b/source/xoffice/libreoffice/build.patch deleted file mode 100644 index 57ccdb2..0000000 --- a/source/xoffice/libreoffice/build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/vcl/unx/gtk3/gtk3gtkframe.cxx.orig 2018-01-03 10:48:22.638591091 +0100 -+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx 2018-01-03 10:49:31.144297814 +0100 -@@ -21,6 +21,7 @@ - #include <unx/gtk/gtkdata.hxx> - #include <unx/gtk/gtkinst.hxx> - #include <unx/gtk/gtkgdi.hxx> -+#include <unx/gtk/gtksalmenu.hxx> - #include <vcl/help.hxx> - #include <vcl/keycodes.hxx> - #include <vcl/layout.hxx> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
