5 files changed, 9 insertions, 51 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
diff --git a/multimedia/2ManDVD/2ManDVD.info b/multimedia/2ManDVD/2ManDVD.info
index 6998baf72d..1ed7086f15 100644
--- a/multimedia/2ManDVD/2ManDVD.info
+++ b/multimedia/2ManDVD/2ManDVD.info
@@ -1,8 +1,8 @@
 PRGNAM="2ManDVD"
-VERSION="1.7.2"
+VERSION="1.8.4"
 HOMEPAGE="http://2mandvd.tuxfamily.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/2ManDVD-1.7.2.tar.gz"
-MD5SUM="2b060c2a2a996fb7e3503a134a0ffca0"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/2ManDVD-1.8.4.tar.gz"
+MD5SUM="2e362b6d963b0698ee4911d28865d50d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dvdauthor exif ffmpeg ffmpegthumbnailer mjpegtools transcode"
diff --git a/multimedia/2ManDVD/2mandvd-fix-const-char-concatenation.patch b/multimedia/2ManDVD/2mandvd-fix-const-char-concatenation.patch
deleted file mode 100644
index 1a5fd1c0a8..0000000000
--- a/multimedia/2ManDVD/2mandvd-fix-const-char-concatenation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 2ManDVD/mainfrm.cpp.orig	2010-07-04 15:28:28.000000030 +0200
-+++ 2ManDVD/mainfrm.cpp	2010-07-04 15:29:26.670000516 +0200
-@@ -1045,8 +1045,8 @@
- 	outext << "growisofs" << endl;
- 	outext << "mpeg2enc" << endl;
-         outext << "jpegtopnm /dev/null" << endl;
--        outext << "cat " + qApp->applicationDirPath() + "/fake.pl" << endl;
--        outext << "rm -f " + homeDir.path() + "/.mdvdep.sh" << endl;
-+        outext << "cat " << qApp->applicationDirPath() << "/fake.pl" << endl;
-+        outext << "rm -f " << homeDir.path() << "/.mdvdep.sh" << endl;
- 	outext << "exit" << endl;
- 	wmyficext.close();
- 	QString programf = "bash";
diff --git a/multimedia/2ManDVD/README b/multimedia/2ManDVD/README
index a75aef6e11..14fdef0d99 100644
--- a/multimedia/2ManDVD/README
+++ b/multimedia/2ManDVD/README
@@ -1,6 +1,3 @@
 2ManDVD is a full featured dvd authoring application with a nice looking
 qt interface written by Stéphane Gibault.  It's the successor of ManDVD
 written for qt4 and webkit.
-
-This requires ffmpeg, transcode, dvdauthor, exif, mjpegtools and 
-ffmpegthumbnailer.
diff --git a/multimedia/2ManDVD/acquia_marina_logo.png b/multimedia/2ManDVD/acquia_marina_logo.png
deleted file mode 100644
index 1f95f0b9c9..0000000000
--- a/multimedia/2ManDVD/acquia_marina_logo.png
+++ /dev/null