diff options
| author |   Eric Hameleers <alien@slackware.com> | 2021-10-14 17:22:14 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-10-14 17:22:14 +0000 |
| commit | ea1d77fb20a5eeee2a329d60945439380ad758db (patch) | |
| tree | 1821384f7297ea250871dabd85b03479bdfda2ce /libreoffice/build/libreoffice.SlackBuild | |
| parent | 42f766d974cd2589f4d9cf7034e002f5d6e882e0 (diff) | |
| download | asb-ea1d77fb20a5eeee2a329d60945439380ad758db.tar.gz asb-ea1d77fb20a5eeee2a329d60945439380ad758db.tar.xz | |
libreoffice: update to 7.2.2, skipping the planned update to 7.2.1
Diffstat (limited to '')
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index 8424dec4..bb6bc896 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -338,6 +338,10 @@ # * Update. # 7.2.0-1: 24/aug/2021 by Eric Hameleers <alien@slackware.com> # * Update. +# 7.2.1-1: 13/oct/2021 by Eric Hameleers <alien@slackware.com> +# * Update. +# 7.2.2-1: 14/oct/2021 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 . @@ -377,8 +381,8 @@ USE_JAVA=$(echo $USE_JAVA | tr 'a-z' 'A-Z') #SRCVER=${SRCVER:-5.0.0.2git} #SRCVER=${SRCVER:-5.0.0.2} -SRCVER=${SRCVER:-7.2.0} -SUBVER=".4" +SRCVER=${SRCVER:-7.2.2} +SUBVER=".2" PKG_SUBVER="" # Under what directory will the script download all sources: @@ -508,7 +512,7 @@ GITURI[5]="" # # --- Start of section generated by gensrc.sh --- -# External sources for libreoffice-7.2.0.4 +# External sources for libreoffice-7.2.2.2 SOURCE[6]="$SRCDIR/${LOSRC_DIR}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf" SRCURL[6]="https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf" @@ -634,8 +638,8 @@ SOURCE[36]="$SRCDIR/${LOSRC_DIR}/liberation-narrow-fonts-ttf-1.07.6.tar.gz" SRCURL[36]="https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz" GITURI[36]="" -SOURCE[37]="$SRCDIR/${LOSRC_DIR}/liberation-fonts-ttf-2.00.4.tar.gz" -SRCURL[37]="https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz" +SOURCE[37]="$SRCDIR/${LOSRC_DIR}/liberation-fonts-ttf-2.1.4.tar.gz" +SRCURL[37]="https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz" GITURI[37]="" SOURCE[38]="$SRCDIR/${LOSRC_DIR}/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip" @@ -782,8 +786,8 @@ SOURCE[73]="$SRCDIR/${LOSRC_DIR}/libjpeg-turbo-1.5.3.tar.gz" SRCURL[73]="https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz" GITURI[73]="" -SOURCE[74]="$SRCDIR/${LOSRC_DIR}/language-subtag-registry-2021-03-05.tar.bz2" -SRCURL[74]="https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2" +SOURCE[74]="$SRCDIR/${LOSRC_DIR}/language-subtag-registry-2021-08-06.tar.bz2" +SRCURL[74]="https://dev-www.libreoffice.org/src/language-subtag-registry-2021-08-06.tar.bz2" GITURI[74]="" SOURCE[75]="$SRCDIR/${LOSRC_DIR}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2" @@ -898,8 +902,8 @@ SOURCE[102]="$SRCDIR/${LOSRC_DIR}/openldap-2.4.45.tgz" SRCURL[102]="https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz" GITURI[102]="" -SOURCE[103]="$SRCDIR/${LOSRC_DIR}/openssl-1.1.1i.tar.gz" -SRCURL[103]="https://dev-www.libreoffice.org/src/openssl-1.1.1i.tar.gz" +SOURCE[103]="$SRCDIR/${LOSRC_DIR}/openssl-1.1.1l.tar.gz" +SRCURL[103]="https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz" GITURI[103]="" SOURCE[104]="$SRCDIR/${LOSRC_DIR}/liborcus-0.16.1.tar.bz2" @@ -1239,6 +1243,13 @@ if [ "$P1" != "--oldbuild" ]; then cp $SRCDIR/patches/skia_freetype211.patch external/skia/ cat $SRCDIR/patches/libreoffice.skia.patch \ | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log + # Fix compilation issue with bison 3.8.x: + cat $SRCDIR/patches/libreoffice.bison38.patch \ + | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log + # Fix LO bug #144037 (kf5: Unable to insert table from toolbar button), + # will be fixed in 7.3.0: + cat $SRCDIR/patches/libreoffice.kf5.toolbar.patch \ + | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log fi if [ "${USE_LOVER}" == "yes" ]; then @@ -1416,6 +1427,7 @@ autoconf -v --without-system-jars \ --without-system-jpeg \ --without-system-lcms2 \ + --without-system-libcmis \ --without-system-libvisio \ --without-system-mdds \ --without-system-poppler \ |