diff options
| author |   Eric Hameleers <alien@slackware.com> | 2020-12-10 08:46:55 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-12-10 08:46:55 +0000 |
| commit | 2a61bb5170faa6aeb6aa5ee3e88e3f905f3e5883 (patch) | |
| tree | 3fd25d71d3b01b1c9e501ffdd1c2f91d389046d8 | |
| parent | 1db414abd7fc79b864bdc5fe99b06faedef07383 (diff) | |
| download | asb-2a61bb5170faa6aeb6aa5ee3e88e3f905f3e5883.tar.gz asb-2a61bb5170faa6aeb6aa5ee3e88e3f905f3e5883.tar.xz | |
libreoffice: rebuilt for the "Big Merge" in -current
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index bfe2b74d..666caf96 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -32,7 +32,9 @@ # Build-time: perl-archive-zip # jdk9, apache-ant if you need Java support, disabled by default. # Reinstall gpgme because its headers may have been overwritten -# by kdepimlibs4... +# by kdepimlibs4. +# (For Slackware-current if you want to add KDE5 support, install +# libdbusmenu-qt5 and all of KDE Frameworks from 'ktown' repo) # (for Slackware 14.2 you need to upgrade gcc to the 9.2.0 version # in 'unsupported' and you can revert back to 5.5.0 after # compilation is completed. You also need to compile/upgrade to @@ -323,6 +325,8 @@ # * Update. # 7.0.3-1: 30/oct/2020 by Eric Hameleers <alien@slackware.com> # * Update. +# 7.0.3-2: 09/dec/2020 by Eric Hameleers <alien@slackware.com> +# * Rebuilt against the "Big Merge" of 7 Dec 2020 in -current. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -339,7 +343,7 @@ PRGNAM4=sdkdoc PRGNAM5=kde-integration PRGNAM6=l10n -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-alien} # Add support for KDE5: @@ -1218,6 +1222,12 @@ 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 + # GCC10 requirements: + sed -i external/libcdr/ExternalProject_libcdr.mk \ + -e '/configure /i \\t\t&& sed -i "s/TRUE/true/g" src/lib/libcdr_utils.cpp \\' + sed -i external/libebook/ExternalProject_libebook.mk \ + -e '/configure /i \\t\t&& sed -i "s/TRUE/true/g" src/lib/EBOOKCharsetConverter.cpp \\' + sed -i i18npool/source/calendar/calendar_gregorian.cxx -e 's/TRUE/true/' fi if [ "${USE_LOVER}" == "yes" ]; then |