Date: Tue, 1 Aug 2023 18:49:31 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bd6acab37559 - main - astro/qmapshack: Update version 1.16.1=>1.17.0 Message-ID: <202308011849.371InVS8079269@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd6acab3755914e88e576491227f3ff86127d2cd commit bd6acab3755914e88e576491227f3ff86127d2cd Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-08-01 17:30:44 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-08-01 18:49:12 +0000 astro/qmapshack: Update version 1.16.1=>1.17.0 - Refresh patches Changelog: https://github.com/Maproom/qmapshack/releases/tag/V_1.17.0 --- astro/qmapshack/Makefile | 3 +-- astro/qmapshack/distinfo | 6 +++--- astro/qmapshack/files/patch-CMakeLists.txt | 4 ++-- .../files/patch-src_qmapshack_CMakeLists.txt | 4 ++-- ...ch-src_qmapshack_device_CDeviceWatcherLinux.cpp | 22 +++++++++++----------- ...te_router_brouter_CRouterBRouterSetupWizard.cpp | 10 +++++----- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile index 66c3f1fdd035..b85a4d2ee5af 100644 --- a/astro/qmapshack/Makefile +++ b/astro/qmapshack/Makefile @@ -1,6 +1,5 @@ PORTNAME= qmapshack -PORTVERSION= 1.16.1 -PORTREVISION= 10 +PORTVERSION= 1.17.0 DISTVERSIONPREFIX= V_ CATEGORIES= astro diff --git a/astro/qmapshack/distinfo b/astro/qmapshack/distinfo index 477925a2533d..25a2fefe45ff 100644 --- a/astro/qmapshack/distinfo +++ b/astro/qmapshack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639169100 -SHA256 (Maproom-qmapshack-V_1.16.1_GH0.tar.gz) = b407c0710c77e87c9c1f9e1e0d9d6b9055b28dda41b77f9c69ca10a9a6f4e0d5 -SIZE (Maproom-qmapshack-V_1.16.1_GH0.tar.gz) = 54433326 +TIMESTAMP = 1690898633 +SHA256 (Maproom-qmapshack-V_1.17.0_GH0.tar.gz) = 6a5ab283fa82a3405653ce99c49f10018eff177b24917ba3a9193d2f9728d2e8 +SIZE (Maproom-qmapshack-V_1.17.0_GH0.tar.gz) = 56693181 diff --git a/astro/qmapshack/files/patch-CMakeLists.txt b/astro/qmapshack/files/patch-CMakeLists.txt index a7ddfc23540e..1425b5d86060 100644 --- a/astro/qmapshack/files/patch-CMakeLists.txt +++ b/astro/qmapshack/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2021-05-24 09:18:08 UTC +--- CMakeLists.txt.orig 2023-07-20 14:13:59 UTC +++ CMakeLists.txt @@ -47,6 +47,7 @@ include(TranslateDesktop) include(DefineCMakeDefaults) @@ -8,7 +8,7 @@ include(CPackConfig.cmake) include(ConfigureChecks.cmake) -@@ -151,7 +152,10 @@ find_package(Qt5WebEngineWidgets REQUIRED) +@@ -185,7 +186,10 @@ find_package(Qt5WebEngineWidgets REQUIRED) find_package(Qt5Qml REQUIRED) find_package(Qt5Help REQUIRED) find_package(GDAL REQUIRED) diff --git a/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt index 7a8e1fbaaac0..85e491ba02cc 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/qmapshack/CMakeLists.txt.orig 2021-05-24 14:06:57 UTC +--- src/qmapshack/CMakeLists.txt.orig 2023-07-20 14:13:59 UTC +++ src/qmapshack/CMakeLists.txt -@@ -971,7 +971,7 @@ target_link_libraries(${APPLICATION_NAME} +@@ -993,7 +993,7 @@ target_link_libraries(${APPLICATION_NAME} Qt5::Help ${DBUS_LIB} ${GDAL_LIBRARIES} diff --git a/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp b/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp index 551da113e187..349802a14a16 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp @@ -1,13 +1,13 @@ ---- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2023-07-20 14:13:59 UTC +++ src/qmapshack/device/CDeviceWatcherLinux.cpp -@@ -58,6 +58,10 @@ void CDeviceWatcherLinux::slotDeviceAdded(const QDBusO - // create path of to drive the block device belongs to - QDBusInterface* blockIface = new QDBusInterface("org.freedesktop.UDisks2", path.path(), "org.freedesktop.UDisks2.Block", QDBusConnection::systemBus(), this); - QDBusObjectPath drive_object = blockIface->property("Drive").value<QDBusObjectPath>(); -+ if(drive_object.path() == nullptr) -+ { -+ return; -+ } - QString idLabel = blockIface->property("IdLabel").toString().toUpper(); +@@ -47,6 +47,10 @@ void CDeviceWatcherLinux::slotDeviceAdded(const QDBusO + QDBusInterface* blockIface = new QDBusInterface("org.freedesktop.UDisks2", path.path(), + "org.freedesktop.UDisks2.Block", QDBusConnection::systemBus(), this); + QDBusObjectPath drive_object = blockIface->property("Drive").value<QDBusObjectPath>(); ++ if(drive_object.path() == nullptr) ++ { ++ return; ++ } + QString idLabel = blockIface->property("IdLabel").toString().toUpper(); - // read vendor string attached to drive + // read vendor string attached to drive diff --git a/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp b/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp index 1848e32dd13e..0458ce5709f1 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp @@ -1,11 +1,11 @@ ---- src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp.orig 2023-07-20 14:13:59 UTC +++ src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp -@@ -24,7 +24,7 @@ - #include "helpers/CWebPage.h" - #include "setup/IAppSetup.h" +@@ -18,7 +18,7 @@ + + #include "gis/rte/router/brouter/CRouterBRouterSetupWizard.h" -#include <JlCompress.h> +#include <quazip/JlCompress.h> + #include <QFileDialog> #include <QMessageBox> - #include <QNetworkReply>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308011849.371InVS8079269>