1 files changed, 9 insertions, 15 deletions
diff --git a/office/texstudio/texstudio.SlackBuild b/office/texstudio/texstudio.SlackBuild
index 8d88d3f44f..861d407c6d 100644
--- a/office/texstudio/texstudio.SlackBuild
+++ b/office/texstudio/texstudio.SlackBuild
@@ -5,8 +5,8 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=texstudio
-VERSION=${VERSION:-2.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.5.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -41,9 +41,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}${VERSION}
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd ${PRGNAM}${VERSION}
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.orig.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -54,14 +54,10 @@ find . \
 # Fix .desktop item.
 sed -i -e '/^Encoding/d' -e "/^Icon/s|=.*|=$PRGNAM|" utilities/texstudio.desktop
 
-# Patch from upstream in order to build against gcc 4.7.x.
-patch -p1 < $CWD/gcc-4.7.patch
+qmake LIBS+="-L/usr/lib${LIBDIRSUFFIX}" QMAKE_CFLAGS+="$SLKCFLAGS" \
+  QMAKE_CXXFLAGS+="$SLKCFLAGS" CONFIG-=debug -o Makefile $PRGNAM.pro
 
-qmake PREFIX=/usr LIBS+="-L/usr/lib${LIBDIRSUFFIX}" CONFIG-=debug -o Makefile $PRGNAM.pro
-
-make \
-  CFLAGS="-pipe $SLKCFLAGS -D_REENTRANT -Wall -W \$(DEFINES)" \
-  CXXFLAGS="-pipe $SLKCFLAGS -D_REENTRANT -Wall -W \$(DEFINES)"
+make
 make install INSTALL_ROOT=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -80,9 +76,7 @@ install -D -m 0644 utilities/$PRGNAM.svg \
   $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  INSTALL utilities/{AUTHORS,CHANGELOG.txt,COPYING} \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a utilities/{AUTHORS,CHANGELOG.txt,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -f $PKG/usr/share/$PRGNAM/{COPYING,CHANGELOG.txt,AUTHORS}