diff options
| -rw-r--r-- | system/herculesstudio/herculesstudio.SlackBuild | 20 | ||||
| -rw-r--r-- | system/herculesstudio/herculesstudio.info | 6 | ||||
| -rw-r--r-- | system/herculesstudio/herculesstudio_gcc47.patch | 20 | ||||
| -rw-r--r-- | system/herculesstudio/slack-desc | 10 |
4 files changed, 14 insertions, 42 deletions
diff --git a/system/herculesstudio/herculesstudio.SlackBuild b/system/herculesstudio/herculesstudio.SlackBuild index b87343d15ae5..c45c3d89f52d 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-2012 Niels Horn, Rio de Janeiro, RJ, Brazil +# Copyright 2010-2013 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 2012/08/09 +# revision date 2013/03/25 PRGNAM=herculesstudio -VERSION=${VERSION:-1.3.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PRGUNTARRED=HerculesStudio @@ -64,11 +64,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -# the tarball untars in the current directory... -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION +rm -rf $PRGUNTARRED tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz +cd $PRGUNTARRED chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -76,12 +74,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# 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.info b/system/herculesstudio/herculesstudio.info index 4f82593241e4..07ada66172e0 100644 --- a/system/herculesstudio/herculesstudio.info +++ b/system/herculesstudio/herculesstudio.info @@ -1,8 +1,8 @@ PRGNAM="herculesstudio" -VERSION="1.3.0" +VERSION="1.4.0" HOMEPAGE="http://www.mvsdasd.org/hercstudio/" -DOWNLOAD="http://www.mvsdasd.org/hercstudio/herculesstudio-1.3.0-src.tar.gz" -MD5SUM="79c2f6bb9de1a572f113e89d9f7e32f8" +DOWNLOAD="http://www.mvsdasd.org/hercstudio/herculesstudio-1.4.0-src.tar.gz" +MD5SUM="58d6643a97ce80df44bf655a5ac23c6c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="hercules" diff --git a/system/herculesstudio/herculesstudio_gcc47.patch b/system/herculesstudio/herculesstudio_gcc47.patch deleted file mode 100644 index cbc6136b97ac..000000000000 --- a/system/herculesstudio/herculesstudio_gcc47.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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> diff --git a/system/herculesstudio/slack-desc b/system/herculesstudio/slack-desc index 599be5b17a7f..740342c04e74 100644 --- a/system/herculesstudio/slack-desc +++ b/system/herculesstudio/slack-desc @@ -1,9 +1,9 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| herculesstudio: herculesstudio (Hercules GUI for Linux) |