network/psi-plus: Updated for version 1.5.1484.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

3 files changed, 30 insertions, 28 deletions

diff --git a/network/psi-plus/README b/network/psi-plus/README
index 0990030d70..aadd5cead4 100644
--- a/network/psi-plus/README
+++ b/network/psi-plus/README
@@ -3,22 +3,19 @@ Development branch of Psi XMPP client by psi-dev@conference.jabber.ru
 NOTE This is intended for advanced users and developers.
 NOTE This can coexist with the stable psi package.
 
-In 2009 a Psi fork named Psi+ was started. Project purposes are: implementation
-of new features, writing of patches and plugins for transferring them to
-upstream. As of 2017 the most of active Psi+ developers have become official
-Psi developers, but Psi+ still has a number of unique features. From developers
-point of view Psi+ is just a development branch of Psi IM client which is
-hosted at separate git repositories and for which rolling release development
-model is used.
+In 2009 a Psi fork named Psi+ was started. Project purposes are:
+implementation of new features, writing of patches and plugins for
+transferring them to upstream. As of 2017 the most of active Psi+
+developers have become official Psi developers, but Psi+ still has a
+number of unique features. From developers point of view Psi+ is just a
+development branch of Psi IM client which is hosted at separate git
+repositories and for which rolling release development model is used.
 
 LATEST COMMIT INFO
 
-Current version of Psi+ is 1.4.409
-
+Current version of Psi+ is 1.5.1484
 It is based on:
-* psi: dc3e59ec
-* patches: 770f144
-* plugins: 8792bc3
-* resources: d623f57
-
-https://github.com/psi-plus/psi-plus-snapshots/commit/272f39
+* psi: 02474c63
+* plugins: b03a4d0
+* psimedia: a323296
+* resources: a00b363
diff --git a/network/psi-plus/psi-plus.SlackBuild b/network/psi-plus/psi-plus.SlackBuild
index 3173557869..de8a2688e9 100644
--- a/network/psi-plus/psi-plus.SlackBuild
+++ b/network/psi-plus/psi-plus.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=psi-plus
-VERSION=${VERSION:-1.4.650}
+VERSION=${VERSION:-1.5.1484}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,20 +70,25 @@ 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 {} \;
 
-./configure \
-  --prefix=/usr \
-  --qtdir=/usr/lib$LIBDIRSUFFIX/qt5
-
-QMAKE_CFLAGS="$SLKCFLAGS" \
-QMAKE_CXXFLAGS="$SLKCFLAGS" \
-make
-make install INSTALL_ROOT=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUNDLED_USRSCTP=ON \
+    -DBUNDLED_QCA=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 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/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/psi-plus/psi-plus.info b/network/psi-plus/psi-plus.info
index 22a28fac57..704cf1ed30 100644
--- a/network/psi-plus/psi-plus.info
+++ b/network/psi-plus/psi-plus.info
@@ -1,8 +1,8 @@
 PRGNAM="psi-plus"
-VERSION="1.4.650"
+VERSION="1.5.1484"
 HOMEPAGE="https://psi-plus.com"
-DOWNLOAD="https://github.com/psi-plus/psi-plus-snapshots/archive/1.4.650/psi-plus-snapshots-1.4.650.tar.gz"
-MD5SUM="c54d2143149d5dd112445072da67cded"
+DOWNLOAD="https://github.com/psi-plus/psi-plus-snapshots/archive/1.5.1484/psi-plus-snapshots-1.5.1484.tar.gz"
+MD5SUM="5d9c85e8e9aa8c4ad12727ec1dc7aca1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""