diff options
Diffstat (limited to 'audio/rumor')
-rw-r--r-- | audio/rumor/gcc7.diff | 12 | ||||
-rw-r--r-- | audio/rumor/rumor.SlackBuild | 25 |
2 files changed, 31 insertions, 6 deletions
diff --git a/audio/rumor/gcc7.diff b/audio/rumor/gcc7.diff new file mode 100644 index 0000000000..a8c54f20c0 --- /dev/null +++ b/audio/rumor/gcc7.diff @@ -0,0 +1,12 @@ +diff -Naur rumor-1.0.5.orig/src/notator.cc rumor-1.0.5.new/src/notator.cc +--- rumor-1.0.5.orig/src/notator.cc 2010-11-15 18:40:22.000000000 +0100 ++++ rumor-1.0.5.new/src/notator.cc 2017-05-31 15:51:42.014855383 +0200 +@@ -334,7 +334,7 @@ + } + } else { + OctaveTic=(RefPitch_wt>AbsPitch_wt?',':'\''); +- NumTics=(abs(RefPitch_wt-AbsPitch_wt)+3)/7; ++ NumTics=(RefPitch_wt-AbsPitch_wt+3)/7; + RefPitch_wt=AbsPitch_wt; + } + for (int i=0; i<NumTics; i++){ diff --git a/audio/rumor/rumor.SlackBuild b/audio/rumor/rumor.SlackBuild index daeebef2b9..20d031b541 100644 --- a/audio/rumor/rumor.SlackBuild +++ b/audio/rumor/rumor.SlackBuild @@ -1,27 +1,37 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for <rumor> # Written by Michales Michaloudes korgie@gmail.com +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=rumor VERSION=${VERSION:-1.0.5} 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 -CWD=$(pwd) +# 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 +fi + 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" @@ -49,6 +59,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks to archlinux +patch -p1 < $CWD/gcc7.diff + ./autogen.sh CFLAGS="$SLKCFLAGS" \ @@ -82,4 +95,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc #cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE |