diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile index 66c3f1fdd035..b85a4d2ee5af 100644 --- a/astro/qmapshack/Makefile +++ b/astro/qmapshack/Makefile @@ -1,32 +1,31 @@ PORTNAME= qmapshack -PORTVERSION= 1.16.1 -PORTREVISION= 10 +PORTVERSION= 1.17.0 DISTVERSIONPREFIX= V_ CATEGORIES= astro MAINTAINER= bofh@FreeBSD.org COMMENT= Ultimate outdoor aficionado's tool WWW= https://github.com/Maproom/qmapshack/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgdal.so:graphics/gdal \ libproj.so:graphics/proj \ libquazip1-qt5.so:archivers/quazip@qt5 \ libroutino.so:astro/routino RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks USES= cmake compiler:c++11-lib desktop-file-utils gl jpeg \ pkgconfig qt:5 xorg USE_GITHUB= yes USE_GL= gl USE_QT= buildtools core dbus declarative gui help linguisttools location network \ printsupport qmake sql sql-sqlite3 uitools \ webchannel webengine widgets xml GH_ACCOUNT= Maproom OPTIONS_DEFINE= DOCS .include 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,22 +1,22 @@ ---- 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) include(DefineCompilerFlags) include(DefineInstallationPaths) +include(FindPkgConfig) 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) -find_package(PROJ REQUIRED) +find_package(PROJ) +if (NOT PROJ_FOUND) + pkg_search_module(PROJ REQUIRED proj) +endif() find_package(JPEG REQUIRED) find_package(ROUTINO REQUIRED) find_package(QuaZip-Qt5 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,11 +1,11 @@ ---- 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} - ${PROJ_LIBRARIES} + ${PROJ_LDFLAGS} ${PROJ_LIBRARIES} ${ROUTINO_LIBRARIES} ${ALGLIB_LIBRARIES} QuaZip::QuaZip 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(); -+ 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(); ++ 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 +#include + #include #include - #include