aboutsummaryrefslogtreecommitdiff
path: root/office
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@linux.com>2017-06-23 13:24:01 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-06-24 08:32:39 +0700
commitf49f7cd96d8d181b4857bfa21e7ff2cc8d70ccc3 (patch)
tree0a7f1d2f2df44236beda77b32e591fa5a8285b0a /office
parentf3afa5394a11621481e39cdb14d060e530761e2a (diff)
office/LibreOffice: Updated for 5.3.4.2
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Diffstat (limited to 'office')
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild5
-rw-r--r--office/LibreOffice/LibreOffice.info10
-rw-r--r--office/LibreOffice/no-check-if-root.diff8
3 files changed, 12 insertions, 11 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 7bdcd23dad7b4..ad4035f7f982a 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -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
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index f497af595f512..3c09353d161c8 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -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"
diff --git a/office/LibreOffice/no-check-if-root.diff b/office/LibreOffice/no-check-if-root.diff
index a148432613b78..fed2c8bb3dd08 100644
--- a/office/LibreOffice/no-check-if-root.diff
+++ b/office/LibreOffice/no-check-if-root.diff
@@ -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)\