office/LibreOffice: Updated for 5.3.4.2

Signed-off-by: Christoph Willing <chris.willing@linux.com>
This commit is contained in:
Christoph Willing 2017-06-23 13:24:01 +10:00 committed by Willy Sudiarto Raharjo
parent f3afa5394a
commit f49f7cd96d
3 changed files with 12 additions and 11 deletions

View file

@ -26,7 +26,7 @@
PRGNAM=LibreOffice
SRCNAM=libreoffice
VERSION=${VERSION:-5.3.3.2}
VERSION=${VERSION:-5.3.4.2}
SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
@ -69,7 +69,6 @@ cd $TMP
rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
cd $SRCNAM-$VERSION
patch -p0 < $CWD/no-check-if-root.diff
if [ "$HAVE_SRCS_TARBALL" = "1" ]; then
tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz
@ -175,6 +174,8 @@ if [ "$HAVE_SRCS_TARBALL" = "0" ]; then
exit 0
fi
patch -p0 < $CWD/no-check-if-root.diff
export LDFLAGS="-lboost_system"
make build-nocheck
make distro-pack-install DESTDIR=$PKG

View file

@ -1,10 +1,10 @@
PRGNAM="LibreOffice"
VERSION="5.3.3.2"
VERSION="5.3.4.2"
HOMEPAGE="http://libreoffice.org"
DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.3.3/libreoffice-5.3.3.2.tar.xz \
http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.3.3.2-srcs.tar.xz"
MD5SUM="2b804a62d318550140259d31ef2599b9 \
03638becb564ffb068bed1a8a165921e"
DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.3.4/libreoffice-5.3.4.2.tar.xz \
http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.3.4.2-srcs.tar.xz"
MD5SUM="7c5e2c627871346bca19e6f55dce4b8a \
98ca95caa82b487ce7d0e1b32953ac3d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3 openjdk apache-ant perl-Archive-Zip"

View file

@ -1,11 +1,11 @@
--- Makefile.in.orig 2017-01-27 08:22:46.000000000 +1000
+++ Makefile.in 2017-02-13 08:09:13.313249556 +1000
--- Makefile.orig 2017-06-23 08:28:09.631227745 +1000
+++ Makefile 2017-06-23 08:31:02.150234439 +1000
@@ -9,7 +9,7 @@
gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
-.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
-.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
MAKECMDGOALS?=all
build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\