diff options
| author |   Eric Hameleers <alien@slackware.com> | 2020-05-22 20:08:53 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-05-22 20:08:53 +0000 |
| commit | 71d305454e525148ea74b3eeb395ac2094d3f491 (patch) | |
| tree | c0bd436e39a4d3875ffe6723ac1f9aae4dcc79ec /libreoffice/build/libreoffice.SlackBuild | |
| parent | 51402e7b8511e640ae9916da3907fc64833d66fa (diff) | |
| download | asb-71d305454e525148ea74b3eeb395ac2094d3f491.tar.gz asb-71d305454e525148ea74b3eeb395ac2094d3f491.tar.xz | |
libreoffice: update to 6.4.4
Diffstat (limited to 'libreoffice/build/libreoffice.SlackBuild')
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index c7ad1570..6e07220c 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -308,6 +308,8 @@ # * Update. # 6.4.3-1: 29/apr/2020 by Eric Hameleers <alien@slackware.com> # * Update. +# 6.4.4-1: 22/may/2020 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 . @@ -343,7 +345,7 @@ ADD_KDE5=$(echo $ADD_KDE5 | tr 'a-z' 'A-Z') #SRCVER=${SRCVER:-5.0.0.2git} #SRCVER=${SRCVER:-5.0.0.2} -SRCVER=${SRCVER:-6.4.3} +SRCVER=${SRCVER:-6.4.4} SUBVER=".2" PKG_SUBVER="" @@ -474,7 +476,7 @@ GITURI[5]="" # # --- Start of section generated by gensrc.sh --- -# External sources for libreoffice-6.4.3.2 +# External sources for libreoffice-6.4.4.2 SOURCE[6]="$SRCDIR/${LOSRC_DIR}/185d60944ea767075d27247c3162b3bc-unowinreg.dll" SRCURL[6]="https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll" @@ -748,8 +750,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-2019-09-16.tar.bz2" -SRCURL[74]="https://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2" +SOURCE[74]="$SRCDIR/${LOSRC_DIR}/language-subtag-registry-2020-04-01.tar.bz2" +SRCURL[74]="https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2" GITURI[74]="" SOURCE[75]="$SRCDIR/${LOSRC_DIR}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2" @@ -1194,20 +1196,10 @@ if [ "$P1" != "--oldbuild" ]; then # Add support for KDE5 destop session: cat $SRCDIR/patches/libreoffice.kde5_mailer.patch \ | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log - ## Fix a build failure for 6.3.0.4: - #cat $SRCDIR/patches/libreoffice63.calendar_class.patch \ - # | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log - ### Rather. I will disable postgresql-sdbc for -current, - # because I can not get it to compile against openssl-1.1 at all... - #if openssl-1.0 version 1>/dev/null 2>/dev/null ; then - # # Compile postgresql against openssl-1.0: - # cat $SRCDIR/patches/postgresql_openssl10.patch | sed -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/" \ - # | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log - #fi - ## Make libfreehand compile against icu4c-65.1: - #cp $SRCDIR/patches/libfreehand_icu_65.1.patch external/libfreehand/ - #echo '$(eval $(call gb_UnpackedTarball_add_patches,libfreehand, external/libfreehand/libfreehand_icu_65.1.patch))' \ - # >> external/libfreehand/UnpackedTarball_libfreehand.mk + # Explicitly disable latest C++ to allow external tarballs to compile, see + # https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-6-4&id=f0b74640137f07ed74027f98fbf6d1c0d98939bf : + cat $SRCDIR/patches/libreoffice.disable_latest_c++.patch \ + | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log fi if [ "${USE_LOVER}" == "yes" ]; then |