From 50c1ff3d405c72f83ff56ef402e1a48288588937 Mon Sep 17 00:00:00 2001
From: David Sullins <david.sullins@gmail.com>
Date: Fri, 5 Aug 2016 17:57:08 +0700
Subject: development/p4v: Updated for version 2015.2.1315639.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/p4v/p4v.SlackBuild | 13 ++++++++++++-
 development/p4v/p4v.info       | 10 +++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'development')

diff --git a/development/p4v/p4v.SlackBuild b/development/p4v/p4v.SlackBuild
index ef462b7cb6..ac4531dede 100644
--- a/development/p4v/p4v.SlackBuild
+++ b/development/p4v/p4v.SlackBuild
@@ -79,13 +79,24 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+# It would be a bad idea to copy p4v's qt.conf into /usr/bin
 rm bin/qt.conf
 cp -a bin $PKG/usr/bin
 mv lib/p4v $PKG/usr/lib${LIBDIRSUFFIX}/p4v
 
+# p4vc needs to be wrapped too
+mv $PKG/usr/bin/p4vc $PKG/usr/bin/p4vc.bin
+
 # Adapt the path for lib/lib64
 sed -i "s%prefix/lib/%prefix/lib${LIBDIRSUFFIX}/%g" $PKG/usr/bin/$PRGNAM
-sed -i "s%prefix/lib/%prefix/lib${LIBDIRSUFFIX}/%g" $PKG/usr/bin/p4merge
+
+# Add Qt plugin path through environment variable since we can't use qt.conf
+sed -i "s%export P4VRES%export P4VRES QT_PLUGIN_PATH=\$QT5DIR/plugins%g" $PKG/usr/bin/$PRGNAM
+
+# Copy to the other wrappers
+cp $PKG/usr/bin/$PRGNAM $PKG/usr/bin/p4merge
+cp $PKG/usr/bin/$PRGNAM $PKG/usr/bin/p4admin
+cp $PKG/usr/bin/$PRGNAM $PKG/usr/bin/p4vc
 
 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
diff --git a/development/p4v/p4v.info b/development/p4v/p4v.info
index e0dedc4c98..f222044a32 100644
--- a/development/p4v/p4v.info
+++ b/development/p4v/p4v.info
@@ -1,10 +1,10 @@
 PRGNAM="p4v"
-VERSION="2014.1.1206753"
+VERSION="2015.2.1315639"
 HOMEPAGE="http://www.perforce.com/"
-DOWNLOAD="http://www.perforce.com/downloads/perforce/r14.1/bin.linux26x86/p4v.tgz"
-MD5SUM="96c6e88ea1a4fe283331cea6e8c6734c"
-DOWNLOAD_x86_64="http://www.perforce.com/downloads/perforce/r14.1/bin.linux26x86_64/p4v.tgz"
-MD5SUM_x86_64="8adb5e7f3400472bb05f1518dbd68efd"
+DOWNLOAD="http://www.perforce.com/downloads/perforce/r15.2/bin.linux26x86/p4v.tgz"
+MD5SUM="c88e59589ff926bfd961ef3f194b90c8"
+DOWNLOAD_x86_64="http://www.perforce.com/downloads/perforce/r15.2/bin.linux26x86_64/p4v.tgz"
+MD5SUM_x86_64="6877a849c20f53593650816660129249"
 REQUIRES=""
 MAINTAINER="David Sullins"
 EMAIL="david.sullins@gmail.com"
-- 
cgit v1.2.3