diff options
| -rw-r--r-- | system/sakura/doinst.sh | 4 | ||||
| -rw-r--r-- | system/sakura/sakura.SlackBuild | 18 | ||||
| -rw-r--r-- | system/sakura/sakura.info | 12 |
3 files changed, 20 insertions, 14 deletions
diff --git a/system/sakura/doinst.sh b/system/sakura/doinst.sh index 85aad974d0ab0..854e20633d669 100644 --- a/system/sakura/doinst.sh +++ b/system/sakura/doinst.sh @@ -1,3 +1,3 @@ -if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database &> /dev/null +if [ -x /usr/bin/update-desktop-database ]; then + ./usr/bin/update-desktop-database -q usr/share/applications fi diff --git a/system/sakura/sakura.SlackBuild b/system/sakura/sakura.SlackBuild index 79cdab331378c..ad59bfab6de88 100644 --- a/system/sakura/sakura.SlackBuild +++ b/system/sakura/sakura.SlackBuild @@ -2,12 +2,14 @@ # Slackware build script for sakura # Written by Erik Hanson erik@slackbuilds.org +# Updated by Kristaps Esterlins <esterlinsh@gmail.com> PRGNAM=sakura -VERSION=1.1.5 +VERSION=${VERSION:-2.2.0} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -20,6 +22,8 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi rm -rf $PKG @@ -29,17 +33,19 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 cd $PRGNAM-$VERSION chown -R root:root . -chmod -R u+w,go+r-w,a-s . - -# MOBS: My Own Build System (clever, eh?) -./0 --prefix=/usr || exit 1 +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; +cmake -DCMAKE_INSTALL_PREFIX=/usr . || exit 1 make || exit 1 make install DESTDIR=$PKG || exit 1 strip --strip-unneeded $PKG/usr/bin/sakura mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install $PKG/usr/share/applications -cp -a AUTHORS Changelog GPL INSTALL $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS GPL INSTALL $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/sakura/sakura.info b/system/sakura/sakura.info index f2d6a7efa711a..5bae92d26727c 100644 --- a/system/sakura/sakura.info +++ b/system/sakura/sakura.info @@ -1,8 +1,8 @@ PRGNAM="sakura" -VERSION="1.1.5" +VERSION="2.2.0" HOMEPAGE="http://pleyades.net/david/sakura.php" -DOWNLOAD="http://pleyades.net/david/projects/sakura/sakura-1.1.5.tar.bz2" -MD5SUM="edb0f6f4a7abb630890949886a94ac73" -MAINTAINER="Erik Hanson" -EMAIL="erik@slackbuilds.org" -APPROVED="rworkman" +DOWNLOAD="http://pleyades.net/david/projects/sakura/sakura-2.2.0.tar.bz2" +MD5SUM="452b5059f5dc37a3845ec11a0e46b5b1" +MAINTAINER="Kristaps Esterlinsh" +EMAIL="esterlinsh@gmail.com" +APPROVED="David Somero" |