Date: Wed, 12 Aug 2020 10:58:13 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544743 - in head/databases/redisdesktopmanager: . files Message-ID: <202008121058.07CAwD5q086718@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Wed Aug 12 10:58:12 2020 New Revision: 544743 URL: https://svnweb.freebsd.org/changeset/ports/544743 Log: databases/redisdesktopmanager: update to 2020.2 Modified: head/databases/redisdesktopmanager/Makefile (contents, props changed) head/databases/redisdesktopmanager/distinfo (contents, props changed) head/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri (contents, props changed) head/databases/redisdesktopmanager/files/patch-src_app_app.cpp (contents, props changed) head/databases/redisdesktopmanager/files/patch-src_main.cpp (contents, props changed) head/databases/redisdesktopmanager/files/patch-src_rdm.pro (contents, props changed) Modified: head/databases/redisdesktopmanager/Makefile ============================================================================== --- head/databases/redisdesktopmanager/Makefile Wed Aug 12 10:29:06 2020 (r544742) +++ head/databases/redisdesktopmanager/Makefile Wed Aug 12 10:58:12 2020 (r544743) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= redisdesktopmanager -PORTVERSION= 2019.0 -PORTREVISION= 1 +PORTVERSION= 2020.2 CATEGORIES= databases MAINTAINER= swills@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libssh2.so:security/libssh2 -USES= compiler:c++0x dos2unix gl kde:5 qmake qt:5 ssl +USES= compiler:c++0x dos2unix gl kde:5 python:build qmake qt:5 ssl USE_GL= gl USE_GITHUB= yes @@ -23,21 +22,23 @@ CONFIGURE_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/bin/freebsd/release PLIST_FILES= bin/rdm \ share/pixmaps/rdm.png +BINARY_ALIAS= python3-config=${PYTHON_CMD}-config DESKTOP_ENTRIES= "Redis Desktop Manager" \ "Redis Desktop Manager" \ - "rdm.png" \ "rdm" \ + "rdm" \ "Development;" \ "" GH_TUPLE= uglide:RedisDesktopManager:${PORTVERSION}:DEFAULT/RedisDesktopManager-${PORTVERSION} \ - benlau:asyncfuture:4579d53:asyncfuture/3rdparty/asyncfuture \ + benlau:asyncfuture:4579d53:asyncfuture/3rdparty/qredisclient/3rdparty/asyncfuture \ RedisDesktop:CrashReporter:0202f9b:crashreporter/3rdparty/crashreporter \ - uglide:qredisclient:0a0cc36:qredisclient/3rdparty/qredisclient \ + uglide:qredisclient:9fe79f7:qredisclient/3rdparty/qredisclient \ sijk:qt-unix-signals:d6a1d12:qtunixsignals/3rdparty/qt-unix-signals \ uglide:qsshclient:6fa7fb7:qsshclient/3rdparty/qredisclient/3rdparty/qsshclient \ + uglide:pyotherside:c1a8cc0:pyotherside/3rdparty/pyotherside \ redis:hiredis:6850306:hiredis/3rdparty/qredisclient/3rdparty/hiredis -USE_QT= charts concurrent core declarative gui network widgets \ - buildtools_build qmake_build +USE_QT= charts concurrent core declarative gui network svg \ + widgets buildtools_build qmake_build post-patch: @${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/src/version.h @@ -47,6 +48,6 @@ do-install: cd ${INSTALL_WRKSRC} ; \ ${STRIP_CMD} rdm ; \ ${INSTALL_PROGRAM} rdm ${STAGEDIR}${PREFIX}/bin/rdm - ${INSTALL_DATA} ${BUILD_WRKSRC}/resources/rdm.png ${STAGEDIR}${PREFIX}/share/pixmaps/rdm.png + ${INSTALL_DATA} ${BUILD_WRKSRC}/resources/images/rdm.png ${STAGEDIR}${PREFIX}/share/pixmaps/rdm.png .include <bsd.port.mk> Modified: head/databases/redisdesktopmanager/distinfo ============================================================================== --- head/databases/redisdesktopmanager/distinfo Wed Aug 12 10:29:06 2020 (r544742) +++ head/databases/redisdesktopmanager/distinfo Wed Aug 12 10:58:12 2020 (r544743) @@ -1,15 +1,17 @@ -TIMESTAMP = 1556928655 -SHA256 (uglide-RedisDesktopManager-2019.0_GH0.tar.gz) = ad943e146198769bcdaec8c1d41366e9bb4f6d4e76659a04b17dbf1f3646a731 -SIZE (uglide-RedisDesktopManager-2019.0_GH0.tar.gz) = 2323883 +TIMESTAMP = 1597089161 +SHA256 (uglide-RedisDesktopManager-2020.2_GH0.tar.gz) = 6cc6abbfa56396173362143e9c88be3f896f615e9098c8df0a257971889d2249 +SIZE (uglide-RedisDesktopManager-2020.2_GH0.tar.gz) = 2818109 SHA256 (benlau-asyncfuture-4579d53_GH0.tar.gz) = ce5a3a4bc61f22f182eb8f932a3736289fc541e7487244fd57c93a141a038fe4 SIZE (benlau-asyncfuture-4579d53_GH0.tar.gz) = 31928 SHA256 (RedisDesktop-CrashReporter-0202f9b_GH0.tar.gz) = 4b0745dd12449716279a618eab0c8706422a0f67af680d0bf71471f9dbd371cb SIZE (RedisDesktop-CrashReporter-0202f9b_GH0.tar.gz) = 14232 -SHA256 (uglide-qredisclient-0a0cc36_GH0.tar.gz) = cd14ba22669d7689546675a7fe899eacfc6234ce2c66e23ffd6dafd851f5db33 -SIZE (uglide-qredisclient-0a0cc36_GH0.tar.gz) = 216222 +SHA256 (uglide-qredisclient-9fe79f7_GH0.tar.gz) = 48828e4c095ccc3418a4fbf23fec1aa485184b441c4b0b70e5ae086af105d522 +SIZE (uglide-qredisclient-9fe79f7_GH0.tar.gz) = 221529 SHA256 (sijk-qt-unix-signals-d6a1d12_GH0.tar.gz) = 8bbc578430ab2fd6665ff2f2f6fcf402b3346b6d3cdfcc16e8c1d8f5a8f75ea2 SIZE (sijk-qt-unix-signals-d6a1d12_GH0.tar.gz) = 3792 SHA256 (uglide-qsshclient-6fa7fb7_GH0.tar.gz) = b9eaed71f8cae6d4fa1e6cf7de979ba8a5d1a14e2681cf1a0f2bfc42d5960ea1 SIZE (uglide-qsshclient-6fa7fb7_GH0.tar.gz) = 10446 +SHA256 (uglide-pyotherside-c1a8cc0_GH0.tar.gz) = 4a7f629da473f465ca128619081218de3f6d4958f4ffbc93db17523191c13384 +SIZE (uglide-pyotherside-c1a8cc0_GH0.tar.gz) = 185205 SHA256 (redis-hiredis-6850306_GH0.tar.gz) = f30e78ba3f8ae8effaf538c26412302bcd82a0268741de6441d30bc7c43dd90c SIZE (redis-hiredis-6850306_GH0.tar.gz) = 63061 Modified: head/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri ============================================================================== --- head/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri Wed Aug 12 10:29:06 2020 (r544742) +++ head/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri Wed Aug 12 10:58:12 2020 (r544743) @@ -1,23 +1,26 @@ ---- 3rdparty/3rdparty.pri.orig 2018-11-30 15:24:26 UTC +--- 3rdparty/3rdparty.pri.orig 2020-08-10 20:11:17 UTC +++ 3rdparty/3rdparty.pri -@@ -88,15 +88,11 @@ unix:!macx { # ubuntu & debian +@@ -53,15 +53,16 @@ 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 ++ DEFINES += LINUX_SIGNALS ++ + LIBS += -lz + # Unix signal watcher - defined(LINUX_SIGNALS, var) { -- DEFINES += LINUX_SIGNALS -+ DEFINES += LINUX_SIGNALS +- message("Build with qt-unix-signals") ++ message("Build with qt-unix-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/ - } ++ 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/ } Modified: head/databases/redisdesktopmanager/files/patch-src_app_app.cpp ============================================================================== --- head/databases/redisdesktopmanager/files/patch-src_app_app.cpp Wed Aug 12 10:29:06 2020 (r544742) +++ head/databases/redisdesktopmanager/files/patch-src_app_app.cpp Wed Aug 12 10:58:12 2020 (r544743) @@ -1,14 +1,16 @@ ---- src/app/app.cpp.orig 2018-11-27 08:26:54 UTC +--- src/app/app.cpp.orig 2020-08-10 20:06:43 UTC +++ src/app/app.cpp -@@ -37,7 +37,6 @@ Application::Application(int& argc, char** argv) +@@ -43,9 +43,6 @@ Application::Application(int& argc, char** argv) processCmdArgs(); initAppFonts(); initRedisClient(); +-#ifndef RDM_APPSTORE - initUpdater(); +-#endif installTranslator(); + initPython(); } - -@@ -203,9 +202,6 @@ void Application::initQml() { +@@ -254,9 +251,6 @@ void Application::initQml() { } void Application::initUpdater() { @@ -17,4 +19,4 @@ - SLOT(OnNewUpdateAvailable(QString&))); } - void Application::installTranslator() { + void Application::initPython() { Modified: head/databases/redisdesktopmanager/files/patch-src_main.cpp ============================================================================== --- head/databases/redisdesktopmanager/files/patch-src_main.cpp Wed Aug 12 10:29:06 2020 (r544742) +++ head/databases/redisdesktopmanager/files/patch-src_main.cpp Wed Aug 12 10:58:12 2020 (r544743) @@ -1,36 +1,25 @@ ---- src/main.cpp.orig 2018-09-22 00:04:41 UTC +--- src/main.cpp.orig 2020-08-10 20:08:12 UTC +++ src/main.cpp -@@ -5,9 +5,7 @@ - #include "app/app.h" - #include "modules/crashhandler/crashhandler.h" +@@ -13,9 +13,7 @@ + #include "crashpad/handler.h" + #endif -#ifdef LINUX_SIGNALS #include <sigwatch.h> -#endif - int main(int argc, char *argv[]) - { -@@ -15,23 +13,14 @@ int main(int argc, char *argv[]) - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - #endif + #include "app/app.h" -- #ifndef QT_DEBUG -- 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(), appPath.absoluteFilePath(), crashReporterPath); -- #endif -- +@@ -50,12 +48,10 @@ int main(int argc, char *argv[]) + Application a(argc, argv); - a.initModels(); - a.initQml(); -- #ifdef LINUX_SIGNALS +-#ifdef LINUX_SIGNALS UnixSignalWatcher sigwatch; sigwatch.watchForSignal(SIGINT); sigwatch.watchForSignal(SIGTERM); QObject::connect(&sigwatch, SIGNAL(unixSignal(int)), &a, SLOT(quit())); -- #endif - - return a.exec(); - } +-#endif + a.initModels(); + a.initQml(); + returnCode = a.exec(); Modified: head/databases/redisdesktopmanager/files/patch-src_rdm.pro ============================================================================== --- head/databases/redisdesktopmanager/files/patch-src_rdm.pro Wed Aug 12 10:29:06 2020 (r544742) +++ head/databases/redisdesktopmanager/files/patch-src_rdm.pro Wed Aug 12 10:58:12 2020 (r544743) @@ -1,24 +1,22 @@ ---- src/rdm.pro.orig 2018-11-27 08:26:54 UTC +--- src/rdm.pro.orig 2020-08-10 20:02:36 UTC +++ src/rdm.pro -@@ -25,8 +25,6 @@ SOURCES += \ - $$PWD/modules/connections-tree/items/*.cpp \ - $$PWD/modules/console/*.cpp \ - $$PWD/modules/value-editor/*.cpp \ -- $$PWD/modules/crashhandler/*.cpp \ -- $$PWD/modules/updater/*.cpp \ - $$PWD/modules/bulk-operations/*.cpp \ - $$PWD/modules/common/*.cpp \ - $$PWD/modules/server-stats/*.cpp \ -@@ -41,8 +39,6 @@ HEADERS += \ - $$PWD/modules/connections-tree/items/*.h \ - $$PWD/modules/console/*.h \ - $$PWD/modules/value-editor/*.h \ -- $$PWD/modules/crashhandler/*.h \ -- $$PWD/modules/updater/*.h \ - $$PWD/modules/*.h \ - $$PWD/modules/bulk-operations/*.h \ - $$PWD/modules/common/*.h \ -@@ -96,8 +92,8 @@ unix:!macx { # ubuntu & debian +@@ -30,7 +30,6 @@ SOURCES += \ + $$files($$PWD/modules/console/*.cpp) \ + $$files($$PWD/modules/value-editor/*model.cpp) \ + $$files($$PWD/modules/value-editor/embedded*.cpp) \ +- $$files($$PWD/modules/updater/*.cpp) \ + $$files($$PWD/modules/bulk-operations/*.cpp) \ + $$files($$PWD/modules/bulk-operations/operations/*.cpp) \ + $$files($$PWD/modules/common/*.cpp) \ +@@ -50,7 +49,6 @@ HEADERS += \ + $$files($$PWD/modules/value-editor/*factory.h) \ + $$files($$PWD/modules/value-editor/*model.h) \ + $$files($$PWD/modules/value-editor/embedded*.h) \ +- $$files($$PWD/modules/updater/*.h) \ + $$files($$PWD/modules/*.h) \ + $$files($$PWD/modules/bulk-operations/*.h) \ + $$files($$PWD/modules/bulk-operations/operations/*.h) \ +@@ -102,8 +100,8 @@ unix:!macx { # ubuntu & debian QMAKE_CXXFLAGS += -Wno-sign-compare
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008121058.07CAwD5q086718>