4 files changed, 31 insertions, 35 deletions
diff --git a/audio/rosegarden/README b/audio/rosegarden/README
index 74d6a17fbc..45fd0513cd 100644
--- a/audio/rosegarden/README
+++ b/audio/rosegarden/README
@@ -2,12 +2,7 @@ Rosegarden is an attractive, user-friendly MIDI and audio sequencer,
 notation editor, and general-purpose music composition and editing
 application for Unix and Linux.
 
-This will need the kde3-compat libs from /extra to build.
+Rosegarden requires jack-audio-connection-kit, ladspa_sdk, dssi, liblo,
+lirc, liblrdf, lilypond, libsamplerate and libsndfile.
 
-Aditionally fftw and jack-audio-connection-kit are required.
-liblo, liblrdf and ladspa_sdk are optional dependencies, and will be
-used if available at build time.
-LIRC is another optional dependency; if you want lirc-support, you
-will have to pass LIRC=yes to the script.
-Further rosegarden makes use of xml-twig and lilypond at runtime.
-All dependencies (required and optional) are available at SlackBuilds.org.
+rosegarden can also make use of perl-xml-twig at runtime.
diff --git a/audio/rosegarden/doinst.sh b/audio/rosegarden/doinst.sh
index 6321aafd8b..777cd750a2 100644
--- a/audio/rosegarden/doinst.sh
+++ b/audio/rosegarden/doinst.sh
@@ -6,3 +6,9 @@ if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/audio/rosegarden/rosegarden.SlackBuild b/audio/rosegarden/rosegarden.SlackBuild
index 2b79be4066..545cf6d28d 100644
--- a/audio/rosegarden/rosegarden.SlackBuild
+++ b/audio/rosegarden/rosegarden.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rosegarden
 
-# Copyright 2007-2009 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2007-2010 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 # No additional license terms  :-)
 
 PRGNAM=rosegarden
-VERSION=1.7.3
+VERSION=10.04.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -36,10 +36,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Pass LIRC=yes on command line when running this script if you
-# want to build with lirc-support
-LIRC=${LIRC:-no}
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -48,13 +44,7 @@ elif [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX=""
-fi
-
-if [ "$LIRC" = 'yes' ]; then
-  LIRCOPT='On'
-else
-  LIRCOPT='Off'
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -62,9 +52,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-10.04
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+cd $PRGNAM-10.04
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -72,21 +62,26 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cmake \
-  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DLIB_SUFFIX="$LIBDIRSUFFIX" \
-  -DWANT_LIRC=$LIRCOPT
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --with-qtdir=/usr/lib$LIBDIRSUFFIX/qt \
+  --build=$ARCH-slackware-linux
 
 make
+
 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL README TRANSLATORS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CONTRIBUTING COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/rosegarden/rosegarden.info b/audio/rosegarden/rosegarden.info
index c959bc387b..37afb8276b 100644
--- a/audio/rosegarden/rosegarden.info
+++ b/audio/rosegarden/rosegarden.info
@@ -1,10 +1,10 @@
 PRGNAM="rosegarden"
-VERSION="1.7.3"
+VERSION="10.04.1"
 HOMEPAGE="http://www.rosegardenmusic.com"
-DOWNLOAD="http://downloads.sourceforge.net/rosegarden/rosegarden-1.7.3.tar.bz2"
+DOWNLOAD="http://downloads.sourceforge.net/rosegarden/rosegarden-10.04.1.tar.bz2"
+MD5SUM="dc7e7aadc146ba8117cf46247baa85b7"
 DOWNLOAD_x86_64=""
-MD5SUM="122eab42e375d2f3b009c8540ae8069c"
 MD5SUM_x86_64=""
-MAINTAINER="pprkut"
+MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="rworkman"
+APPROVED=""