databases/redisdesktopmanager: update to 0.9.6

6 files changed, 48 insertions, 28 deletions

diff --git a/databases/redisdesktopmanager/Makefile b/databases/redisdesktopmanager/Makefile
index 93bb63ff8c8b..38eba40abd5c 100644
--- a/databases/redisdesktopmanager/Makefile
+++ b/databases/redisdesktopmanager/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	redisdesktopmanager
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.6
 CATEGORIES=	databases
 
 MAINTAINER=	swills@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libssh2.so:security/libssh2
 
-USES=		dos2unix kde:5 qmake qt:5 ssl
+USES=		dos2unix gl kde:5 qmake qt:5 ssl
 DOS2UNIX_FILES=	3rdparty/3rdparty.pri
 USE_GL=		gl
 USE_GITHUB=	yes
@@ -25,11 +25,13 @@ DESKTOP_ENTRIES=	"Redis Desktop Manager" "Redis Desktop Manager" "rdm.png" "rdm"
 GH_TUPLE=	\
 		uglide:RedisDesktopManager:${PORTVERSION}:DEFAULT/RedisDesktopManager-${PORTVERSION} \
 		benlau:asyncfuture:4579d53:asyncfuture/3rdparty/asyncfuture \
-		RedisDesktop:CrashReporter:3455308:crashreporter/3rdparty/crashreporter \
+		RedisDesktop:CrashReporter:0202f9b:crashreporter/3rdparty/crashreporter \
 		easylogging:easyloggingpp:f926802:easylogging/3rdparty/easyloggingpp \
-		uglide:qredisclient:34f1c5a:qredisclient/3rdparty/qredisclient \
+		uglide:qredisclient:bede971:qredisclient/3rdparty/qredisclient \
 		sijk:qt-unix-signals:d6a1d12:qtunixsignals/3rdparty/qt-unix-signals \
-		redis:hiredis:53c3243:hiredis/3rdparty/qredisclient/3rdparty/hiredis
+		uglide:qsshclient:6fa7fb7:qsshclient/3rdparty/qredisclient/3rdparty/qsshclient \
+		redis:hiredis:53c3243:hiredis/3rdparty/qredisclient/3rdparty/hiredis \
+		libssh2:libssh2:62b825c:libssh2/3rdparty/qredisclient/3rdparty/qsshclient/3rdparty/libssh2
 USE_QT=		buildtools_build charts concurrent core gui network qmake_build qml quick widgets
 
 post-patch:
diff --git a/databases/redisdesktopmanager/distinfo b/databases/redisdesktopmanager/distinfo
index d035ee6f9dfa..8717fd4b9989 100644
--- a/databases/redisdesktopmanager/distinfo
+++ b/databases/redisdesktopmanager/distinfo
@@ -1,15 +1,21 @@
-TIMESTAMP = 1526918682
-SHA256 (uglide-RedisDesktopManager-0.9.3_GH0.tar.gz) = c7584bee2cffbe05c221f3f43a810bc3718121d94618df909a8c9cf4fa28ad14
-SIZE (uglide-RedisDesktopManager-0.9.3_GH0.tar.gz) = 1982896
+TIMESTAMP = 1537573499
+SHA256 (uglide-RedisDesktopManager-0.9.6_GH0.tar.gz) = 672681d7a923d627f462be8bf8c3f0872d808e042503b2a5fe727fa878e520b1
+SIZE (uglide-RedisDesktopManager-0.9.6_GH0.tar.gz) = 1997779
 SHA256 (benlau-asyncfuture-4579d53_GH0.tar.gz) = ce5a3a4bc61f22f182eb8f932a3736289fc541e7487244fd57c93a141a038fe4
 SIZE (benlau-asyncfuture-4579d53_GH0.tar.gz) = 31928
-SHA256 (RedisDesktop-CrashReporter-3455308_GH0.tar.gz) = fb1a8a6c29b4e4acda5d4f479242a0364bfbddf05a7bd3f4ab353e91cd9b7c4f
-SIZE (RedisDesktop-CrashReporter-3455308_GH0.tar.gz) = 14178
+SHA256 (RedisDesktop-CrashReporter-0202f9b_GH0.tar.gz) = 4b0745dd12449716279a618eab0c8706422a0f67af680d0bf71471f9dbd371cb
+SIZE (RedisDesktop-CrashReporter-0202f9b_GH0.tar.gz) = 14232
 SHA256 (easylogging-easyloggingpp-f926802_GH0.tar.gz) = 362294c79de7a5dfa76a56cbfcdcaf99e21bbd05b19ef5b76700fd576a2e1ff2
 SIZE (easylogging-easyloggingpp-f926802_GH0.tar.gz) = 463948
