diff options
| -rw-r--r-- | games/zsnes/0012-Fix-build-with-gcc-4.7.patch | 24 | ||||
| -rw-r--r-- | games/zsnes/zsnes.SlackBuild | 7 | ||||
| -rw-r--r-- | games/zsnes/zsnes.desktop | 2 |
3 files changed, 31 insertions, 2 deletions
diff --git a/games/zsnes/0012-Fix-build-with-gcc-4.7.patch b/games/zsnes/0012-Fix-build-with-gcc-4.7.patch new file mode 100644 index 0000000000..2c29f5be43 --- /dev/null +++ b/games/zsnes/0012-Fix-build-with-gcc-4.7.patch @@ -0,0 +1,24 @@ +From: Etienne Millon <etienne.millon@gmail.com> +Date: Thu, 12 Apr 2012 18:01:45 +0200 +Subject: Fix build with gcc 4.7 + +Headers in the new C++ library do not implicitly import unistd.h, so it is +necessary to do it in the source. + +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667429 +--- + src/tools/depbuild.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tools/depbuild.cpp b/src/tools/depbuild.cpp +index 1e4bbc5..ea0854c 100644 +--- a/src/tools/depbuild.cpp ++++ b/src/tools/depbuild.cpp +@@ -25,6 +25,7 @@ This program generates dependencies for all C/C++/Assembly files + #include <string> + #include <cstdio> + #include <cstdlib> ++#include <unistd.h> + using namespace std; + + #include "fileutil.h" diff --git a/games/zsnes/zsnes.SlackBuild b/games/zsnes/zsnes.SlackBuild index ba5dad0440..089a46a2d7 100644 --- a/games/zsnes/zsnes.SlackBuild +++ b/games/zsnes/zsnes.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for zsnes # Copyright (c) 2008, Antonio Hernández Blas <hba.nihilismus@gmail.com> +# Copyright (c) 2010, 2012, Carlos Corbacho <carlos@strangeworlds.co.uk> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -23,7 +24,7 @@ PRGNAM=zsnes VERSION=1.51b -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} ZSNESSRC="$(echo $VERSION | tr -d .)src" @@ -64,6 +65,10 @@ tar xvf $CWD/$PRGNAM$ZSNESSRC.tar.bz2 mv $PRGNAM$ZSNESDIR $PRGNAM-$VERSION mv $PRGNAM-$VERSION/src/* $PRGNAM-$VERSION cd $PRGNAM-$VERSION + +# GCC 4.7 fixes from Debian +cat $CWD/0012-Fix-build-with-gcc-4.7.patch | patch -p2 --verbose + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/games/zsnes/zsnes.desktop b/games/zsnes/zsnes.desktop index 61b9fc4dc2..72564bc9bf 100644 --- a/games/zsnes/zsnes.desktop +++ b/games/zsnes/zsnes.desktop @@ -5,7 +5,7 @@ Exec=zsnes Icon=zsnes Terminal=false Type=Application -Categories=GNOME;GTK;Qt;KDE;Game; +Categories=Application;Game;Emulator StartupNotify=false GenericName=ZSNES Emulator X-KDE-StartupNotify=false |