diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile index 637d530d12e1..be52e644dccf 100644 --- a/astro/qmapshack/Makefile +++ b/astro/qmapshack/Makefile @@ -1,31 +1,30 @@ PORTNAME= qmapshack DISTVERSIONPREFIX= V_ -DISTVERSION= 1.20.1 -PORTREVISION= 1 +DISTVERSION= 1.20.2 CATEGORIES= astro MAINTAINER= cmt@FreeBSD.org COMMENT= Ultimate outdoor aficionado's tool WWW= https://github.com/Maproom/qmapshack/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libalglib.so:math/alglib \ libgdal.so:graphics/gdal \ libproj.so:graphics/proj \ libquazip1-qt6.so:archivers/quazip@qt6 \ libroutino.so:astro/routino RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks USES= cmake desktop-file-utils gl jpeg qt:6 USE_GITHUB= yes GH_ACCOUNT= Maproom USE_GL= gl USE_QT= 5compat base declarative positioning tools webchannel \ webengine OPTIONS_DEFINE= DOCS .include diff --git a/astro/qmapshack/distinfo b/astro/qmapshack/distinfo index ac2c4aca5d24..9205200cc428 100644 --- a/astro/qmapshack/distinfo +++ b/astro/qmapshack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1771963211 -SHA256 (Maproom-qmapshack-V_1.20.1_GH0.tar.gz) = 5f1b543753ba387226c9f653590af104cf10e756f9db3704c0679535fa0cb5d5 -SIZE (Maproom-qmapshack-V_1.20.1_GH0.tar.gz) = 57841997 +TIMESTAMP = 1777058980 +SHA256 (Maproom-qmapshack-V_1.20.2_GH0.tar.gz) = e7271b9370577377bb2608d82e89cbc0a8a309100dbb51d97291f6bfbedce05c +SIZE (Maproom-qmapshack-V_1.20.2_GH0.tar.gz) = 57865664 diff --git a/astro/qmapshack/files/patch-src_qmapshack_setup_CAppSetupLinux.cpp b/astro/qmapshack/files/patch-src_qmapshack_setup_CAppSetupLinux.cpp index d0c37613fef8..9adeec9dd155 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_setup_CAppSetupLinux.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_setup_CAppSetupLinux.cpp @@ -1,22 +1,30 @@ -commit d1fe132b222794ca1587785a62e3d4e2485918ca +commit b14348175018950fedb676b1e56e433d813af9bb Author: Christoph Moench-Tegeder - sighandler_t is a GNU extension + Avoid Linuxisms - use the corresponding FreeBSD extension sig_t + 1. sighandler_t is a GNU extension - use FreeBSD extension sig_t + instead, where applicable + 2. include sys/stat.h for S_IRXWU - on Linux it's implicit (via file.h, + I think), but not everywhere diff --git src/qmapshack/setup/CAppSetupLinux.cpp src/qmapshack/setup/CAppSetupLinux.cpp -index 028a55f5..cd856e36 100644 +index 4c468417..4053532f 100644 --- src/qmapshack/setup/CAppSetupLinux.cpp +++ src/qmapshack/setup/CAppSetupLinux.cpp -@@ -29,6 +29,10 @@ +@@ -30,10 +30,15 @@ + #include + #include + #include ++#include + #include "config.h" #include "version.h" +#if defined(Q_OS_FREEBSD) +typedef sig_t sighandler_t; +#endif + void CAppSetupLinux::initQMapShack() { // setup gdal prepareGdal("", "", ""); diff --git a/astro/qmapshack/files/patch-src_qmaptool_setup_CAppSetupLinux.cpp b/astro/qmapshack/files/patch-src_qmaptool_setup_CAppSetupLinux.cpp index 9e1a94c498a3..32743d4f866a 100644 --- a/astro/qmapshack/files/patch-src_qmaptool_setup_CAppSetupLinux.cpp +++ b/astro/qmapshack/files/patch-src_qmaptool_setup_CAppSetupLinux.cpp @@ -1,22 +1,30 @@ -commit a23da70dfce1212ef8399cca261a095bb472ea61 +commit f9ad12bb5d1ccb40c048732400d07cb56521840b Author: Christoph Moench-Tegeder - sighandler_t is a GNU extension + Avoid Linuxisms - use the correspondig FreeBSD extension sig_t + 1. sighandler_t is a GNU extension - use FreeBSD extension sig_t + instead, where applicable + 2. include sys/stat.h for S_IRXWU - on Linux it's implicit (via file.h, + I think), but not everywhere diff --git src/qmaptool/setup/CAppSetupLinux.cpp src/qmaptool/setup/CAppSetupLinux.cpp -index 19ebccfa..74563081 100644 +index d3e353fa..ca36a2f3 100644 --- src/qmaptool/setup/CAppSetupLinux.cpp +++ src/qmaptool/setup/CAppSetupLinux.cpp -@@ -29,6 +29,10 @@ +@@ -30,10 +30,15 @@ + #include + #include + #include ++#include + #include "config.h" #include "version.h" +#if defined(Q_OS_FREEBSD) +typedef sig_t sighandler_t; +#endif + void CAppSetupLinux::initQMapTool() { // setup gdal prepareGdal("", "", "");