summaryrefslogtreecommitdiffstats
path: root/office
diff options
context:
space:
mode:
author Christoph Willing <chris.willing@iinet.net.au>2016-09-30 17:08:05 +1000
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-10-01 07:29:13 +0700
commit40260794b97b31ac67ac5eaea7d9922f1ae053aa (patch)
treefcf663ee829841518efcdbb6a2431f3f1bb681d0 /office
parent7f34e8407b90071af4268471ce24dea30503ac85 (diff)
downloadslackbuilds-40260794b97b31ac67ac5eaea7d9922f1ae053aa.tar.gz
slackbuilds-40260794b97b31ac67ac5eaea7d9922f1ae053aa.tar.xz
office/LibreOffice: Updated for version 5.2.2.2
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
Diffstat (limited to 'office')
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild10
-rw-r--r--office/LibreOffice/LibreOffice.info12
-rw-r--r--office/LibreOffice/README17
-rw-r--r--office/LibreOffice/substitutepathvars.diff12
4 files changed, 36 insertions, 15 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index c7f55be3ae..7c661a5598 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=LibreOffice
SRCNAM=libreoffice
-VERSION=${VERSION:-5.2.1.2}
+VERSION=${VERSION:-5.2.2.2}
SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,6 +69,7 @@ cd $TMP
rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
cd $SRCNAM-$VERSION
+patch -p0 < $CWD/substitutepathvars.diff
if [ "$HAVE_SRCS_TARBALL" = "1" ]; then
tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz
@@ -82,8 +83,9 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Options
-avahi="" ; [ "${AVAHI:-yes}" != "no" ] && avahi="--enable-avahi"
-vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc"
+avahi="" ; [ "${AVAHI:-no}" != "no" ] && avahi="--enable-avahi"
+vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc"
+kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ] && kde4="--disable-vlc"
LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"}
# LibreOffice.info REQUIRES jdk
@@ -105,10 +107,10 @@ LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"}
--enable-release-build=yes \
--enable-python="system" \
--enable-gio \
- --enable-kde4 \
--enable-ext-mariadb-connector \
$avahi \
$vlc \
+ $kde4 \
--with-x \
--with-tls="nss" \
--without-krb5 \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index d18eec2c3f..64d7c5d897 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,12 +1,12 @@
PRGNAM="LibreOffice"
-VERSION="5.2.1.2"
+VERSION="5.2.2.2"
HOMEPAGE="http://libreoffice.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.2.1/libreoffice-5.2.1.2.tar.xz \
- http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.2.1.2-srcs.tar.xz"
-MD5SUM="10c9de303065e877954ee3f9717b48ec \
- 26fcf09f00b239cb8607d60fe77a9aaa"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.2.2/libreoffice-5.2.2.2.tar.xz \
+ http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.2.2.2-srcs.tar.xz"
+MD5SUM="4a001b0b43e58a3e584cb703d72cf19d \
+ 332b160cfd23671a638a211f721ba10f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="avahi python3 apache-ant perl-Archive-Zip"
+REQUIRES="python3 apache-ant perl-Archive-Zip"
MAINTAINER="Christoph Willing"
EMAIL="chris.willing@linux.com"
diff --git a/office/LibreOffice/README b/office/LibreOffice/README
index 2732ce0aa9..eb9b697f8c 100644
--- a/office/LibreOffice/README
+++ b/office/LibreOffice/README
@@ -8,12 +8,19 @@ and Math for editing mathematics.
This SlackBuild builds the entire project from its source code. In seeking a
fully functional LibreOffice, most optional features are included by default.
-Build time environment variables that may set to vary features are as follows.
-1. enable (disabled by default) the experimental VLC avmedia backend with:
+Build time environment variables that may set to vary features are as follows:
+1. enable the experimental VLC avmedia backend (disabled by default) with:
VLC="yes"
-2. disable (enabled by default) use of avahi with:
- AVAHI="no"
-3. support additional languages by overriding the LOLANGS variable, whose
+ This requires the vlc package (available from SBo) to be installed.
+
+2. enable avahi support (disabled by default) with:
+ AVAHI="yes"
+ This requires the avahi package (available from SBo) to be installed.
+
+3. disable kde4 support (enabled by default) with:
+ KDE4="no"
+
+4. support additional languages by overriding the LOLANGS variable, whose
default setting is LOLANGS="de es fr id it ja nl vi zh-CN". Note that en-US
is always added to whatever LOLANGS is set. Thus building with, for example,
LOLOANGS="de" sh LibreOffice
diff --git a/office/LibreOffice/substitutepathvars.diff b/office/LibreOffice/substitutepathvars.diff
new file mode 100644
index 0000000000..e73db4b08e
--- /dev/null
+++ b/office/LibreOffice/substitutepathvars.diff
@@ -0,0 +1,12 @@
+--- framework/source/services/substitutepathvars.cxx.orig 2016-09-22 01:12:13.000000000 +1000
++++ framework/source/services/substitutepathvars.cxx 2016-09-30 10:54:26.208653704 +1000
+@@ -1095,7 +1095,8 @@
+ if ( nPos >= 0 )
+ {
+ bool bMatch = true;
+- if ( i->eVariable == PREDEFVAR_LANGID ||
++ if ( i->eVariable == PREDEFVAR_USERNAME ||
++ i->eVariable == PREDEFVAR_LANGID ||
+ i->eVariable == PREDEFVAR_VLANG )
+ {
+ // Special path variables as they can occur in the middle of a path. Only match if they