From c79a84612163d7ea0ca0537e6daaccaddc056f3d Mon Sep 17 00:00:00 2001
From: Larry Hajali
Date: Wed, 1 Aug 2012 09:01:21 -0300
Subject: office/texstudio: Patched for gcc-4.7

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 office/texstudio/gcc-4.7.patch        | 35 +++++++++++++++++++++++++++++++++++
 office/texstudio/texstudio.SlackBuild |  5 ++++-
 office/texstudio/texstudio.info       |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 office/texstudio/gcc-4.7.patch

(limited to 'office')

diff --git a/office/texstudio/gcc-4.7.patch b/office/texstudio/gcc-4.7.patch
new file mode 100644
index 0000000000..5a9bafafb1
--- /dev/null
+++ b/office/texstudio/gcc-4.7.patch
@@ -0,0 +1,35 @@
+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 0cb05b7c69..8d88d3f44f 100644
--- a/office/texstudio/texstudio.SlackBuild
+++ b/office/texstudio/texstudio.SlackBuild
@@ -6,7 +6,7 @@
 
 PRGNAM=texstudio
 VERSION=${VERSION:-2.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,6 +54,9 @@ 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 PREFIX=/usr LIBS+="-L/usr/lib${LIBDIRSUFFIX}" CONFIG-=debug -o Makefile $PRGNAM.pro
 
 make \
diff --git a/office/texstudio/texstudio.info b/office/texstudio/texstudio.info
index 6d89d823cd..ad16ee3c0c 100644
--- a/office/texstudio/texstudio.info
+++ b/office/texstudio/texstudio.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="dsomero,Niels Horn"
-- 
cgit v1.2.3