diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-17 13:13:10 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-19 12:09:25 +0700 |
| commit | 2e4068ad27de37e79b99c059428d9a382255410b (patch) | |
| tree | db56584aca05b4d0c06c2b69b809d8b3df0f4b47 | |
| parent | e907e33573522fc95b33005dc159eaa2475352c2 (diff) | |
| download | slackbuilds-2e4068ad27de37e79b99c059428d9a382255410b.tar.gz | |
office/beaver: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | office/beaver/beaver.SlackBuild | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/office/beaver/beaver.SlackBuild b/office/beaver/beaver.SlackBuild index a4110f4a28..9b546dcbb6 100644 --- a/office/beaver/beaver.SlackBuild +++ b/office/beaver/beaver.SlackBuild @@ -22,25 +22,26 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220217 bkw: Modified by SlackBuilds.org, BUILD=2: +# - fix 15.0 build. +# - do not install useless INSTALL in doc dir. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=beaver VERSION=${VERSION:-0.4.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,8 +51,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -75,11 +76,13 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ + +sed -i '/void *refresh_markers/s,inline,,' src/editor.c -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -93,15 +96,12 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make V=1 -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +make install-strip DESTDIR=$PKG gzip -9 $PKG/usr/man/man?/*.? mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ +cp -a AUTHORS COPYING ChangeLog NEWS README THANKS TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild |