From 5df44fd715036018e0532e852dd85064ffce576a Mon Sep 17 00:00:00 2001
From: Larry Hajali <larryhaja[at]gmail[dot]com>
Date: Sun, 2 Dec 2012 12:34:46 -0500
Subject: office/texstudio: Updated for version 2.5.1

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 office/texstudio/doinst.sh            |  1 -
 office/texstudio/gcc-4.7.patch        | 35 -----------------------------------
 office/texstudio/texstudio.SlackBuild | 24 +++++++++---------------
 office/texstudio/texstudio.info       |  6 +++---
 4 files changed, 12 insertions(+), 54 deletions(-)
 delete mode 100644 office/texstudio/gcc-4.7.patch

(limited to 'office')

diff --git a/office/texstudio/doinst.sh b/office/texstudio/doinst.sh
index 1f8ff67ded..3e5691a052 100644
--- a/office/texstudio/doinst.sh
+++ b/office/texstudio/doinst.sh
@@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/office/texstudio/gcc-4.7.patch b/office/texstudio/gcc-4.7.patch
deleted file mode 100644
index 5a9bafafb1..0000000000
--- a/office/texstudio/gcc-4.7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur texstudio2.3.orig/qcodeedit/lib/document/qdocumentcommand.cpp texstudio2.3/qcodeedit/lib/document/qdocumentcommand.cpp
---- texstudio2.3.orig/qcodeedit/lib/document/qdocumentcommand.cpp	2012-02-16 13:16:25.000000000 +0000
-+++ texstudio2.3/qcodeedit/lib/document/qdocumentcommand.cpp	2012-07-10 01:48:50.123060180 +0000
-@@ -22,6 +22,8 @@
- 
- #include "qdocument_p.h"
- 
-+#include "stdint.h"
-+
- /*!
- 	\ingroup document
- 	@{
-diff -Naur texstudio2.3.orig/qtsingleapplication/qtlocalpeer.cpp texstudio2.3/qtsingleapplication/qtlocalpeer.cpp
---- texstudio2.3.orig/qtsingleapplication/qtlocalpeer.cpp	2012-02-16 13:16:25.000000000 +0000
-+++ texstudio2.3/qtsingleapplication/qtlocalpeer.cpp	2012-07-10 01:40:24.169046420 +0000
-@@ -48,9 +48,9 @@
- #include "qtlocalpeer.h"
- #include <QtCore/QCoreApplication>
- #include <QtCore/QTime>
--#if QT_VERSION >= 0x040600
-+#if QT_VERSION >= 0x040600
- #include <QtCore/QProcessEnvironment>
--#endif
-+#endif
- 
- #if defined(Q_OS_WIN)
- #include <QtCore/QLibrary>
-@@ -60,6 +60,7 @@
- #endif
- #if defined(Q_OS_UNIX)
- #include <time.h>
-+#include "unistd.h"
- #endif
- 
- namespace QtLP_Private {
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}
 
diff --git a/office/texstudio/texstudio.info b/office/texstudio/texstudio.info
index 75dc58d607..dabc4ba0f4 100644
--- a/office/texstudio/texstudio.info
+++ b/office/texstudio/texstudio.info
@@ -1,8 +1,8 @@
 PRGNAM="texstudio"
-VERSION="2.3"
+VERSION="2.5.1"
 HOMEPAGE="http://texstudio.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.3.tar.gz"
-MD5SUM="32cde0fe8398ec9b1d434c7ab6f70782"
+DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.5.1.orig.tar.gz"
+MD5SUM="375a794101a6a7b8f2f877d706401f48"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3