diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile index d45bf01a6ea4..e41f01368a8a 100644 --- a/graphics/openorienteering-mapper/Makefile +++ b/graphics/openorienteering-mapper/Makefile @@ -1,53 +1,55 @@ # Created by: Nikolay Korotkiy PORTNAME= openorienteering-mapper -PORTVERSION= 0.9.2 -PORTREVISION= 3 +PORTVERSION= 0.9.5 DISTVERSIONPREFIX= v CATEGORIES= graphics geography MAINTAINER= sikmir@gmail.com COMMENT= Map drawing program from OpenOrienteering LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +PATCH_SITES= https://github.com/OpenOrienteering/mapper/commit/ +PATCHFILES= 69977dfd4cbb8608aafa8ca8b5388d4983f5430a.patch:-p1 + LIB_DEPENDS= libpolyclipping.so:graphics/polyclipping \ libproj.so:graphics/proj USES= cmake:noninja compiler:c++14-lang \ desktop-file-utils gmake qt:5 shared-mime-info USE_QT= buildtools_build help qmake_build concurrent core gui \ network printsupport testlib widgets USE_GITHUB= yes GH_ACCOUNT= OpenOrienteering GH_PROJECT= mapper CMAKE_ARGS+= -DLICENSING_PROVIDER=freebsd \ -DMapper_PACKAGE_NAME=${PORTNAME} \ -Wno-dev OPTIONS_DEFINE= DOCS EXAMPLES GDAL NLS POSITIONING TEST TIFF OPTIONS_DEFAULT= DOCS EXAMPLES GDAL NLS TIFF OPTIONS_SUB= yes DOCS_CMAKE_BOOL= Mapper_WITH_DOCS DOCS_BUILD_DEPENDS= doxygen:devel/doxygen DOCS_USE= QT=assistant_run EXAMPLES_CMAKE_BOOL= Mapper_WITH_EXAMPLES GDAL_DESC= Use the GDAL library GDAL_CMAKE_BOOL= Mapper_USE_GDAL GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal NLS_CMAKE_BOOL= Mapper_WITH_NLS NLS_USE= QT=linguisttools_build NLS_USES= gettext-runtime POSITIONING_DESC= GPS positioning POSITIONING_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=0 POSITIONING_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=1 POSITIONING_USE= QT=location,sensors,serialport TEST_CMAKE_BOOL= Mapper_WITH_TEST TEST_USE= QT=testlib_build TEST_TEST_TARGET= test TIFF_DESC= Support for TIFF TIFF_USE= QT=imageformats .include diff --git a/graphics/openorienteering-mapper/distinfo b/graphics/openorienteering-mapper/distinfo index 119cbb6b175b..7be43d23337f 100644 --- a/graphics/openorienteering-mapper/distinfo +++ b/graphics/openorienteering-mapper/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1586012779 -SHA256 (OpenOrienteering-mapper-v0.9.2_GH0.tar.gz) = 1a797c3db4ee795585cd324b50b0a37fc9e545233f02cc28660e6f9790e49a51 -SIZE (OpenOrienteering-mapper-v0.9.2_GH0.tar.gz) = 11503101 +TIMESTAMP = 1636910244 +SHA256 (OpenOrienteering-mapper-v0.9.5_GH0.tar.gz) = 619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00 +SIZE (OpenOrienteering-mapper-v0.9.5_GH0.tar.gz) = 11991430 +SHA256 (69977dfd4cbb8608aafa8ca8b5388d4983f5430a.patch) = abc1315ef04364c2051d622163287a3a35b629136ca7ad8568ad630cb471571a +SIZE (69977dfd4cbb8608aafa8ca8b5388d4983f5430a.patch) = 1919 diff --git a/graphics/openorienteering-mapper/files/patch-src_core_objects_object.h b/graphics/openorienteering-mapper/files/patch-src_core_objects_object.h deleted file mode 100644 index 67d1faad9eac..000000000000 --- a/graphics/openorienteering-mapper/files/patch-src_core_objects_object.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/core/objects/object.h.orig 2020-03-14 12:50:26 UTC -+++ src/core/objects/object.h -@@ -1276,7 +1276,7 @@ float ObjectPathCoord::findClosestPointTo(const MapCoo - inline - constexpr ObjectPathCoord::operator bool() const - { -- return bool { object }; -+ return static_cast(object); - } - - } // namespace OpenOrienteering diff --git a/graphics/openorienteering-mapper/files/patch-src_gui_print__tool.cpp b/graphics/openorienteering-mapper/files/patch-src_gui_print__tool.cpp deleted file mode 100644 index 227b74c193b4..000000000000 --- a/graphics/openorienteering-mapper/files/patch-src_gui_print__tool.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/gui/print_tool.cpp.orig 2020-05-21 09:05:59 UTC -+++ src/gui/print_tool.cpp -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - #include "core/map.h" - #include "core/map_printer.h" diff --git a/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt b/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt index 9bee6e51b19b..66fc757a8f6e 100644 --- a/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt +++ b/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt @@ -1,18 +1,15 @@ Add translation files only if the NLS knob is set ---- src/sensors/CMakeLists.txt.orig 2019-12-05 06:33:57 UTC +--- src/sensors/CMakeLists.txt.orig 2021-11-14 18:17:23 UTC +++ src/sensors/CMakeLists.txt -@@ -104,7 +104,9 @@ endforeach() +@@ -181,8 +181,10 @@ endif() # Translations --mapper_translations_sources( -- ${MAPPER_SENSORS_SOURCES} -- ${POWERSHELL_POSITION_SOURCES} --) +if(Mapper_WITH_NLS) -+ mapper_translations_sources( -+ ${MAPPER_SENSORS_SOURCES} -+ ${POWERSHELL_POSITION_SOURCES} -+ ) + mapper_translations_sources( + ${MAPPER_SENSORS_SOURCES} + ${NMEA_POSITION_SOURCES} + ${POWERSHELL_POSITION_SOURCES} + ) +endif() diff --git a/graphics/openorienteering-mapper/pkg-plist b/graphics/openorienteering-mapper/pkg-plist index 96ab387c0700..2d8dae77af03 100644 --- a/graphics/openorienteering-mapper/pkg-plist +++ b/graphics/openorienteering-mapper/pkg-plist @@ -1,104 +1,107 @@ bin/Mapper man/man1/Mapper.1.gz share/applications/Mapper.desktop %%DOCSDIR%%/3rd-party/qtsingleapplication.txt %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/3rd-party/potrace-1.6.txt -%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.2 Manual.qch -%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.2 Manual.qhc +%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.5 Manual.qch +%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.5 Manual.qhc %%DOCSDIR%%/common-licenses/GPL-3.txt %%DOCSDIR%%/licensing.html share/icons/hicolor/128x128/apps/Mapper.png share/icons/hicolor/128x128/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/128x128/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/16x16/apps/Mapper.png share/icons/hicolor/16x16/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/16x16/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/24x24/apps/Mapper.png share/icons/hicolor/24x24/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/24x24/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/256x256/apps/Mapper.png share/icons/hicolor/256x256/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/256x256/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/32x32/apps/Mapper.png share/icons/hicolor/32x32/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/32x32/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/48x48/apps/Mapper.png share/icons/hicolor/48x48/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/48x48/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/512x512/apps/Mapper.png share/icons/hicolor/512x512/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/512x512/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/96x96/apps/Mapper.png share/icons/hicolor/96x96/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/96x96/mimetypes/application-x-openorienteering-xmap.png share/mime/packages/openorienteering-mapper.xml %%EXAMPLES%%%%DATADIR%%/examples/complete map.omap %%EXAMPLES%%%%DATADIR%%/examples/forest sample.omap %%EXAMPLES%%%%DATADIR%%/examples/overprinting.omap %%GDAL%%%%DATADIR%%/gdal/mapper-osmconf.ini %%DATADIR%%/symbol sets/10000/Course_Design_10000.omap %%DATADIR%%/symbol sets/10000/ISMTBOM_10000.omap %%DATADIR%%/symbol sets/10000/ISOM 2017-2_10000.omap %%DATADIR%%/symbol sets/10000/ISSkiOM 2019_10000.omap %%DATADIR%%/symbol sets/12500/ISSkiOM 2019_12500.omap %%DATADIR%%/symbol sets/15000/Course_Design_15000.omap %%DATADIR%%/symbol sets/15000/ISMTBOM_15000.omap %%DATADIR%%/symbol sets/15000/ISOM 2017-2_15000.omap %%DATADIR%%/symbol sets/15000/ISSkiOM 2019_15000.omap %%DATADIR%%/symbol sets/20000/ISMTBOM_20000.omap %%DATADIR%%/symbol sets/4000/Course_Design_4000.omap %%DATADIR%%/symbol sets/4000/ISSprOM 2019_4000.omap %%DATADIR%%/symbol sets/5000/Course_Design_5000.omap %%DATADIR%%/symbol sets/5000/ISMTBOM_5000.omap %%DATADIR%%/symbol sets/5000/ISSkiOM 2019_5000.omap %%DATADIR%%/symbol sets/7500/ISMTBOM_7500.omap %%DATADIR%%/symbol sets/7500/ISSkiOM 2019_7500.omap %%DATADIR%%/symbol sets/ISOM 2017-2-ISSkiOM 2019.crt %%DATADIR%%/symbol sets/ISOM 2017-2-ISSprOM 2019.crt %%DATADIR%%/symbol sets/ISOM2000-ISOM 2017-2.crt %%DATADIR%%/symbol sets/ISSOM-ISSprOM 2019.crt %%DATADIR%%/symbol sets/OSM-ISOM 2017-2.crt %%DATADIR%%/symbol sets/OSM-ISSkiOM 2019.crt %%DATADIR%%/symbol sets/OSM-ISSprOM 2019.crt %%NLS%%%%DATADIR%%/translations/OpenOrienteering_cs.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_da.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_de.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_en.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_eo.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_es.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_fi.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_fr.qm +%%NLS%%%%DATADIR%%/translations/OpenOrienteering_he.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_hr.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_hu.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_id.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_it.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_ja.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_lv.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_nb.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_nl.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_pl.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_pt_BR.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_pt_PT.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_ru.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_sv.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_uk.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_zh_CN.qm %%NLS%%%%DATADIR%%/translations/map_symbols_cs.qm %%NLS%%%%DATADIR%%/translations/map_symbols_da.qm %%NLS%%%%DATADIR%%/translations/map_symbols_de.qm %%NLS%%%%DATADIR%%/translations/map_symbols_eo.qm %%NLS%%%%DATADIR%%/translations/map_symbols_es.qm %%NLS%%%%DATADIR%%/translations/map_symbols_fi.qm %%NLS%%%%DATADIR%%/translations/map_symbols_fr.qm %%NLS%%%%DATADIR%%/translations/map_symbols_hr.qm %%NLS%%%%DATADIR%%/translations/map_symbols_hu.qm %%NLS%%%%DATADIR%%/translations/map_symbols_it.qm %%NLS%%%%DATADIR%%/translations/map_symbols_nb.qm %%NLS%%%%DATADIR%%/translations/map_symbols_ru.qm %%NLS%%%%DATADIR%%/translations/map_symbols_sv.qm +%%NLS%%%%DATADIR%%/translations/map_symbols_tr.qm %%NLS%%%%DATADIR%%/translations/map_symbols_uk.qm +%%NLS%%%%DATADIR%%/translations/map_symbols_zh_CN.qm %%NLS%%%%DATADIR%%/translations/qt_eo.qm %%NLS%%%%DATADIR%%/translations/qt_et.qm %%NLS%%%%DATADIR%%/translations/qt_id.qm %%NLS%%%%DATADIR%%/translations/qt_nb.qm %%NLS%%%%DATADIR%%/translations/qt_nl.qm