diff options
Diffstat (limited to 'astro/qmapshack/files')
11 files changed, 65 insertions, 42 deletions
diff --git a/astro/qmapshack/files/patch-CMakeLists.txt b/astro/qmapshack/files/patch-CMakeLists.txt index 1425b5d86060..55024b2f876f 100644 --- a/astro/qmapshack/files/patch-CMakeLists.txt +++ b/astro/qmapshack/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2023-07-20 14:13:59 UTC +--- CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ CMakeLists.txt -@@ -47,6 +47,7 @@ include(TranslateDesktop) +@@ -46,6 +46,7 @@ include(DefineInstallationPaths) include(DefineCMakeDefaults) include(DefineCompilerFlags) include(DefineInstallationPaths) @@ -8,9 +8,9 @@ include(CPackConfig.cmake) include(ConfigureChecks.cmake) -@@ -185,7 +186,10 @@ find_package(Qt5WebEngineWidgets REQUIRED) - find_package(Qt5Qml REQUIRED) - find_package(Qt5Help REQUIRED) +@@ -192,7 +193,10 @@ find_package(GDAL REQUIRED) + find_package(Qt6Qml REQUIRED) + find_package(Qt6Help REQUIRED) find_package(GDAL REQUIRED) -find_package(PROJ REQUIRED) +find_package(PROJ) @@ -19,4 +19,4 @@ +endif() find_package(JPEG REQUIRED) find_package(ROUTINO REQUIRED) - find_package(QuaZip-Qt5 REQUIRED) + find_package(QuaZip-Qt6 REQUIRED) diff --git a/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake index 77acfa3e0c2b..e085606b1612 100644 --- a/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake +++ b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake @@ -1,20 +1,20 @@ ---- cmake/Modules/DefineInstallationPaths.cmake.orig 2020-03-27 08:07:31 UTC +--- cmake/Modules/DefineInstallationPaths.cmake.orig 2025-07-04 12:38:57 UTC +++ cmake/Modules/DefineInstallationPaths.cmake -@@ -59,7 +59,7 @@ if (UNIX) - FORCE +@@ -51,7 +51,7 @@ if (UNIX) + CACHE PATH "The parent directory where applications can install their data (default prefix/share/${_PROJECT_NAME})" ) SET(HTML_INSTALL_DIR - "${DATA_INSTALL_PREFIX}/doc/HTML" + "${DATA_INSTALL_PREFIX}/doc/${_PROJECT_NAME}/HTML" CACHE PATH "The HTML install dir for documentation (default data/doc/html)" - FORCE ) -@@ -97,7 +97,7 @@ if (UNIX) - FORCE + SET(ICON_INSTALL_DIR +@@ -82,7 +82,7 @@ if (UNIX) + CACHE PATH "The ${_PROJECT_NAME} sysconfig install dir (default prefix/etc)" ) SET(MAN_INSTALL_DIR - "${SHARE_INSTALL_PREFIX}/man" + "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "The ${_PROJECT_NAME} man install dir (default prefix/man)" - FORCE ) + SET(INFO_INSTALL_DIR diff --git a/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt index 85e491ba02cc..da1acbc53c36 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt @@ -1,7 +1,7 @@ ---- src/qmapshack/CMakeLists.txt.orig 2023-07-20 14:13:59 UTC +--- src/qmapshack/CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/CMakeLists.txt -@@ -993,7 +993,7 @@ target_link_libraries(${APPLICATION_NAME} - Qt5::Help +@@ -977,7 +977,7 @@ target_link_libraries(${APPLICATION_NAME} + Qt6::Core5Compat ${DBUS_LIB} ${GDAL_LIBRARIES} - ${PROJ_LIBRARIES} diff --git a/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp b/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp index 349802a14a16..06929a6cacbe 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp @@ -1,6 +1,6 @@ ---- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2023-07-20 14:13:59 UTC +--- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/device/CDeviceWatcherLinux.cpp -@@ -47,6 +47,10 @@ void CDeviceWatcherLinux::slotDeviceAdded(const QDBusO +@@ -97,6 +97,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>(); @@ -11,3 +11,26 @@ QString idLabel = blockIface->property("IdLabel").toString().toUpper(); // read vendor string attached to drive +@@ -207,14 +211,6 @@ QString CDeviceWatcherLinux::readMountPoint(const QStr + + const QDBusMessage& reply = QDBusConnection::systemBus().call(message); + +-#if defined(Q_OS_FREEBSD) +- // this is probably broken code and needs to be fixed +- for (const QVariant& arg : reply.arguments()) { +- if (!arg.value<QDBusVariant>().variant().value<QStringList>().isEmpty()) { +- points.append(arg.value<QDBusVariant>().variant().value<QStringList>().first()); +- } +- } +-#else + QStringList mountPoints; + + for (const QVariant& arg : reply.arguments()) { +@@ -246,7 +242,6 @@ QString CDeviceWatcherLinux::readMountPoint(const QStr + } + dbusArg.endArray(); + } +-#endif + + if (!mountPoints.isEmpty()) { + return mountPoints.first(); diff --git a/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp b/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp index 536f6ccbaefd..3ced1d52eadc 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp @@ -1,10 +1,10 @@ ---- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/gis/wpt/CGisItemWpt.cpp -@@ -40,6 +40,7 @@ +@@ -23,6 +23,7 @@ #include <QPainterPath> #include <QtWidgets> #include <QtXml> +#include <QPainterPath> - IGisItem::key_t CGisItemWpt::keyUserFocus; - QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap; + #include "CMainWindow.h" + #include "canvas/CCanvas.h" diff --git a/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp b/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp index 5f8fe0f14ee3..bd88a2394df3 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp @@ -1,6 +1,6 @@ ---- src/qmapshack/helpers/CDraw.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/helpers/CDraw.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/helpers/CDraw.cpp -@@ -25,6 +25,7 @@ +@@ -24,6 +24,7 @@ #include <QPainterPath> #include <QPointF> #include <QtMath> diff --git a/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp b/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp index 1fa864a24aa5..699d58e3f027 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp @@ -1,10 +1,10 @@ ---- src/qmapshack/map/CMapIMG.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/map/CMapIMG.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/map/CMapIMG.cpp -@@ -34,6 +34,7 @@ +@@ -20,6 +20,7 @@ #include <QPainterPath> #include <QtWidgets> +#include <QPainterPath> - #undef DEBUG_SHOW_SECT_DESC - #undef DEBUG_SHOW_TRE_DATA + #include "CMainWindow.h" + #include "canvas/CCanvas.h" diff --git a/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp b/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp index 4a1bb4396314..a6b607850ae8 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp @@ -1,10 +1,10 @@ ---- src/qmapshack/mouse/IMouseSelect.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/mouse/IMouseSelect.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/mouse/IMouseSelect.cpp -@@ -24,6 +24,7 @@ +@@ -21,6 +21,7 @@ #include <QPainterPath> #include <QtWidgets> +#include <QPainterPath> - IMouseSelect::IMouseSelect(CGisDraw* gis, CCanvas* canvas, CMouseAdapter* mouse) - : IMouse(gis, canvas, mouse) + #include "gis/CGisDraw.h" + #include "mouse/CMouseAdapter.h" diff --git a/astro/qmapshack/files/patch-src_qmaptool_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmaptool_CMakeLists.txt index 5578f1b4081b..3bbea7d0dcac 100644 --- a/astro/qmapshack/files/patch-src_qmaptool_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmaptool_CMakeLists.txt @@ -1,8 +1,8 @@ ---- src/qmaptool/CMakeLists.txt.orig 2021-05-24 09:18:08 UTC +--- src/qmaptool/CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ src/qmaptool/CMakeLists.txt -@@ -259,7 +259,7 @@ target_link_libraries(${APPLICATION_NAME} - Qt5::Network - Qt5::Help +@@ -265,7 +265,7 @@ target_link_libraries(${APPLICATION_NAME} + Qt6::Network + Qt6::Help ${GDAL_LIBRARIES} - ${PROJ_LIBRARIES} + ${PROJ_LDFLAGS} ${PROJ_LIBRARIES} diff --git a/astro/qmapshack/files/patch-src_qmt__map2jnx_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmt__map2jnx_CMakeLists.txt index 50f04b2be82d..38ea49d10fbf 100644 --- a/astro/qmapshack/files/patch-src_qmt__map2jnx_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmt__map2jnx_CMakeLists.txt @@ -1,8 +1,8 @@ ---- src/qmt_map2jnx/CMakeLists.txt.orig 2021-05-24 09:18:08 UTC +--- src/qmt_map2jnx/CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ src/qmt_map2jnx/CMakeLists.txt @@ -53,7 +53,7 @@ TARGET_LINK_LIBRARIES(${APPLICATION_NAME} - Qt5::Core - Qt5::Gui + Qt6::Core + Qt6::Gui ${GDAL_LIBRARIES} - ${PROJ_LIBRARIES} + ${PROJ_LDFLAGS} ${PROJ_LIBRARIES} diff --git a/astro/qmapshack/files/patch-src_qmt__rgb2pct_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmt__rgb2pct_CMakeLists.txt index 8afed710c6e0..349b0cd051f8 100644 --- a/astro/qmapshack/files/patch-src_qmt__rgb2pct_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmt__rgb2pct_CMakeLists.txt @@ -1,8 +1,8 @@ ---- src/qmt_rgb2pct/CMakeLists.txt.orig 2021-05-24 09:18:08 UTC +--- src/qmt_rgb2pct/CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ src/qmt_rgb2pct/CMakeLists.txt -@@ -92,7 +92,7 @@ target_compile_definitions(${APPLICATION_NAME} PUBLIC +@@ -100,7 +100,7 @@ target_link_libraries(${APPLICATION_NAME} target_link_libraries(${APPLICATION_NAME} - Qt5::Core + Qt6::Core ${GDAL_LIBRARIES} - ${PROJ_LIBRARIES} + ${PROJ_LDFLAGS} ${PROJ_LIBRARIES} |