1 files changed, 6 insertions, 32 deletions
diff --git a/multimedia/2ManDVD/2ManDVD.SlackBuild b/multimedia/2ManDVD/2ManDVD.SlackBuild
index 362c6858e9..fb79f929f3 100644
--- a/multimedia/2ManDVD/2ManDVD.SlackBuild
+++ b/multimedia/2ManDVD/2ManDVD.SlackBuild
@@ -7,7 +7,7 @@
 # Modified by the slackbuilds.org project.
 
 PRGNAM=2ManDVD
-VERSION=${VERSION:-1.7.2}
+VERSION=${VERSION:-1.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,7 +44,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM
 chown -R root:root .
 find . \
@@ -53,15 +53,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# patch to fix const char concatenation - tnx to hwoarang from gentoo
-patch -p1 < $CWD/2mandvd-fix-const-char-concatenation.patch
-
-# Fix installation path
-for file in mainfrm.cpp media_browser.cpp rendering.cpp; do
-  sed -i "s:qApp->applicationDirPath().\?+.\?\":\"/usr/share/$PRGNAM/:" $file
-done
-
-sed -i "s:qApp->applicationDirPath():\"/usr/share/$PRGNAM/\":" mainfrm.cpp
+sed -i "s|^unix.*||" $PRGNAM.pro
+sed -i "s|^ICONS_DIR.path.*|ICONS_DIR.path = /usr/share/pixmaps|" $PRGNAM.pro
+sed -i "s|^Icon=/usr/share/2ManDVD|Icon=/usr/share/pixmaps|" $PRGNAM.desktop
 
 qmake \
   QMAKE_CFLAGS="$SLKCFLAGS" \
@@ -69,27 +63,7 @@ qmake \
   $PRGNAM.pro
 
 make
-
-install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
-install -D -m 0644 $CWD/acquia_marina_logo.png $PKG/usr/share/pixmaps/mandvdico.png
-
-mkdir -p $PKG/usr/share/$PRGNAM
-chmod -R 0755 Bibliotheque Interface
-cp -a \
-  Bibliotheque Interface 2mandvd_*.qm 2mandvd_*.ts *.pl \
-  $PKG/usr/share/$PRGNAM
-
-# Make desktop entry
-mkdir -p $PKG/usr/share/applications
-echo "[Desktop Entry]
-Name=2ManDVD
-Type=Application
-Comment=Tool for creating DVD Video
-Exec=2ManDVD
-Icon=mandvdico
-Terminal=false
-Categories=Qt;AudioVideo;Video;" \
-> $PKG/usr/share/applications/2ManDVD.desktop
+make install INSTALL_ROOT=$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