diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-12-16 23:52:47 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-12-16 23:52:47 +0000 |
| commit | 3b6126c9541113b366cbeac3ac08f7516ca5d35f (patch) | |
| tree | 366120807d5ac905b71c87951029adee1d58d015 /libreoffice/build/libreoffice.SlackBuild | |
| parent | 792cccb00a38fea4afceff7c03ea9bb5db248982 (diff) | |
| download | asb-3b6126c9541113b366cbeac3ac08f7516ca5d35f.tar.gz asb-3b6126c9541113b366cbeac3ac08f7516ca5d35f.tar.xz | |
libreoffice: take advantage of graphite2 being installed on the system
Diffstat (limited to 'libreoffice/build/libreoffice.SlackBuild')
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index 8c399c5b..15eb062b 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -1158,7 +1158,7 @@ echo Building ... # Apply our own (or borrowed) patches. if [ "$P1" != "--oldbuild" ]; then touch $OUTPUT/patch-$PRGNAM.log - # Allow building with '--with-system-icw --without-system-harfbuzz' + # Allow building with '--with-system-icu --without-system-harfbuzz' cat $SRCDIR/patches/libreoffice5.harfbuzz-icu.patch \ | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log # Allow building against boost-1.69.0: @@ -1214,6 +1214,16 @@ else QTOPTS="--disable-qt5" fi +# If graphite2 is installed we can use the system harfbuzz: +if /usr/bin/pkg-config --exists graphite2 ; then + HARFBUZZOPTS=" --with-system-icu \ + --with-system-graphite \ + --with-system-harfbuzz " +else + HARFBUZZOPTS=" --with-system-icu \ + --without-system-harfbuzz " +fi + # Determine whether we will use gstreamer 0,10 or 1.0: if /usr/bin/pkg-config --exists gstreamer-1.0 ; then GSTOPTS="--disable-gstreamer-0-10 --enable-gstreamer-1-0" @@ -1300,6 +1310,7 @@ autoconf -v --with-vendor="Slackware Team ($PACKAGER)" \ ${GITOPTS} \ ${GSTOPTS} \ + ${HARFBUZZOPTS} \ ${KDEOPTS} \ ${GDRIVEOPTS} \ ${GPGMEOPTS} \ @@ -1328,7 +1339,6 @@ autoconf -v --with-system-curl \ --with-system-dicts \ --with-system-expat \ - --with-system-icu \ --with-system-neon \ --with-system-nss \ --with-system-libxml \ @@ -1339,7 +1349,6 @@ autoconf -v --without-junit \ --without-krb5 \ --without-myspell-dicts \ - --without-system-harfbuzz \ --without-system-jars \ --without-system-jpeg \ --without-system-lcms2 \ |