diff options
| author |   Eric Hameleers <alien@slackware.com> | 2022-09-16 20:05:03 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2022-09-16 20:05:03 +0000 |
| commit | 552d7d9b74a153f4fe6f4667b825d1beccc12746 (patch) | |
| tree | 582c4a49977c9e2e3318e4230bb7dcd40d3f2743 | |
| parent | a82e9208a75150ebfea3289eb0a999f28519db86 (diff) | |
| download | asb-552d7d9b74a153f4fe6f4667b825d1beccc12746.tar.gz asb-552d7d9b74a153f4fe6f4667b825d1beccc12746.tar.xz | |
libreoffice: support compilation against gpgme 1.18.0
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index bd055591..5e29c006 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -1147,7 +1147,7 @@ else rm -rf $PKG5/* # always erase old package's contents rm -rf $PKG6-*/* # always erase old package's contents rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build - rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log + rm -rf $OUTPUT/{autoconf,configure,make,install,error,makepkg}-$PRGNAM.log # remove old log files fi @@ -1243,6 +1243,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 + # Don't fail when compiling against gpgme 1.18.0: + cat $SRCDIR/patches/libreoffice.gpgme-1.18.0.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 \\' @@ -1374,8 +1377,10 @@ fi # Never hurts: aclocal -I m4 -autoconf -v -./autogen.sh \ +# We patch configure.ac: +autoreconf -vif \ + 2>&1 | tee $OUTPUT/autoconf-${PRGNAM}.log +./configure \ --prefix=/usr \ --docdir=/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} \ --libdir=/usr/lib${LIBDIRSUFFIX} \ |