4 files changed, 48 insertions, 57 deletions
diff --git a/multimedia/mscore/doinst.sh b/multimedia/mscore/doinst.sh
index 5fb28930db..9a8ded3c60 100644
--- a/multimedia/mscore/doinst.sh
+++ b/multimedia/mscore/doinst.sh
@@ -1,3 +1,7 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
diff --git a/multimedia/mscore/mscore.SlackBuild b/multimedia/mscore/mscore.SlackBuild
index e669c9515a..3853d213c7 100644
--- a/multimedia/mscore/mscore.SlackBuild
+++ b/multimedia/mscore/mscore.SlackBuild
@@ -1,19 +1,16 @@
 #!/bin/sh
 # Slackware build script for mscore
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Maintained by Klaatu at memeber.fsf dot org
 
-SRCNAM=MuseScore
 PRGNAM=mscore
-VERSION=${VERSION:-0.9.5}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -23,28 +20,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION/$PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -52,41 +35,45 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Remove unneeded *.ts locale files
-sed -i '/\.ts/d' share/locale/CMakeLists.txt
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  #must hardcode arch or it fails as 32bit
+  sed -i 's|m32|m64|' ./$PRGNAM/CMakeLists.txt
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
 
-# fix .desktop file.
+# touchup the .desktop file
 sed -i \
   -e '/^Categories/s|=.*|=Application;Qt;AudioVideo;|' \
-  -e 's|true|false|' packaging/mscore.desktop
+  -e 's|true|false|' ./$PRGNAM/packaging/mscore.desktop
 
-# This would build QtScript bindings, which are already present in
-# 13.0's qtscriptgenerator package
-sed -i 's|scriptgen ||' CMakeLists.txt
+  make release PREFIX=/usr
+  make install PREFIX=/usr DESTDIR=$PKG
 
-mkdir build && cd build
-  lrelease ../share/locale/*.ts
-  cmake \
-    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -DQT_NO_DEBUG" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=$LIBDIRSUFFIX \
-    -DQT45=TRUE \
-    -DCMAKE_BUILD_TYPE=Release \
-    ..
+# include the icon file
+install -D -m 0644 ./$PRGNAM/packaging/mscore.desktop \
+  $PKG/usr/share/applications/mscore.desktop
+install -D -m 0644 ./$PRGNAM/mscore/data/mscore.xpm \
+  $PKG/usr/share/pixmaps/mscore.xpm
 
-  make
-  make install DESTDIR=$PKG
-cd -
+mkdir -p $PKG/usr/man/man1
+gzip -9c ./$PRGNAM/packaging/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/man/man1
-gzip -9c packaging/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ChangeLog COPYING NEWS README* \
+  ./$PRGNAM/{ChangeLog,COPYING,NEWS,README,README.scripts} \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/multimedia/mscore/mscore.info b/multimedia/mscore/mscore.info
index b49d48dbe9..621ef6127d 100644
--- a/multimedia/mscore/mscore.info
+++ b/multimedia/mscore/mscore.info
@@ -1,10 +1,10 @@
 PRGNAM="mscore"
-VERSION="0.9.5"
+VERSION="1.2"
 HOMEPAGE="http://www.musescore.org/"
-DOWNLOAD="http://downloads.sourceforge.net/mscore/MuseScore-0.9.5.tar.bz2"
-MD5SUM="b7f50484eff0681d837b5ac41dbfc04d"
+DOWNLOAD="http://downloads.sourceforge.net/project/mscore/mscore/MuseScore-1.2/mscore-1.2.tar.bz2"
+MD5SUM="9dd182ab3b6a80dae33d3cfe3ff08ef9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="pprkut"
+MAINTAINER="Klaatu"
+EMAIL="klaatu@member.fsf.org"
+APPROVED="dsomero"
diff --git a/multimedia/mscore/slack-desc b/multimedia/mscore/slack-desc
index 09f0f0ae11..03fcd0ae7a 100644
--- a/multimedia/mscore/slack-desc
+++ b/multimedia/mscore/slack-desc
@@ -7,13 +7,13 @@
 
       |-----handy-ruler------------------------------------------------------|
 mscore: mscore (WYSIWYG Music Score Typesetter)
-mscore: 
+mscore:
 mscore: MuseScore is a free cross platform WYSIWYG music notation program,
 mscore: licenced under GNU GPL.
-mscore: 
+mscore:
 mscore: Homepage: http://www.musescore.org/
-mscore: 
-mscore: 
-mscore: 
-mscore: 
-mscore: 
+mscore:
+mscore:
+mscore:
+mscore:
+mscore: