multimedia/mscore: Updated for version 0.9.5

4 files changed, 48 insertions, 56 deletions

diff --git a/multimedia/mscore/README b/multimedia/mscore/README
index 234e6a63b4..fdf132385f 100644
--- a/multimedia/mscore/README
+++ b/multimedia/mscore/README
@@ -1,6 +1,14 @@
 MuseScore is a free cross platform WYSIWYG music notation
-program, licenced under GNU GPL.
+program, licenced under GNU GPL. Features:
+  * WYSIWYG, notes are entered on a "virtual note sheet"
+  * unlimited number of staves
+  * up to four voices/staff
+  * easy and fast note entry with mouse, keyboard or midi
+  * integrated sequencer and FluidSynth software synthesizer
+  * import and export of MusicXml and standard midifiles (SMF)
+  * platform independent code for Linux, Windows and Mac
 
-Requires Qt4.
+Requires libsndfile (available at slackbuilds.org).
 
-Optionally jack-audio-connection-kit portaudio.
\ No newline at end of file
+Optionally jack-audio-connection-kit and portaudio can be used
+if installed (available at slackbuilds.org).
\ No newline at end of file
diff --git a/multimedia/mscore/mscore.SlackBuild b/multimedia/mscore/mscore.SlackBuild
index 5dd06aa167..92fb93b3ed 100644
--- a/multimedia/mscore/mscore.SlackBuild
+++ b/multimedia/mscore/mscore.SlackBuild
@@ -2,8 +2,9 @@
 # Slackware build script for mscore
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
+SRCNAM=MuseScore
 PRGNAM=mscore
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.9.5}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -15,10 +16,13 @@ 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"
 fi
 
 set -e
@@ -27,7 +31,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION/$PRGNAM
 chown -R root:root .
 find . \
@@ -36,15 +40,28 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p1 < $CWD/translations.diff
+# Remove unneeded *.ts locale files
+sed -i '/\.ts/d' share/locale/CMakeLists.txt
+
+# fix .desktop file.
+sed -i \
+  -e '/^Categories/s|=.*|=Application;Qt;AudioVideo;|' \
+  -e 's|true|false|' packaging/mscore.desktop
+
+# This would build QtScript bindings, which are already present in
+# 13.0's qtscriptgenerator package
+sed -i 's|scriptgen ||' CMakeLists.txt
+
+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 \
+    ..
 
-mkdir build
-cd build
-  lrelease-qt4 ../share/locale/*.ts
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_BUILD_TYPE="$ARCH-slackware-linux" ..
   make
   make install DESTDIR=$PKG
 cd -
@@ -58,12 +75,11 @@ cd -
 
 mkdir -p $PKG/usr/man/man1
 gzip -9c packaging/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-sed -i '/Categories/d' $PKG/usr/share/applications/$PRGNAM.desktop
-echo "Categories=Application;Qt;AudioVideo;" >> \
-      $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ChangeLog COPYING NEWS README* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -71,4 +87,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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/mscore/mscore.info b/multimedia/mscore/mscore.info
index f3ee97a95a..2e189c56c9 100644
--- a/multimedia/mscore/mscore.info
+++ b/multimedia/mscore/mscore.info
@@ -1,8 +1,10 @@
 PRGNAM="mscore"
-VERSION="0.9.4"
+VERSION="0.9.5"
 HOMEPAGE="http://www.musescore.org/"
-DOWNLOAD="http://downloads.sourceforge.net/sourceforge/mscore/mscore-0.9.4.tar.bz2"
-MD5SUM="3fc3455076646bf95e3f4327a1f923ef"
+DOWNLOAD="http://downloads.sourceforge.net/mscore/MuseScore-0.9.5.tar.bz2"
+DOWNLOAD_x86_64=""
+MD5SUM="b7f50484eff0681d837b5ac41dbfc04d"
+MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="pprkut"
diff --git a/multimedia/mscore/translations.diff b/multimedia/mscore/translations.diff
deleted file mode 100644
index 776ae83178..0000000000
--- a/multimedia/mscore/translations.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur mscore.orig/share/locale/CMakeLists.txt mscore/share/locale/CMakeLists.txt
---- mscore.orig/share/locale/CMakeLists.txt	2009-02-06 10:34:11.000000000 +0000
-+++ mscore/share/locale/CMakeLists.txt	2009-04-02 18:04:07.000000000 +0000
-@@ -20,30 +20,17 @@
- 
- install(FILES
-       mscore_de.qm
--      mscore_de.ts
-       mscore_it.qm
--      mscore_it.ts
-       mscore_pt.qm
--      mscore_pt.ts
-       mscore_ru.qm
--      mscore_ru.ts
-       mscore_es.qm
--      mscore_es.ts
-       mscore_fr.qm
--      mscore_fr.ts
-       mscore_nl.qm
--      mscore_nl.ts
-       mscore_cz.qm
--      mscore_cz.ts
--      mscore_gl.ts
-       mscore_gl.qm
--      mscore_tr.ts
-       mscore_tr.qm
--      mscore_hi_IN.ts
-       mscore_hi_IN.qm
--      mscore_pt_BR.ts
-       mscore_pt_BR.qm
--      mscore_en_GB.ts
-       mscore_en_GB.qm
-       DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}locale
-       )