aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2011-03-30 13:26:40 -0400
committerRobby Workman <rworkman@slackbuilds.org>2011-03-30 22:52:11 -0500
commit87a363a564f841dd91895d69ced4dd103ab1c1c8 (patch)
treed2bdb3325567b74e7c4d22ccdff8173e635114aa
parentd024bf5dcb49dc146edaf34131b9d393c58f1822 (diff)
development/valkyrie: Updated for version 2.0.0.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--development/valkyrie/README4
-rw-r--r--development/valkyrie/docdir.patch22
-rw-r--r--development/valkyrie/valkyrie.SlackBuild17
-rw-r--r--development/valkyrie/valkyrie.info8
4 files changed, 12 insertions, 39 deletions
diff --git a/development/valkyrie/README b/development/valkyrie/README
index b48048a7b6c3e..67627a1154f49 100644
--- a/development/valkyrie/README
+++ b/development/valkyrie/README
@@ -9,5 +9,5 @@ Also included in Valkyrie is an auxiliary tool which can read XML
outputs from multiple Valgrind (Memcheck) runs, merge them into a
single XML file, and optionally display the merged result in the GUI.
-This requires valgrind and qt3 from /extra/kde3-compat/ on the Slackware
-mirror or cdrom set.
+This requires valgrind.
+
diff --git a/development/valkyrie/docdir.patch b/development/valkyrie/docdir.patch
deleted file mode 100644
index 9f8bb7daa3fde..0000000000000
--- a/development/valkyrie/docdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- valkyrie-1.3.0/doc/Makefile.in.orig 2010-02-16 09:36:30.757843977 -0500
-+++ valkyrie-1.3.0/doc/Makefile.in 2010-02-16 09:36:47.274614778 -0500
-@@ -143,7 +143,7 @@
- build_alias = @build_alias@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(prefix)/doc/
-+docdir = @docdir@
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host_alias = @host_alias@
---- valkyrie-1.3.0/doc/images/Makefile.in.orig 2010-02-16 09:40:41.232645924 -0500
-+++ valkyrie-1.3.0/doc/images/Makefile.in 2010-02-16 09:40:58.332637251 -0500
-@@ -134,7 +134,7 @@
- build_alias = @build_alias@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(prefix)/doc/images
-+docdir = @docdir@/images
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host_alias = @host_alias@
diff --git a/development/valkyrie/valkyrie.SlackBuild b/development/valkyrie/valkyrie.SlackBuild
index 73f843a811a63..0868e490de60e 100644
--- a/development/valkyrie/valkyrie.SlackBuild
+++ b/development/valkyrie/valkyrie.SlackBuild
@@ -22,7 +22,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=valkyrie
-VERSION=1.3.0
+VERSION=2.0.0
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -63,19 +63,14 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-patch -p1 < $CWD/docdir.patch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --htmldir=/usr/doc/$PRGNAM-$VERSION/html \
- --with-Qt-dir=/opt/kde3/lib${LIBDIRSUFFIX}/qt3 \
- --build=$ARCH-slackware-linux
-
+qmake PREFIX=/usr
make
-make install-strip DESTDIR=$PKG
+make install INSTALL_ROOT=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/valkyrie/valkyrie.info b/development/valkyrie/valkyrie.info
index 4144d8c8b0be7..754c280866406 100644
--- a/development/valkyrie/valkyrie.info
+++ b/development/valkyrie/valkyrie.info
@@ -1,10 +1,10 @@
PRGNAM="valkyrie"
-VERSION="1.3.0"
+VERSION="2.0.0"
HOMEPAGE="http://www.open-works.net/projects/valkyrie.html"
-DOWNLOAD="http://www.valgrind.org/downloads/valkyrie-1.3.0.tar.bz2"
-MD5SUM="ec7069a23ec90670be74d3fc3a46f574"
+DOWNLOAD="http://valgrind.org/downloads/valkyrie-2.0.0.tar.bz2"
+MD5SUM="a411dfb803f548dae5f988de0160aeb5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Andy Bailey"
EMAIL="bailey@akamai.com"
-APPROVED="rworkman"
+APPROVED="dsomero"