summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/blobby2/blobby2-gcc47.patch66
-rw-r--r--games/blobby2/blobby2.SlackBuild9
-rw-r--r--games/blobby2/blobby2.info6
3 files changed, 6 insertions, 75 deletions
diff --git a/games/blobby2/blobby2-gcc47.patch b/games/blobby2/blobby2-gcc47.patch
deleted file mode 100644
index 7fbed48d96..0000000000
--- a/games/blobby2/blobby2-gcc47.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- trunk/src/raknet/BinarySearchTree.h 2012/08/18 23:13:49 954
-+++ trunk/src/raknet/BinarySearchTree.h 2012/08/18 23:21:00 955
-@@ -338,12 +338,12 @@
- if ( current->left == 0 )
- left_height = 0;
- else
-- left_height = height( current->left );
-+ left_height = this->height( current->left );
-
- if ( current->right == 0 )
- right_height = 0;
- else
-- right_height = height( current->right );
-+ right_height = this->height( current->right );
-
- if ( right_height - left_height == 2 )
- {
-@@ -371,7 +371,7 @@
- if ( current == this->root )
- break;
-
-- current = find_parent( *( current->item ) );
-+ current = this->find_parent( *( current->item ) );
-
- }
- }
-@@ -400,7 +400,7 @@
- if ( A == 0 )
- return false;
-
-- return height( A->right ) > height( A->left );
-+ return this->height( A->right ) > this->height( A->left );
- }
-
- template <class BinarySearchTreeType>
-@@ -409,7 +409,7 @@
- if ( A == 0 )
- return false;
-
-- return height( A->left ) > height( A->right );
-+ return this->height( A->left ) > this->height( A->right );
- }
-
- template <class BinarySearchTreeType>
-@@ -446,8 +446,8 @@
-
- */
-
-- B = find_parent( *( C->item ) );
-- A = find_parent( *( B->item ) );
-+ B = this->find_parent( *( C->item ) );
-+ A = this->find_parent( *( B->item ) );
- D = C->right;
-
- if ( A )
-@@ -510,8 +510,8 @@
-
- */
-
-- B = find_parent( *( C->item ) );
-- A = find_parent( *( B->item ) );
-+ B = this->find_parent( *( C->item ) );
-+ A = this->find_parent( *( B->item ) );
- D = C->left;
-
- if ( A )
diff --git a/games/blobby2/blobby2.SlackBuild b/games/blobby2/blobby2.SlackBuild
index 3c2ab6b02c..0abb137611 100644
--- a/games/blobby2/blobby2.SlackBuild
+++ b/games/blobby2/blobby2.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for blobby2
-# Copyright 2010-2012 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=blobby2
-VERSION=1.0rc1
-BUILD=${BUILD:-2}
+VERSION=1.0rc3
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -65,9 +65,6 @@ cd blobby-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# Fix compatibility with gcc 4.7 (svn revision 955)
-patch -p1 -i $CWD/blobby2-gcc47.patch
-
mkdir -p build
cd build
cmake \
diff --git a/games/blobby2/blobby2.info b/games/blobby2/blobby2.info
index 2abf8578c6..e6c73a2456 100644
--- a/games/blobby2/blobby2.info
+++ b/games/blobby2/blobby2.info
@@ -1,8 +1,8 @@
PRGNAM="blobby2"
-VERSION="1.0rc1"
+VERSION="1.0rc3"
HOMEPAGE="http://blobby.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/blobby/blobby2-linux-1.0rc1.tar.gz"
-MD5SUM="f56472cee041ef3d3c7def604e71b248"
+DOWNLOAD="http://downloads.sourceforge.net/blobby/blobby2-linux-1.0rc3.tar.gz"
+MD5SUM="c4b7d3133e99806dc8b60a59da296906"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="physfs"