network/retroshare: Updated for version 20220216_3dfcb58.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 14 insertions, 81 deletions

diff --git a/network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch b/network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch
deleted file mode 100644
index 732984645d47..000000000000
--- a/network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-backport of
-
-From bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc Mon Sep 17 00:00:00 2001
-From: Phenom <retrosharephenom@gmail.com>
-Date: Mon, 1 Jun 2020 13:44:43 +0200
-Subject: [PATCH] Fix build with Qt 5.15+
-
----
- retroshare-gui/src/gui/elastic/elnode.h        |  8 +++++---
- .../src/gui/gxs/GxsCommentTreeWidget.cpp       | 16 +++++++++-------
- retroshare-gui/src/gui/gxs/GxsIdDetails.cpp    | 18 ++++++++++--------
- 3 files changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h
-index 1e0edd1a8..b881baed6 100644
---- a/retroshare-gui/src/gui/elastic/elnode.h
-+++ b/retroshare-gui/src/gui/elastic/elnode.h
-@@ -34,6 +34,8 @@
- #include <retroshare/rstypes.h>

- #include "graphwidget.h"

- 

-+#include <QPainterPath>

-+

- class Edge;

- QT_BEGIN_NAMESPACE

- class QGraphicsSceneMouseEvent;

-diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
-index e5d714860..a3187d4d9 100644
---- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
-+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
-@@ -18,6 +18,14 @@
-  *                                                                             *
-  *******************************************************************************/
- 
-+#include "GxsCommentTreeWidget.h"
-+
-+#include "gui/common/FilesDefs.h"
-+#include "gui/common/RSElidedItemDelegate.h"
-+#include "gui/common/RSTreeWidgetItem.h"
-+#include "gui/gxs/GxsCreateCommentDialog.h"
-+#include "gui/gxs/GxsIdTreeWidgetItem.h"
-+
- #include <QAbstractTextDocumentLayout>
- #include <QApplication>
- #include <QClipboard>
-@@ -25,6 +33,7 @@
- #include <QMenu>
- #include <QMimeData>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTextDocument>
- 
- #include "gui/common/RSElidedItemDelegate.h"
-diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
-index 6168090eb..1bbab7f82 100644
---- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
-+++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
-@@ -31,6 +31,7 @@
- 
- #include <iostream>
- #include <QPainter>
-+#include <QPainterPath>
- 
- /* Images for tag icons */
- #define IMAGE_LOADING     ":/images/folder-draft.png"
diff --git a/network/retroshare/retroshare.SlackBuild b/network/retroshare/retroshare.SlackBuild
index 14bc564210a0..870b673b286b 100644
--- a/network/retroshare/retroshare.SlackBuild
+++ b/network/retroshare/retroshare.SlackBuild
@@ -20,13 +20,11 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=retroshare
-VERSION=${VERSION:-0.6.5}
+VERSION=${VERSION:-20220216_3dfcb58}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-SRCNAM=RetroShare
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -62,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -72,9 +70,6 @@ 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 {} \;
 
-# Patch for qt5 >= 5.14.x
-patch -p1 < $CWD/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch
-
 RETROTOR=${RETROTOR:-no}
 if [ $RETROTOR = yes ]; then
   qmake-qt5 PREFIX=/usr LIB_DIR=/usr/lib${LIBDIRSUFFIX} "CONFIG-=debug" "CONFIG+=release" "CONFIG+=retrotor"
@@ -84,11 +79,14 @@ fi
 make
 make INSTALL_ROOT=${PKG} install
 
+mkdir -p $PKG/usr/share/retroshare
+mv $PKG/{qss,sounds,stylesheets} $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
-cp -a LICENSE.txt README.md TODO.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSES 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/retroshare/retroshare.info b/network/retroshare/retroshare.info
index 4e77eb2b0fda..65ab2d2f0831 100644
--- a/network/retroshare/retroshare.info
+++ b/network/retroshare/retroshare.info
@@ -1,10 +1,10 @@
 PRGNAM="retroshare"
-VERSION="0.6.5"
-HOMEPAGE="http://retroshare.net"
-DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/v0.6.5/RetroShare-0.6.5.tar.gz"
-MD5SUM="577fa867e24fc30b4c690e7956ff43c9"
+VERSION="20220216_3dfcb58"
+HOMEPAGE="http://retroshare.cc"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/retroshare-20220216_3dfcb58.tar.xz"
+MD5SUM="9e71721b705df11ff3f3c0a0a31493f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libmicrohttpd libupnp-legacy protobuf3 sqlcipher"
+REQUIRES="libmicrohttpd miniupnpc protobuf3 sqlcipher"
 MAINTAINER="Alan Aversa"
 EMAIL="aveNOrsa@email.ariSPAMzona.edu"
diff --git a/network/retroshare/slack-desc b/network/retroshare/slack-desc
index 6b69fdd79df0..2bcc67a0fb98 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.net
+retroshare: Project URL: http://retroshare.cc
 retroshare: