From c8aa17bc8867abba871a3d0a757bd95d2bbe5b8d Mon Sep 17 00:00:00 2001
From: Alan Aversa
Date: Sat, 14 Jan 2017 19:02:16 +0700
Subject: network/retroshare: Updated for version 0.6.1 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/retroshare/RetroShare.pro.patch  |  9 ---------
 network/retroshare/retroshare.SlackBuild | 21 ++++++---------------
 network/retroshare/retroshare.info       | 12 ++++++------
 network/retroshare/slack-desc            |  2 +-
 4 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 network/retroshare/RetroShare.pro.patch

(limited to 'network/retroshare')

diff --git a/network/retroshare/RetroShare.pro.patch b/network/retroshare/RetroShare.pro.patch
deleted file mode 100644
index 11ffb9b1e8..0000000000
--- a/network/retroshare/RetroShare.pro.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- RetroShare.pro.orig	2016-10-29 12:02:37.040499156 +0600
-+++ RetroShare.pro	2016-10-29 12:02:45.160498942 +0600
-@@ -9,5 +9,4 @@
-         libretroshare/src/libretroshare.pro \
- 		libresapi/src/libresapi.pro	\
-         retroshare-gui/src/retroshare-gui.pro \
--        retroshare-nogui/src/retroshare-nogui.pro \
--        plugins/plugins.pro
-+        retroshare-nogui/src/retroshare-nogui.pro
diff --git a/network/retroshare/retroshare.SlackBuild b/network/retroshare/retroshare.SlackBuild
index 1e0cf2570c..32cfbef310 100644
--- a/network/retroshare/retroshare.SlackBuild
+++ b/network/retroshare/retroshare.SlackBuild
@@ -18,9 +18,8 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PKGNAM=retroshare
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-1}
-RC=RC2 # RC of the retroshare VERSION, if release, make it clean
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -50,11 +49,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/v$VERSION-RC2.tar.gz
-cd RetroShare-$VERSION-RC2
+tar xvf $CWD/$VERSION.tar.gz
+cd RetroShare-$VERSION
 # delete all plugins
 rm -rf plugins
-cat $CWD/RetroShare.pro.patch | patch -p0
 
 chown -R root:root .
 find -L . \
@@ -63,16 +61,9 @@ 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 {} \;
 
-qmake CONFIG+=retroshare-gui && make clean && make
-
-install -D -m 755 retroshare-gui/src/RetroShare $PKG/usr/bin/RetroShare
-install -D -m 755 retroshare-nogui/src/retroshare-nogui $PKG/usr/bin/$PKGNAM-nogui
-
-install -D -m 644 build_scripts/Debian+Ubuntu/data/retroshare.desktop $PKG/usr/share/applications/$PKGNAM.desktop
-install -D -m 644 build_scripts/Debian+Ubuntu/data/retroshare.png $PKG/usr/share/pixmaps/$PKGNAM.png
-install -D -m 644 build_scripts/Debian+Ubuntu/data/retroshare.xpm $PKG/usr/share/pixmaps/$PKGNAM.xpm
-install -D -m 644 libbitdht/src/bitdht/bdboot.txt $PKG/usr/share/RetroShare/bdboot.txt
-cp -R retroshare-gui/src/qss $PKG/usr/share/RetroShare
+qmake PREFIX=/usr LIB_DIR=/usr/lib${LIBDIRSUFFIX} "CONFIG-=debug" "CONFIG+=release"
+make
+make INSTALL_ROOT=${PKG} install
 
 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/network/retroshare/retroshare.info b/network/retroshare/retroshare.info
index f5fd539164..05c3c7ddb9 100644
--- a/network/retroshare/retroshare.info
+++ b/network/retroshare/retroshare.info
@@ -1,10 +1,10 @@
 PRGNAM="retroshare"
-VERSION="0.6.0RC2"
+VERSION="0.6.1"
 HOMEPAGE="http://retroshare.org"
-DOWNLOAD="http://github.com/RetroShare/RetroShare/archive/v0.6.0-RC2.tar.gz"
-MD5SUM="a4b0fb2a3491df783c8d3d0af8255dd3"
+DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/0.6.1.tar.gz"
+MD5SUM="33c3422f5ce7f2b73a77b8f779df4268"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libmicrohttpd libupnp speex protobuf"
-MAINTAINER="Aaron W. Hsu"
-EMAIL="arcfide@sacrideo.us"
+REQUIRES="libmicrohttpd libupnp speex protobuf sqlcipher"
+MAINTAINER="Alan Aversa"
+EMAIL="aveNOrsa@email.ariSPAMzona.edu"
diff --git a/network/retroshare/slack-desc b/network/retroshare/slack-desc
index b57e6a8d9c..6b69fdd79d 100644
--- a/network/retroshare/slack-desc
+++ b/network/retroshare/slack-desc
@@ -15,5 +15,5 @@ retroshare: a web-of-trust to authenticate peers and OpenSSL to encrypt all
 retroshare: communication. RetroShare provides filesharing, chat, messages,
 retroshare: forums and channels.
 retroshare:
-retroshare: Project URL: http://retroshare.sourceforge.net
+retroshare: Project URL: http://retroshare.net
 retroshare:
-- 
cgit v1.2.3