From aa88b04cd8f0488b8ef2879624baee4e90e4f6c8 Mon Sep 17 00:00:00 2001
From: Fernando Lopez Jr <fernando.lopezjr@gmail.com>
Date: Mon, 20 Aug 2018 18:56:17 +0100
Subject: development/radare2: Updated for version 2.8.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 development/radare2/anal_mips_cs.c.patch | 11 -----------
 development/radare2/asm_mips_cs.c.patch  | 11 -----------
 development/radare2/radare2.SlackBuild   | 11 ++++++-----
 development/radare2/radare2.info         |  6 +++---
 4 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 development/radare2/anal_mips_cs.c.patch
 delete mode 100644 development/radare2/asm_mips_cs.c.patch

(limited to 'development')

diff --git a/development/radare2/anal_mips_cs.c.patch b/development/radare2/anal_mips_cs.c.patch
deleted file mode 100644
index 8f639728f4..0000000000
--- a/development/radare2/anal_mips_cs.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libr/anal/p/anal_mips_cs.c	2017-07-11 09:54:22.000000000 -0600
-+++ libr/anal/p/anal_mips_cs.c.new	2017-07-17 02:54:34.091225475 -0600
-@@ -596,7 +596,7 @@
- 			mode |= CS_MODE_MIPS3;
- 		} else if (!strcmp (anal->cpu, "v2")) {
- #if CS_API_MAJOR > 3
--			mode |= CS_MODE_MIPS2;
-+			mode |= CS_MODE_MIPS32;
- #endif
- 		}
- 	}
diff --git a/development/radare2/asm_mips_cs.c.patch b/development/radare2/asm_mips_cs.c.patch
deleted file mode 100644
index bf3d46ec83..0000000000
--- a/development/radare2/asm_mips_cs.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libr/asm/p/asm_mips_cs.c	2017-07-11 09:54:22.000000000 -0600
-+++ libr/asm/p/asm_mips_cs.c.new	2017-07-17 03:01:49.521082563 -0600
-@@ -25,7 +25,7 @@
- 			mode |= CS_MODE_MIPS3;
- 		} else if (!strcmp (a->cpu, "v2")) {
- #if CS_API_MAJOR > 3
--			mode |= CS_MODE_MIPS2;
-+			mode |= CS_MODE_MIPS32;
- #endif
- 		}
- 	}
diff --git a/development/radare2/radare2.SlackBuild b/development/radare2/radare2.SlackBuild
index dac5829feb..72dabf0d67 100644
--- a/development/radare2/radare2.SlackBuild
+++ b/development/radare2/radare2.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=radare2
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-2.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,10 +70,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p0 --verbose < $CWD/anal_mips_cs.c.patch
-patch -p0 --verbose < $CWD/asm_mips_cs.c.patch
-
+CAPSTONE_CFLAGS="-I/usr/include/capstone" \
+CAPSTONE_LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lcapstone" \
+USE_R2_CAPSTONE=1 \
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -83,7 +84,7 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-openssl \
   --with-syszip \
-  --with-syscapstone\
+  --with-syscapstone \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/development/radare2/radare2.info b/development/radare2/radare2.info
index 71dedba78c..5fd0e55d2a 100644
--- a/development/radare2/radare2.info
+++ b/development/radare2/radare2.info
@@ -1,8 +1,8 @@
 PRGNAM="radare2"
-VERSION="2.5.0"
+VERSION="2.8.0"
 HOMEPAGE="http://radare.org/"
-DOWNLOAD="https://github.com/radare/radare2/archive/2.5.0/radare2-2.5.0.tar.gz"
-MD5SUM="2f4798a709c9d6782b1f5ea29398eb8f"
+DOWNLOAD="https://github.com/radare/radare2/archive/2.8.0/radare2-2.8.0.tar.gz"
+MD5SUM="30918b9b8141bb0cd1accbf0e54ab0dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="capstone"
-- 
cgit v1.2.3