diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-08-25 21:52:18 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-08-25 21:52:18 +0000 |
| commit | c1350ba7ecf96c931699bb11edb65fbf248a7d73 (patch) | |
| tree | 79f8caffd19b70baefcc954838146e569bd5c7de /libreoffice/build/libreoffice.SlackBuild | |
| parent | 4ec5efb6f8736ccea0e10e5db7bbb2eb163ff7ed (diff) | |
| download | asb-c1350ba7ecf96c931699bb11edb65fbf248a7d73.tar.gz asb-c1350ba7ecf96c931699bb11edb65fbf248a7d73.tar.xz | |
libreoffice: apply a patch to fix the build; properly add support for KDE5.
Diffstat (limited to 'libreoffice/build/libreoffice.SlackBuild')
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index cdac4ab5..6c582aa1 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -1172,6 +1172,9 @@ 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 @@ -1195,7 +1198,8 @@ if [ "$ARCH" != "x86_64" ]; then export DISABLE_CVE_TESTS=TRUE fi -# Note about KDE5: this also needs Qt5 available. This build will fail +# Note about KDE5: you'll need the Frameworks packages, nothing more, +# but this also needs Qt5 available. This build will fail # if you enable KDE5 support but did not install Qt5! # Note that you can enable Qt5 support even if you do not have KDE5; # as long as you actually install a Qt5 package! @@ -1207,8 +1211,11 @@ else KDEOPTS="--disable-kde5 --disable-gtk3-kde5" fi # Add Qt5 related arguments: -if $(pkg-config Qt5 --exists) || $(pkg-config Qt5Core --exists) ; then +if $(pkg-config Qt5Core --exists) ; then QTOPTS="--enable-qt5" + unset CPLUS_INCLUDE_PATH + unset QT4DIR + export QTDIR="/usr/lib${LIBDIRSUFFIX}/qt5" else QTOPTS="--disable-qt5" fi @@ -1259,7 +1266,11 @@ export OODESTDIR="$PKG" # Regular build flags: export LDFLAGS="${SLKGPGMELDFLAGS} -Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ $SLKLDFLAGS" -export CXXFLAGS="$(pkg-config --cflags QtCore) $SLKCFLAGS" +if [ "${ADD_KDE5}" = "YES" ]; then + export CXXFLAGS="$(pkg-config --cflags Qt5Core) $SLKCFLAGS" +else + export CXXFLAGS="$(pkg-config --cflags QtCore) $SLKCFLAGS" +fi export CFLAGS="$SLKCFLAGS" export CPPFLAGS="-DU_USING_ICU_NAMESPACE=1" export HARFBUZZ_LIBS="-lharfbuzz-icu -lharfbuzz" |