-SHA256 (uglide-qredisclient-34f1c5a_GH0.tar.gz) = 1cc99b148a6f8ee9a3cada1c340ceb1f095d7abd8e4b314651cf2655e22bf72d
-SIZE (uglide-qredisclient-34f1c5a_GH0.tar.gz) = 226928
+SHA256 (uglide-qredisclient-bede971_GH0.tar.gz) = 37b1e76ca89ca45fd0dcf56df4f2c90b3e5f4c2b441276937f7581804d952a16
+SIZE (uglide-qredisclient-bede971_GH0.tar.gz) = 215454
 SHA256 (sijk-qt-unix-signals-d6a1d12_GH0.tar.gz) = 8bbc578430ab2fd6665ff2f2f6fcf402b3346b6d3cdfcc16e8c1d8f5a8f75ea2
 SIZE (sijk-qt-unix-signals-d6a1d12_GH0.tar.gz) = 3792
+SHA256 (google-breakpad-9fecc95_GH0.tar.gz) = e4bd6118f84f4a0cf89a035ff9e4ac65542fb12d3e69e89c80d5ba3f127d2ed6
+SIZE (google-breakpad-9fecc95_GH0.tar.gz) = 5208769
+SHA256 (uglide-qsshclient-6fa7fb7_GH0.tar.gz) = b9eaed71f8cae6d4fa1e6cf7de979ba8a5d1a14e2681cf1a0f2bfc42d5960ea1
+SIZE (uglide-qsshclient-6fa7fb7_GH0.tar.gz) = 10446
 SHA256 (redis-hiredis-53c3243_GH0.tar.gz) = 38e38efff19715d5e2f49c77b9db35f7cd005d66ae3d0944630424c64cf3950d
 SIZE (redis-hiredis-53c3243_GH0.tar.gz) = 58204
+SHA256 (libssh2-libssh2-62b825c_GH0.tar.gz) = 9a2ee1e1e6980df6f0fbfafa5a038726c24d60688d9e8048040a997e163a2aad
+SIZE (libssh2-libssh2-62b825c_GH0.tar.gz) = 428936
diff --git a/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri b/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri
index 67120c2449bd..ea2063173e8e 100644
--- a/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri
+++ b/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri
@@ -1,11 +1,23 @@
---- 3rdparty/3rdparty.pri.orig	2018-04-23 05:41:30 UTC
+--- 3rdparty/3rdparty.pri.orig	2018-09-22 00:19:48 UTC
 +++ 3rdparty/3rdparty.pri
-@@ -81,8 +81,6 @@ unix:!macx { # ubuntu & debian
+@@ -81,15 +81,11 @@ unix:!macx { # ubuntu & debian
          #QMAKE_LFLAGS = -Wl,-rpath=/home/user/Qt5.9.3/5.9.3/gcc_64/lib
      }
  
 -    LIBS += $$BREAKPADDIR/client/linux/libbreakpad_client.a
 -
      # Unix signal watcher
-     HEADERS += $$PWD/qt-unix-signals/sigwatch.h
-     SOURCES += $$PWD/qt-unix-signals/sigwatch.cpp
+-    defined(LINUX_SIGNALS, var) {
+-        DEFINES += LINUX_SIGNALS
++    DEFINES += LINUX_SIGNALS
+ 
+-        HEADERS += $$PWD/qt-unix-signals/sigwatch.h
+-        HEADERS += $$PWD/qt-unix-signals/sigwatch_p.h
+-        SOURCES += $$PWD/qt-unix-signals/sigwatch.cpp
+-        INCLUDEPATH += $$PWD/qt-unix-signals/
+-    }
++    HEADERS += $$PWD/qt-unix-signals/sigwatch.h
++    HEADERS += $$PWD/qt-unix-signals/sigwatch_p.h
++    SOURCES += $$PWD/qt-unix-signals/sigwatch.cpp
++    INCLUDEPATH += $$PWD/qt-unix-signals/
+ }
diff --git a/databases/redisdesktopmanager/files/patch-src_app_app.cpp b/databases/redisdesktopmanager/files/patch-src_app_app.cpp
index b8157e594239..a43c2ae12bf9 100644
--- a/databases/redisdesktopmanager/files/patch-src_app_app.cpp
+++ b/databases/redisdesktopmanager/files/patch-src_app_app.cpp
@@ -1,6 +1,6 @@
---- src/app/app.cpp.orig	2018-04-13 11:23:13 UTC
+--- src/app/app.cpp.orig	2018-08-31 12:53:12 UTC
 +++ src/app/app.cpp
