summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@linux.com>2019-03-22 19:50:15 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-03-23 09:59:38 +0700
commit46d1b9dcf688c71f3ec36068afe070779a783be3 (patch)
treeb8a9b133c0f892115189f27119e38f9c3a3ae0cc
parent12fe3953c4f8f7c1f94266078c6d3de475dd21ce (diff)
downloadslackbuilds-46d1b9dcf688c71f3ec36068afe070779a783be3.tar.gz
office/LibreOffice: Updated for version 6.2.2.2
Signed-off-by: Christoph Willing <chris.willing@linux.com>
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild4
-rw-r--r--office/LibreOffice/LibreOffice.info10
-rw-r--r--office/LibreOffice/README2
3 files changed, 7 insertions, 9 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 6cc1837297..e42d308ea8 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=LibreOffice
SRCNAM=libreoffice
-VERSION=${VERSION:-6.2.1.2}
+VERSION=${VERSION:-6.2.2.2}
SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -133,7 +133,6 @@ if pkg-config --exists libpq ; then postgresql="--with-system-postgresql" ; else
if pkg-config --exists libucpp ; then ucpp="--with-system-ucpp" ; else ucpp="" ; fi
if test -e /usr/include/lpsolve ; then lpsolve="--with-system-lpsolve" ; else lpsolve="" ; fi
if pkg-config --exists mdds-1.4 ; then mdds="--with-system-mdds" ; else mdds="" ; fi
-if test -e /usr/include/mysql_connection.h ; then mysql="--with-system-mysql-cppconn" ; else mysql="" ; fi
if pkg-config --exists mythes ; then mythes="--with-system-mythes" ; else mythes="" ; fi
if test -x /usr/bin/odbc_config ; then odbc="--with-system-odbc" ; else odbc="" ; fi
#if test -d /usr/lib${LIBDIRSUFFIX}/python3*/site-packages/lxml ; then lxml="--with-system-lxml" ; else lxml="" ; fi
@@ -253,7 +252,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] &
$valgrind \
$ucpp \
$odbc \
- $mysql \
$xmlsec \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index 6df79b850a..61fca693c8 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,10 +1,10 @@
PRGNAM="LibreOffice"
-VERSION="6.2.1.2"
+VERSION="6.2.2.2"
HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/6.2.1/libreoffice-6.2.1.2.tar.xz \
- http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-6.2.1.2-srcs.tar.xz"
-MD5SUM="fb2408407984e465cc33c3d8f977e883 \
- 32e6e78a98282bb5f5c8ddd0b0cefcf6"
+DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/6.2.2/libreoffice-6.2.2.2.tar.xz \
+ http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-6.2.2.2-srcs.tar.xz"
+MD5SUM="bc51199ccdf8db657511233bd5f681ec \
+ 57b8378f776b14fadb919dc75e5e1212"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3 openjdk apache-ant perl-Archive-Zip"
diff --git a/office/LibreOffice/README b/office/LibreOffice/README
index 1f868fb2aa..684db28e8f 100644
--- a/office/LibreOffice/README
+++ b/office/LibreOffice/README
@@ -20,7 +20,7 @@ internal versions. Packages from SBo that will be use in this way are:
libexttextcat libfreehand libmspub libmwaw libnumbertext liborcus
libpagemaker libqxp libnumbertext libstaroffice libtommath libwps libzmf
lpsolve mythes postgresql qt5 valgrind ucpp unixODBC avahi
- mysql-connector-c++ libetonyek xmlsec vlc
+ libetonyek xmlsec vlc
Remember, these packages are not essential but entirely optional. If not found,
LibreOffice will simply build its own internal versions.