diff options
author | Eric Hameleers <alien@slackware.com> | 2019-08-24 16:28:22 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-08-24 16:28:22 +0000 |
commit | c6472c812572447f28603a2e6327760bc04b813c (patch) | |
tree | 181983d6e6fef7e22e90160e94a617a6ce183801 | |
parent | 290a14141b674fa2309eb3f2cbf137949546c2b6 (diff) | |
download | asb-c6472c812572447f28603a2e6327760bc04b813c.tar.gz asb-c6472c812572447f28603a2e6327760bc04b813c.tar.xz |
libreoffice: updated to 6.3.0
-rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 90 |
1 files changed, 47 insertions, 43 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index 86280d04..89984744 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -292,6 +292,8 @@ # * Update. # 6.2.5-1: 04/jul/2019 by Eric Hameleers <alien@slackware.com> # * Update. +# 6.3.0-1: 25/aug/2019 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -312,9 +314,9 @@ BUILD=${BUILD:-1} TAG=${TAG:-alien} # Either add support for KDE4, or for KDE5: -ADD_KDE4=${ADD_KDE4:-"YES"} +ADD_KDE4=${ADD_KDE4:-"NO"} ADD_KDE4=$(echo $ADD_KDE4 | tr 'a-z' 'A-Z') -ADD_KDE5=${ADD_KDE5:-"NO"} +ADD_KDE5=${ADD_KDE5:-"YES"} ADD_KDE5=$(echo $ADD_KDE5 | tr 'a-z' 'A-Z') if [ "${ADD_KDE4}" = "YES" -a "${ADD_KDE5}" = "YES" ]; then echo "** Support for KDE4 and KDE5 can not be enabled at the same time!" @@ -334,8 +336,8 @@ fi #SRCVER=${SRCVER:-5.0.0.2git} #SRCVER=${SRCVER:-5.0.0.2} -SRCVER=${SRCVER:-6.2.5} -SUBVER=".2" +SRCVER=${SRCVER:-6.3.0} +SUBVER=".4" PKG_SUBVER="" # Under what directory will the script download all sources: @@ -465,14 +467,14 @@ GITURI[5]="" # # --- Start of section generated by gensrc.sh --- -# External sources for libreoffice-6.2.5.2 +# External sources for libreoffice-6.3.0.4 SOURCE[6]="$SRCDIR/${LOSRC_DIR}/185d60944ea767075d27247c3162b3bc-unowinreg.dll" SRCURL[6]="https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll" GITURI[6]="" -SOURCE[7]="$SRCDIR/${LOSRC_DIR}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf" -SRCURL[7]="https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf" +SOURCE[7]="$SRCDIR/${LOSRC_DIR}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf" +SRCURL[7]="https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf" GITURI[7]="" SOURCE[8]="$SRCDIR/${LOSRC_DIR}/libabw-0.1.2.tar.xz" @@ -491,8 +493,8 @@ SOURCE[11]="$SRCDIR/${LOSRC_DIR}/apr-util-1.5.4.tar.gz" SRCURL[11]="https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz" GITURI[11]="" -SOURCE[12]="$SRCDIR/${LOSRC_DIR}/boost_1_66_0.tar.bz2" -SRCURL[12]="https://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2" +SOURCE[12]="$SRCDIR/${LOSRC_DIR}/boost_1_69_0.tar.bz2" +SRCURL[12]="https://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2" GITURI[12]="" SOURCE[13]="$SRCDIR/${LOSRC_DIR}/breakpad.zip" @@ -607,8 +609,8 @@ SOURCE[40]="$SRCDIR/${LOSRC_DIR}/edc4d741888bc0d38e32dbaa17149596-source-sans-pr SRCURL[40]="https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz" GITURI[40]="" -SOURCE[41]="$SRCDIR/${LOSRC_DIR}/source-serif-font-2.007R.tar.gz" -SRCURL[41]="https://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz" +SOURCE[41]="$SRCDIR/${LOSRC_DIR}/source-serif-pro-3.000R.tar.gz" +SRCURL[41]="https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz" GITURI[41]="" SOURCE[42]="$SRCDIR/${LOSRC_DIR}/EmojiOneColor-SVGinOT-1.3.tar.gz" @@ -651,8 +653,8 @@ SOURCE[51]="$SRCDIR/${LOSRC_DIR}/libfreehand-0.1.2.tar.xz" SRCURL[51]="https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz" GITURI[51]="" -SOURCE[52]="$SRCDIR/${LOSRC_DIR}/freetype-2.8.1.tar.bz2" -SRCURL[52]="https://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2" +SOURCE[52]="$SRCDIR/${LOSRC_DIR}/freetype-2.9.1.tar.bz2" +SRCURL[52]="https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2" GITURI[52]="" SOURCE[53]="$SRCDIR/${LOSRC_DIR}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip" @@ -663,12 +665,12 @@ SOURCE[54]="$SRCDIR/${LOSRC_DIR}/gpgme-1.9.0.tar.bz2" SRCURL[54]="https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2" GITURI[54]="" -SOURCE[55]="$SRCDIR/${LOSRC_DIR}/graphite2-minimal-1.3.10.tgz" -SRCURL[55]="https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz" +SOURCE[55]="$SRCDIR/${LOSRC_DIR}/graphite2-minimal-1.3.13.tgz" +SRCURL[55]="https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz" GITURI[55]="" -SOURCE[56]="$SRCDIR/${LOSRC_DIR}/harfbuzz-1.8.4.tar.bz2" -SRCURL[56]="https://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2" +SOURCE[56]="$SRCDIR/${LOSRC_DIR}/harfbuzz-2.3.1.tar.bz2" +SRCURL[56]="https://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2" GITURI[56]="" SOURCE[57]="$SRCDIR/${LOSRC_DIR}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip" @@ -783,8 +785,8 @@ SOURCE[84]="$SRCDIR/${LOSRC_DIR}/ltm-1.0.zip" SRCURL[84]="https://dev-www.libreoffice.org/src/ltm-1.0.zip" GITURI[84]="" -SOURCE[85]="$SRCDIR/${LOSRC_DIR}/xmlsec1-1.2.27.tar.gz" -SRCURL[85]="https://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz" +SOURCE[85]="$SRCDIR/${LOSRC_DIR}/xmlsec1-1.2.28.tar.gz" +SRCURL[85]="https://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz" GITURI[85]="" SOURCE[86]="$SRCDIR/${LOSRC_DIR}/libxml2-2.9.9.tar.gz" @@ -819,8 +821,8 @@ SOURCE[93]="$SRCDIR/${LOSRC_DIR}/libmspub-0.1.4.tar.xz" SRCURL[93]="https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz" GITURI[93]="" -SOURCE[94]="$SRCDIR/${LOSRC_DIR}/libmwaw-0.3.14.tar.xz" -SRCURL[94]="https://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz" +SOURCE[94]="$SRCDIR/${LOSRC_DIR}/libmwaw-0.3.15.tar.xz" +SRCURL[94]="https://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz" GITURI[94]="" SOURCE[95]="$SRCDIR/${LOSRC_DIR}/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz" @@ -831,8 +833,8 @@ SOURCE[96]="$SRCDIR/${LOSRC_DIR}/neon-0.30.2.tar.gz" SRCURL[96]="https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz" GITURI[96]="" -SOURCE[97]="$SRCDIR/${LOSRC_DIR}/nss-3.38-with-nspr-4.19.tar.gz" -SRCURL[97]="https://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz" +SOURCE[97]="$SRCDIR/${LOSRC_DIR}/nss-3.45-with-nspr-4.21.tar.gz" +SRCURL[97]="https://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz" GITURI[97]="" SOURCE[98]="$SRCDIR/${LOSRC_DIR}/libodfgen-0.1.6.tar.bz2" @@ -867,8 +869,8 @@ SOURCE[105]="$SRCDIR/${LOSRC_DIR}/libpagemaker-0.0.4.tar.xz" SRCURL[105]="https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz" GITURI[105]="" -SOURCE[106]="$SRCDIR/${LOSRC_DIR}/pdfium-3550.tar.bz2" -SRCURL[106]="https://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2" +SOURCE[106]="$SRCDIR/${LOSRC_DIR}/pdfium-3794.tar.bz2" +SRCURL[106]="https://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2" GITURI[106]="" SOURCE[107]="$SRCDIR/${LOSRC_DIR}/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz" @@ -1465,24 +1467,26 @@ cd $OUTPUT cd - cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc" > $OUTPUT/${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.txt -# Move the KDE integration libraries into a separate package so that people -# have a choice to leave these libraries out: -echo "Starting split-off of KDE integration libraries from main $PRGNAM package..." -mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program -for KDEFILE in libvclplug_kde4lo.so libkde4be1lo.so ; do - mv $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \ - $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ -done -mkdir -p $TMP/package-${PRGNAM}-kde-integration/install -cat $SRCDIR/slack-desc.kde \ - > $TMP/package-${PRGNAM}-kde-integration/install/slack-desc -cd $TMP/package-${PRGNAM}-kde-integration - /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd - -cd $OUTPUT - md5sum ${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $TMP/package-${PRGNAM}-kde-integration/install/slack-desc | grep "^${PRGNAM}-kde-integration" > $OUTPUT/${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt +if [ "${ADD_KDE4}" = "YES" -o "${ADD_KDE5}" = "YES" ]; then + # Move the KDE integration libraries into a separate package so that people + # have a choice to leave these libraries out: + echo "Starting split-off of KDE integration libraries from main $PRGNAM package..." + mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program + for KDEFILE in libvclplug*kde*lo.so libkde*be1lo.so lo_kde*filepicker ; do + mv $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \ + $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ + done + mkdir -p $TMP/package-${PRGNAM}-kde-integration/install + cat $SRCDIR/slack-desc.kde \ + > $TMP/package-${PRGNAM}-kde-integration/install/slack-desc + cd $TMP/package-${PRGNAM}-kde-integration + /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} + cd - + cd $OUTPUT + md5sum ${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 + cd - + cat $TMP/package-${PRGNAM}-kde-integration/install/slack-desc | grep "^${PRGNAM}-kde-integration" > $OUTPUT/${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt +fi # If we have any dictionaries in the $INSTDIR (this variable is set already # by the build process), now is the time to copy them into the package: |