4 files changed, 44 insertions, 52 deletions
diff --git a/network/retroshare/README b/network/retroshare/README
index 2fc5825a7170..1948c9aa616a 100644
--- a/network/retroshare/README
+++ b/network/retroshare/README
@@ -7,10 +7,5 @@ web-of-trust to authenticate peers and OpenSSL to encrypt all
 communication. RetroShare provides filesharing, chat, messages,
 forums and channels.
 
-Note: RetroShare uses /usr/lib/retroshare/extensions/ to store its
-plugins, against standard Slackware convention. RetroShare hardwires
-this into the code. This build does not attempt to patch the source
-code to fix this, though the maintainer welcomes patches to fix this
-issue.
+NOTE: Plugins no longer build and so are disabled.
 
-NOTE: VoIP Plugin no longer build and so are disabled.
diff --git a/network/retroshare/RetroShare.pro.patch b/network/retroshare/RetroShare.pro.patch
new file mode 100644
index 000000000000..2e05f04cbaeb
--- /dev/null
+++ b/network/retroshare/RetroShare.pro.patch
@@ -0,0 +1,12 @@
+--- RetroShare.pro	2015-07-31 21:27:42.000000000 +0600
++++ RetroShare.pro.patch	2016-10-19 11:31:54.880162333 +0600
+@@ -7,7 +7,6 @@
+         supportlibs/pegmarkdown/pegmarkdown.pro \
+         libbitdht/src/libbitdht.pro \
+         libretroshare/src/libretroshare.pro \
+-		libresapi/src/libresapi.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 419e262d6971..222157eee852 100644
--- a/network/retroshare/retroshare.SlackBuild
+++ b/network/retroshare/retroshare.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for retroshare
 
 # Copyright (c) 2014 Aaron W. Hsu <arcfide@sacrideo.us>
+# Copyright (c) 2016 Reedych <reedych@reedych.pw>
 
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -16,16 +17,15 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-PRGNAM=retroshare
-VERSION=${VERSION:-0.5.5}
-VCHAR=c # Strange retroshare convention in version naming
-BLDID=${BLDID:-7068}
-BUILD=${BUILD:-3}
+PKGNAM=retroshare
+VERSION=${VERSION:-0.6.0}
+BUILD=${BUILD:-1}
+RC=RC2 # RC of the retroshare VERSION, if release, make it clean
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -33,10 +33,10 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
@@ -46,14 +46,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
-
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_$VERSION-0.${BLDID}.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/v$VERSION-RC2.tar.gz
+cd RetroShare-$VERSION-RC2
+# delete all plugins
+rm -rf plugins
+cat $CWD/RetroShare.pro.patch | patch -p0
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -61,42 +63,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 {} \;
 
-cd src
-cd libbitdht/src && qmake && make clean && make
-cd ../../openpgpsdk/src && qmake && make clean && make
-cd ../../supportlibs/pegmarkdown && qmake && make clean && make
-cd ../../libretroshare/src && qmake && make clean && make
-cd ../../rsctrl/src && make
-cd ../../retroshare-nogui/src && qmake && make clean && make
-cd ../../retroshare-gui/src && qmake && make clean && make
-#cd ../../plugins/VOIP && qmake && make clean && make
-cd ../../plugins/FeedReader && qmake && make clean && make
-cd ../../plugins/LinksCloud && qmake && make clean && make
-cd ../../
+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/$PRGNAM-nogui
-install -D -m 755 plugins/LinksCloud/libLinksCloud.so \
-    $PKG/usr/lib/retroshare/extensions/libLinksCloud.so
-#install -D -m 755 plugins/VOIP/libVOIP.so \
-#    $PKG/usr/lib/retroshare/extensions/libVOIP.so
-install -D -m 755 plugins/FeedReader/libFeedReader.so \
-    $PKG/usr/lib/retroshare/extensions/libFeedReader.so
-install -D -m 644 data/retroshare.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 644 data/retroshare.png $PKG/usr/share/pixmaps/$PRGNAM.png
-install -D -m 644 data/retroshare.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
-install -D -m 644 libbitdht/src/bitdht/bdboot.txt \
-    $PKG/usr/share/RetroShare/bdboot.txt
+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
 
 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
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$VCHAR-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION$RC-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/retroshare/retroshare.info b/network/retroshare/retroshare.info
index 876eb2ec7148..f5fd539164fd 100644
--- a/network/retroshare/retroshare.info
+++ b/network/retroshare/retroshare.info
@@ -1,10 +1,10 @@
 PRGNAM="retroshare"
-VERSION="0.5.5c"
-HOMEPAGE="http://retroshare.sourceforge.net"
-DOWNLOAD="http://sourceforge.net/projects/retroshare/files/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz"
+VERSION="0.6.0RC2"
+HOMEPAGE="http://retroshare.org"
+DOWNLOAD="http://github.com/RetroShare/RetroShare/archive/v0.6.0-RC2.tar.gz"
+MD5SUM="a4b0fb2a3491df783c8d3d0af8255dd3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MD5SUM="00b79040759b41ab38867932fe3b6981"
-REQUIRES="libupnp speex protobuf"
+REQUIRES="libmicrohttpd libupnp speex protobuf"
 MAINTAINER="Aaron W. Hsu"
 EMAIL="arcfide@sacrideo.us"