diff options
| -rw-r--r-- | games/xye/gcc-4.7.patch | 35 | ||||
| -rw-r--r-- | games/xye/xye.SlackBuild | 20 | ||||
| -rw-r--r-- | games/xye/xye.info | 6 |
3 files changed, 12 insertions, 49 deletions
diff --git a/games/xye/gcc-4.7.patch b/games/xye/gcc-4.7.patch deleted file mode 100644 index d976601cff..0000000000 --- a/games/xye/gcc-4.7.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur xye-0.12.0.orig/src/editorsave.cpp xye-0.12.0/src/editorsave.cpp ---- xye-0.12.0.orig/src/editorsave.cpp 2011-10-29 21:57:28.000000000 +0000 -+++ xye-0.12.0/src/editorsave.cpp 2012-08-05 10:34:00.131028629 +0000 -@@ -662,16 +662,16 @@ - } - saveColorStuff(file, board); - -- int i,j; -+ int j,k; - file << "\t<ground>\n"; - resetSavedPosition(); -- for (i=0;i<XYE_HORZ;i++) for (j=0;j<XYE_VERT;j++) saveGroundObject(file,editor::board->objects[i][j],i,XYE_VERT-j-1); -+ for (j=0;j<XYE_HORZ;j++) for (k=0;k<XYE_VERT;k++) saveGroundObject(file,editor::board->objects[j][k],j,XYE_VERT-k-1); - file << "\t</ground>\n"; - file << "\t<objects>\n"; - resetSavedPosition(); -- for (i=0;i<XYE_HORZ;i++) for (j=0;j<XYE_VERT;j++) -+ for (j=0;j<XYE_HORZ;j++) for (k=0;k<XYE_VERT;k++) - { -- saveNormalObject(file,editor::board->objects[i][j],i,XYE_VERT-j-1); -+ saveNormalObject(file,editor::board->objects[j][k],j,XYE_VERT-k-1); - } - savePortals( file, editor::board); - -diff -Naur xye-0.12.0.orig/src/gen.cpp xye-0.12.0/src/gen.cpp ---- xye-0.12.0.orig/src/gen.cpp 2011-10-07 19:00:29.000000000 +0000 -+++ xye-0.12.0/src/gen.cpp 2012-08-05 10:20:47.652013747 +0000 -@@ -21,6 +21,7 @@ - #include<cstdio>
- #include<iostream>
- #include<fstream>
-+#include <unistd.h>
-
- const float F_RAND_MAX = (float)(RAND_MAX);
-
diff --git a/games/xye/xye.SlackBuild b/games/xye/xye.SlackBuild index cd44fb04b4..8487aecd40 100644 --- a/games/xye/xye.SlackBuild +++ b/games/xye/xye.SlackBuild @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xye -VERSION=${VERSION:-0.12.1} +VERSION=${VERSION:-0.12.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -66,19 +66,16 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# add gcc-4.7 patch -patch -p1 -i $CWD/gcc-4.7.patch + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --bindir=/usr/games \ + --bindir=/usr/bin \ --disable-dependency-tracking \ --build=$ARCH-slackware-linux @@ -92,10 +89,11 @@ install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desk install -m 0644 res/default_icon.png $PKG/usr/share/$PRGNAM/res for i in 16 32 48 64 96 128; do - convert $PRGNAM.svg -resize ${i}x${i}! $PRGNAM-${i}.png + convert pixmaps/$PRGNAM.svg -resize ${i}x${i}! $PRGNAM-${i}.png install -D -m 0644 $PRGNAM-${i}.png $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png done -install -D -m 0644 $PRGNAM.svg $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg +install -D -m 0644 pixmaps/$PRGNAM.svg \ +$PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/games/xye/xye.info b/games/xye/xye.info index 3a00da5d49..dc491f1db8 100644 --- a/games/xye/xye.info +++ b/games/xye/xye.info @@ -1,8 +1,8 @@ PRGNAM="xye" -VERSION="0.12.1" +VERSION="0.12.2" HOMEPAGE="http://xye.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/xye/xye-0.12.1.tar.gz" -MD5SUM="d6482d7490c11baacab4ca2df436af4f" +DOWNLOAD="http://downloads.sourceforge.net/xye/xye-0.12.2.tar.gz" +MD5SUM="f8a464fe0e67d8292dd32ef18e14ea18" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |