diff options
| author | Christoph Willing <chris.willing@iinet.net.au> | 2016-11-04 14:12:39 +1000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-11-05 07:15:55 +0700 |
| commit | d304280d3ef6d9ae23e8e0bc61562419c6ff59dd (patch) | |
| tree | d8ddb2e559c9cadd77863f6bf4b627e177c2525c /office | |
| parent | e2d0b942af2291d31550aabcca0e5f01c8c998b8 (diff) | |
office/LibreOffice: Updated for version 5.2.3.3
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
Diffstat (limited to 'office')
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 5 | ||||
| -rw-r--r-- | office/LibreOffice/LibreOffice.info | 12 | ||||
| -rw-r--r-- | office/LibreOffice/substitutepathvars.diff | 12 |
3 files changed, 8 insertions, 21 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index 7c661a5598f25..4a6fb05fa0f5e 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-5.2.2.2} +VERSION=${VERSION:-5.2.3.3} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} 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/substitutepathvars.diff if [ "$HAVE_SRCS_TARBALL" = "1" ]; then tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz @@ -85,7 +84,7 @@ find -L . \ # Options avahi="" ; [ "${AVAHI:-no}" != "no" ] && avahi="--enable-avahi" vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc" -kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ] && kde4="--disable-vlc" +kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ] && kde4="--disable-kde4" LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"} # LibreOffice.info REQUIRES jdk diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info index 64d7c5d897722..622c7ccdfe750 100644 --- a/office/LibreOffice/LibreOffice.info +++ b/office/LibreOffice/LibreOffice.info @@ -1,12 +1,12 @@ PRGNAM="LibreOffice" -VERSION="5.2.2.2" +VERSION="5.2.3.3" HOMEPAGE="http://libreoffice.org" -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="http://download.documentfoundation.org/libreoffice/src/5.2.3/libreoffice-5.2.3.3.tar.xz \ + http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.2.3.3-srcs.tar.xz" +MD5SUM="6177d8be5ca358929277a19292cae36d \ + 36941dbb6f201404c653d0d02fd6be7c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3 apache-ant perl-Archive-Zip" +REQUIRES="python3 jdk apache-ant perl-Archive-Zip" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" diff --git a/office/LibreOffice/substitutepathvars.diff b/office/LibreOffice/substitutepathvars.diff deleted file mode 100644 index e73db4b08e48e..0000000000000 --- a/office/LibreOffice/substitutepathvars.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 |