-@@ -210,8 +210,6 @@ void Application::initConnectionsManager()
+@@ -224,8 +224,6 @@ void Application::initConnectionsManager()
  
  void Application::initUpdater()
  {
diff --git a/databases/redisdesktopmanager/files/patch-src_main.cpp b/databases/redisdesktopmanager/files/patch-src_main.cpp
index c9b113d4b249..d1136bf61563 100644
--- a/databases/redisdesktopmanager/files/patch-src_main.cpp
+++ b/databases/redisdesktopmanager/files/patch-src_main.cpp
@@ -1,10 +1,10 @@
---- src/main.cpp.orig	2018-04-13 11:23:13 UTC
+--- src/main.cpp.orig	2018-09-22 00:04:41 UTC
 +++ src/main.cpp
 @@ -5,9 +5,7 @@
  #include "app/app.h"
  #include "modules/crashhandler/crashhandler.h"
  
--#ifdef Q_OS_LINUX
+-#ifdef LINUX_SIGNALS
  #include <sigwatch.h>
 -#endif
  
@@ -18,14 +18,14 @@
 -    QFileInfo appPath(QString::fromLocal8Bit(argv[0]));
 -    QString appDir(appPath.absoluteDir().path());
 -    QString crashReporterPath = QString("%1/crashreporter").arg(appDir.isEmpty() ? "." : appDir);
--    CrashHandler::instance()->Init(QDir::homePath(), appDir, crashReporterPath);
+-    CrashHandler::instance()->Init(QDir::homePath(), appPath.absoluteFilePath(), crashReporterPath);
 -    #endif
 -
      Application a(argc, argv);
      a.initModels();
      a.initQml();
  
--    #ifdef Q_OS_LINUX
+-    #ifdef LINUX_SIGNALS
      UnixSignalWatcher sigwatch;
      sigwatch.watchForSignal(SIGINT);
      sigwatch.watchForSignal(SIGTERM);
diff --git a/databases/redisdesktopmanager/files/patch-src_rdm.pro b/databases/redisdesktopmanager/files/patch-src_rdm.pro
index 4f28dff1ffe2..3e4a68821f31 100644
--- a/databases/redisdesktopmanager/files/patch-src_rdm.pro
+++ b/databases/redisdesktopmanager/files/patch-src_rdm.pro
@@ -1,4 +1,4 @@
---- src/rdm.pro.orig	2018-04-13 11:23:13 UTC
+--- src/rdm.pro.orig	2018-08-31 12:53:12 UTC
 +++ src/rdm.pro
 @@ -26,8 +26,6 @@ SOURCES += \
      $$PWD/modules/connections-tree/items/*.cpp \
@@ -22,10 +22,10 @@
  
      QMAKE_CXXFLAGS += -Wno-sign-compare    
  
--    release: DESTDIR = ./../bin/linux/release
--    debug:   DESTDIR = ./../bin/linux/debug
-+    release: DESTDIR = ./../bin/freebsd/release
-+    debug:   DESTDIR = ./../bin/freebsd/debug
+-    release: DESTDIR = $$PWD/../bin/linux/release
+-    debug:   DESTDIR = $$PWD/../bin/linux/debug
++    release: DESTDIR = $$PWD/../bin/freebsd/release
++    debug:   DESTDIR = $$PWD/../bin/freebsd/debug
  
      #deployment
-     target.path = /usr/share/redis-desktop-manager/bin
+     LINUX_INSTALL_PATH = /opt/redis-desktop-manager