1 files changed, 18 insertions, 14 deletions
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 5b5206dc21..2015eba2b6 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -26,13 +26,14 @@
 # New maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
 
 PRGNAM=mumble
-VERSION=${VERSION:-1.2.11}
+VERSION=${VERSION:-1.2.16}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 G15=${G15:-no}
 OVERLAY=${OVERLAY:-no}
 COMPAT32=${COMPAT32:-no}
+SPEECHD=${SPEECHD:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -72,6 +73,10 @@ if [ "$OVERLAY" = "no" ]; then
   BUILD_OVERLAY="CONFIG+=no-overlay"
 fi
 
+if [ "$SPEECHD" = "no" ]; then
+  BUILD_SPEECHD="CONFIG+=no-speechd"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -82,14 +87,15 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-qmake \
-  -recursive \
-  main.pro \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Mumble won't find the speechd header without this
+patch -p1 < $CWD/libspeechd_header.patch
+
+qmake -recursive main.pro \
   QMAKE_CFLAGS+="$SLKCFLAGS" \
   QMAKE_CXXFLAGS+="$SLKCFLAGS" \
   DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \
@@ -97,13 +103,13 @@ qmake \
   CONFIG+=no-server \
   CONFIG+=no-bundled-opus \
   CONFIG+=no-bundled-speex \
-  CONFIG+=no-speechd \
   CONFIG+=no-update \
   CONFIG+=no-embed-qt-translations \
   CONFIG+=no-ice \
   CONFIG+=no-bonjour \
   $BUILD_G15 \
-  $BUILD_OVERLAY
+  $BUILD_OVERLAY \
+  $BUILD_SPEECHD
 
 make release
 
@@ -176,9 +182,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGES LICENSE README README.Linux \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install