summaryrefslogtreecommitdiffstats
path: root/system/herculesstudio
diff options
context:
space:
mode:
author Niels Horn2012-09-13 22:25:13 +0200
committer Niels Horn2012-09-13 22:25:13 +0200
commit77afa5e670146f5d46816d95058f17da0e59e803 (patch)
tree3ce49d0a9a771f175639c260121af2d4f920a6f9 /system/herculesstudio
parent650b1fd83f7223df1563497684a00099c70cda5b (diff)
downloadslackbuilds-77afa5e670146f5d46816d95058f17da0e59e803.tar.gz
system/herculesstudio: Fixed to build against gcc-4.7
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
Diffstat (limited to 'system/herculesstudio')
-rw-r--r--system/herculesstudio/herculesstudio.SlackBuild9
-rw-r--r--system/herculesstudio/herculesstudio_gcc47.patch20
2 files changed, 26 insertions, 3 deletions
diff --git a/system/herculesstudio/herculesstudio.SlackBuild b/system/herculesstudio/herculesstudio.SlackBuild
index 1a895ad49b..b87343d15a 100644
--- a/system/herculesstudio/herculesstudio.SlackBuild
+++ b/system/herculesstudio/herculesstudio.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for herculesstudio
# a GUI for the Hercules Emulator
-# Copyright 2010-2011 Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2010-2012 Niels Horn, Rio de Janeiro, RJ, Brazil
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,11 +23,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# revision date 2011/08/08
+# revision date 2012/08/09
PRGNAM=herculesstudio
VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PRGUNTARRED=HerculesStudio
@@ -79,6 +79,9 @@ find . \
# Correct "target.path"
sed -i "s,/usr/local/,/usr/,g" $PRGUNTARRED.pro
+# Fix for gcc-4.7
+patch -p0 < $CWD/herculesstudio_gcc47.patch
+
qmake
# Accept our CXXFLAGS
diff --git a/system/herculesstudio/herculesstudio_gcc47.patch b/system/herculesstudio/herculesstudio_gcc47.patch
new file mode 100644
index 0000000000..cbc6136b97
--- /dev/null
+++ b/system/herculesstudio/herculesstudio_gcc47.patch
@@ -0,0 +1,20 @@
+--- HercStudio/HerculesExecutor.cpp 2011-07-13 03:13:06.000000000 -0300
++++ HercStudio_patched/HerculesExecutor.cpp 2012-08-09 15:34:30.000000000 -0300
+@@ -28,6 +28,7 @@
+ #include "NamedPipe.h"
+
+ #include <cstdio>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+--- HercStudio/MainWindow.cpp 2011-07-13 03:13:06.000000000 -0300
++++ HercStudio_patched/MainWindow.cpp 2012-08-09 15:46:50.000000000 -0300
+@@ -57,6 +57,7 @@
+ #include <QTimer>
+
+ #include <iostream>
++#include <unistd.h>
+ #include "cerrno"
+ #ifndef hFramework
+ #include <err.h>