office/LibreOffice: Use internal libxml, system liblangtag

Signed-off-by: Christoph Willing <chris.willing@linux.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Christoph Willing 2023-12-15 12:58:46 +10:00 committed by Willy Sudiarto Raharjo
parent 753d05559e
commit 758b229284
No known key found for this signature in database
GPG key ID: 3F617144D7238786
2 changed files with 7 additions and 4 deletions

View file

@ -30,7 +30,7 @@ PRGNAM=LibreOffice
SRCNAM=libreoffice SRCNAM=libreoffice
VERSION=${VERSION:-7.6.4.1} VERSION=${VERSION:-7.6.4.1}
SHORT_VERSION=${VERSION%.*.*} SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-1} BUILD=${BUILD:-2}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz} PKGTYPE=${PKGTYPE:-tgz}
@ -163,6 +163,7 @@ if pkg-config --exists mdds-1.4 ; then mdds="--with-system-mdds" ; else mdds=""
if pkg-config --exists mythes ; then mythes="--with-system-mythes" ; else mythes="" ; 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 -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 #if test -d /usr/lib${LIBDIRSUFFIX}/python3*/site-packages/lxml ; then lxml="--with-system-lxml" ; else lxml="" ; fi
if pkg-config --exists xmlsec1 ; then if pkg-config --exists xmlsec1 ; then
xmlsec="--with-system-xmlsec" xmlsec="--with-system-xmlsec"
else else
@ -170,6 +171,7 @@ else
# Also ensure correct nspr implementation is used if building libreoffice supplied xmlsec # Also ensure correct nspr implementation is used if building libreoffice supplied xmlsec
sed -i -e 's:openssl:openssl --with-mozilla-ver=/usr:' external/xmlsec/ExternalProject_xmlsec.mk sed -i -e 's:openssl:openssl --with-mozilla-ver=/usr:' external/xmlsec/ExternalProject_xmlsec.mk
fi fi
#if test -e /usr/share/ant/lib/rhino.jar ; then rhino="--with-system-rhino --with-rhino-jar=/usr/share/ant/lib/rhino.jar" ; else rhino="" ; fi #if test -e /usr/share/ant/lib/rhino.jar ; then rhino="--with-system-rhino --with-rhino-jar=/usr/share/ant/lib/rhino.jar" ; else rhino="" ; fi
if pkg-config --exists libvlc ; then vlc="--enable-vlc" ; else vlc="" ; fi if pkg-config --exists libvlc ; then vlc="--enable-vlc" ; else vlc="" ; fi
# Building with vlc backend is marked as experimental so demand explicit indication via environment variable VLC to do it. # Building with vlc backend is marked as experimental so demand explicit indication via environment variable VLC to do it.
@ -230,6 +232,7 @@ fi
--without-krb5 \ --without-krb5 \
--without-gssapi \ --without-gssapi \
--without-junit \ --without-junit \
--without-system-libxml \
--with-help \ --with-help \
--with-system-bluez \ --with-system-bluez \
--with-system-bzip2 \ --with-system-bzip2 \
@ -251,7 +254,6 @@ fi
--with-system-libwebp \ --with-system-libwebp \
--with-system-libwpd \ --with-system-libwpd \
--with-system-libwpg \ --with-system-libwpg \
--with-system-libxml \
--with-system-mariadb \ --with-system-mariadb \
--with-system-nss \ --with-system-nss \
--with-system-openldap \ --with-system-openldap \
@ -265,6 +267,7 @@ fi
$glm \ $glm \
$libabw \ $libabw \
$libcdr \ $libcdr \
$liblangtag \
$libcmis \ $libcmis \
$libebook \ $libebook \
$libeot \ $libeot \

View file

@ -4,9 +4,9 @@ HOMEPAGE="https://www.libreoffice.org"
DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-7.6.4.1.tar.xz \ DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-7.6.4.1.tar.xz \
https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.6.4.1-srcs.tar.xz" https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.6.4.1-srcs.tar.xz"
MD5SUM="51cb8339342bf6d95b07c72b6106cb00 \ MD5SUM="51cb8339342bf6d95b07c72b6106cb00 \
2e2d36cddbf470f9de744c9bb9624ffd" 94ac9be99bfb45e04fc689533f9f5b23"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="zulu-openjdk11 apache-ant perl-Archive-Zip" REQUIRES="zulu-openjdk11 apache-ant perl-Archive-Zip liblangtag"
MAINTAINER="Christoph Willing" MAINTAINER="Christoph Willing"
EMAIL="chris.willing@linux.com" EMAIL="chris.willing@linux.com"