From 16a561e0adf3136202c88ef0a09333fa53cacae0 Mon Sep 17 00:00:00 2001
From: Christoph Willing <chris.willing@iinet.net.au>
Date: Fri, 31 Mar 2017 13:51:29 +1000
Subject: network/uTox: Updated for version 0.13.1

Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
---
 network/uTox/README          |  4 ++++
 network/uTox/slack-desc      |  2 +-
 network/uTox/uTox.SlackBuild | 34 +++++++++++++++++++++++++++-------
 network/uTox/uTox.info       | 10 +++++-----
 4 files changed, 37 insertions(+), 13 deletions(-)

(limited to 'network')

diff --git a/network/uTox/README b/network/uTox/README
index e4ffcc283c..f73ded322f 100644
--- a/network/uTox/README
+++ b/network/uTox/README
@@ -3,3 +3,7 @@ Supports many features and is on-par with other Tox clients.
 
 To build with GTK3 support instead of the default GTK2, execute:
     GTK3=yes ./uTox.Slackbuild
+
+Since version 0.13.1, uTox REQUIRES libraries from the c-toxcore
+package. Please note c-toxcore's README which recommends removal
+the toxcore package prior to building.
diff --git a/network/uTox/slack-desc b/network/uTox/slack-desc
index e68d06ea25..4b8f35ea56 100644
--- a/network/uTox/slack-desc
+++ b/network/uTox/slack-desc
@@ -11,7 +11,7 @@ uTox:
 uTox: Lightweight Tox client that uses Xlib. Supports many features and is
 uTox: on-par with other Tox clients.
 uTox:
-uTox: Homepage: https://github.com/GrayHatter/utox
+uTox: Homepage: https://github.com/uTox/uTox
 uTox:
 uTox:
 uTox:
diff --git a/network/uTox/uTox.SlackBuild b/network/uTox/uTox.SlackBuild
index ae72cae1c1..d17da38eaa 100644
--- a/network/uTox/uTox.SlackBuild
+++ b/network/uTox/uTox.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for uTox
 #
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
-# Copyright 2016 Christoph Willing  Brisbane, Australia
+# Copyright 2016-2017 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -19,7 +19,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=uTox
-VERSION=${VERSION:-0.9.8}
+VERSION=${VERSION:-0.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,7 +58,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-sed -i -e 's:DIR)/man:DIR)/../man:g' Makefile
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,11 +68,32 @@ find -L . \
 # Use GTK2 as default
 [ GTK3=${GTK3:-no} != "yes" ] && patch -p1 < $CWD/gtk2.diff
 
-make
-make install \
-  DESTDIR=$PKG \
-  PREFIX=/usr
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
+cd icons
+   for f in utox-*; do
+     echo $f
+     size=$(basename $(echo $f |cut -d'-' -f 2) .png); echo $size
+     mkdir -p $PKG/usr/share/icons/hicolor/$size/apps
+     cp $f $PKG/usr/share/icons/hicolor/$size/apps/utox.png
+   done
+   mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps
+   cp utox.svg $PKG/usr/share/icons/hicolor/scalable/apps
+cd ..
+
+
+mv $PKG/usr/share/man $PKG/usr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
diff --git a/network/uTox/uTox.info b/network/uTox/uTox.info
index 9b873477ed..393a2e0ed8 100644
--- a/network/uTox/uTox.info
+++ b/network/uTox/uTox.info
@@ -1,10 +1,10 @@
 PRGNAM="uTox"
-VERSION="0.9.8"
-HOMEPAGE="https://github.com/GrayHatter/utox"
-DOWNLOAD="https://github.com/GrayHatter/uTox/archive/v0.9.8.tar.gz"
-MD5SUM="ac70ab7f10646e4af2bbb5437c20ee1f"
+VERSION="0.13.1"
+HOMEPAGE="https://github.com/uTox/uTox"
+DOWNLOAD="https://github.com/uTox/uTox/archive/v0.13.1/uTox-0.13.1.tar.gz"
+MD5SUM="a00b8dfcf10e05016347f2f8c21bca3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="toxcore libfilteraudio"
+REQUIRES="c-toxcore libfilteraudio"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
-- 
cgit v1.2.3