graphics/openorienteering-mapper: Update to 0.9.5 and prepare to proj8

- Update to 0.9.5
- Use patch from https://github.com/OpenOrienteering/mapper/pull/1994
- rm patch-src_core_objects_object.h and patch-src_gui_print__tool.cpp
- fix patch-src_sensors_CMakeLists.txt
- update pkg-plist

PR:		259845
Approved by:	maintainer (timeout)

6 files changed, 21 insertions, 38 deletions

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,8 +1,7 @@
 # Created by: Nikolay Korotkiy <sikmir@gmail.com>
 
 PORTNAME=	openorienteering-mapper
-PORTVERSION=	0.9.2
-PORTREVISION=	3
+PORTVERSION=	0.9.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics geography
 
@@ -12,6 +11,9 @@ 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
 
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<bool>(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 <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #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
@@ -3,8 +3,8 @@ 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
@@ -68,6 +68,7 @@ share/mime/packages/openorienteering-mapper.xml
 %%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
@@ -96,7 +97,9 @@ share/mime/packages/openorienteering-mapper.xml
 %%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