1 files changed, 15 insertions, 16 deletions
diff --git a/multimedia/2ManDVD/2ManDVD.SlackBuild b/multimedia/2ManDVD/2ManDVD.SlackBuild
index f4db46c972..3bae503064 100644
--- a/multimedia/2ManDVD/2ManDVD.SlackBuild
+++ b/multimedia/2ManDVD/2ManDVD.SlackBuild
@@ -7,16 +7,14 @@
 # Modified by the slackbuilds.org project.
 
 PRGNAM=2ManDVD
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.3.5}
 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
@@ -55,6 +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
@@ -69,17 +70,15 @@ qmake \
 
 make
 
-install -D -m0755 $PRGNAM $PKG/usr/bin/$PRGNAM
-install -D -m0644 Interface/mandvdico.png $PKG/usr/share/pixmaps/mandvdico.png
+install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+install -D -m 0644 Interface/mandvdico.png $PKG/usr/share/pixmaps/mandvdico.png
+
 mkdir -p $PKG/usr/share/$PRGNAM
-chmod -R 755 Bibliotheque Interface
-cp -R \
-  Bibliotheque Interface 2mandvd_*.qm 2mandvd_*.ts *.wav *.pl \
+chmod -R 0755 Bibliotheque Interface
+cp -a \
+  Bibliotheque Interface 2mandvd_*.qm 2mandvd_*.ts *.pl \
   $PKG/usr/share/$PRGNAM
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 # Make desktop entry
 mkdir -p $PKG/usr/share/applications
 echo "[Desktop Entry]
@@ -89,13 +88,14 @@ Comment=Tool for creating DVD Video
 Exec=2ManDVD
 Icon=mandvdico
 Terminal=false
-Categories=Application;Qt;AudioVideo;Video;" \
+Categories=Qt;AudioVideo;Video;" \
 > $PKG/usr/share/applications/2ManDVD.desktop
 
+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 \
-  COPYING README.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -104,4 +104,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-