diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-04-21 09:15:41 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-04-21 09:15:41 +0000 |
| commit | b028fe50585a80172e99b3ae6d4b98f46aed758d (patch) | |
| tree | 49c5e08f3df9cf53f92262769ee74be704115a3d /libreoffice/build/libreoffice.SlackBuild | |
| parent | 79483736bbd5316833b39de000c09df18e290ad2 (diff) | |
| download | asb-b028fe50585a80172e99b3ae6d4b98f46aed758d.tar.gz asb-b028fe50585a80172e99b3ae6d4b98f46aed758d.tar.xz | |
libreoffice: fix permissions of the TTF fonts in the package. Try to make it compile against gpgme
Diffstat (limited to 'libreoffice/build/libreoffice.SlackBuild')
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index 52c54130..096f125d 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -1149,10 +1149,6 @@ fi # Check for an installed KDE4 and assume Qt4: KDEDIRS=${KDEDIRS:-""} # to avoid "KDEDIRS: unbound variable" if [ ! -z "$KDEDIRS" ]; then - # Stupid but what can I do... LibreOffice detection routines suck: - export KDE4DIR="$KDEDIRS" - export QT4INC="$QT4DIR/include" - export QT4LIB="$QT4DIR/lib${LIBDIRSUFFIX}" KDEOPTS="--enable-kde4" else KDEOPTS="--disable-kde4" @@ -1166,17 +1162,7 @@ else fi # Causes a lot of trouble otherwise: -if ! which gpgme-config 1>/dev/null 2>/dev/null ; then - GPGMEOPTS="--without-system-gpgmepp" -elif [ $(gpgme-config --version |cut -d. -f1) -eq 1 -a $(gpgme-config --version |cut -d. -f2) -lt 9 ]; then - # gpgme < 1.9.0 so don't use the system libs: - GPGMEOPTS="--without-system-gpgmepp" -elif [ "$ARCH" = "x86_64" ]; then - echo "Using system gpgme" - GPGMEOPTS="--with-system-gpgmepp" -else - GPGMEOPTS="--without-system-gpgmepp" -fi +GPGMEOPTS="--without-system-gpgmepp" # Make it install into proper directories: export OOInBase="/usr/lib${LIBDIRSUFFIX}/libreoffice" @@ -1740,8 +1726,8 @@ chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/*odt || true chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/{LICENSE,NOTICE} || true # Fix possible weird permissions: -find ${PKG} -perm 444 -exec chmod 644 {} \; || true -find ${PKG} -perm 555 -exec chmod 755 {} \; || true +find ${PKG} -perm 444 -o -perm 640 -exec chmod 644 {} \; || true +find ${PKG} -perm 555 -o -perm 750 -exec chmod 755 {} \; || true # Add the profile scripts: mkdir -p $PKG/etc/profile.d |