Attachment #209750 for bug #242472

View | Details | Raw Unified | Return to bug 242472
Collapse All | Expand All

Lines 2-8 Link Here

(-)w/graphics/openorienteering-mapper/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openorienteering-mapper	4	PORTNAME= openorienteering-mapper
5	PORTVERSION= 0.9.0	5	PORTVERSION= 0.9.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= graphics geography	7	CATEGORIES= graphics geography
8		8

Lines 1-3 Link Here

(-)w/graphics/openorienteering-mapper/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1571822907	1	TIMESTAMP = 1575541772
2	SHA256 (OpenOrienteering-mapper-v0.9.0_GH0.tar.gz) = d545e6d798346a34eb37240d8ed6218039adef42b4edf9384ee34d8eff96cb59	2	SHA256 (OpenOrienteering-mapper-v0.9.1_GH0.tar.gz) = 3e345d7883236b369e860f40b59687e686a96b0a65518bb3b0625659abf0d200
3	SIZE (OpenOrienteering-mapper-v0.9.0_GH0.tar.gz) = 9414101	3	SIZE (OpenOrienteering-mapper-v0.9.1_GH0.tar.gz) = 9634841




--- CMakeLists.txt.orig	2019-12-05 06:33:57 UTC
+++ CMakeLists.txt
@@ -66,6 +66,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug missing transl
 # Used for some Linux distributions which do not provide the polyclipping lib.
 option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF)
 

 option(Mapper_USE_GDAL   "Use the GDAL library" ON)
 
 if(CMAKE_BUILD_TYPE MATCHES Release|MinSizeRel|RelWithDebInfo)
@@ -247,10 +252,20 @@ endif()
 
 # Subdirectories
 

 add_subdirectory("3rd-party/qbezier")
 if(NOT ANDROID)
 	add_subdirectory("3rd-party/qtsingleapplication")
@@ -271,7 +286,7 @@ if(CMAKE_CROSSCOMPILING)
 	add_custom_target(TEST_WARNING ALL
 	  COMMENT "Crosscompiling, skipping all tests")
 	add_dependencies(TEST_WARNING Mapper)

Lines 1-6 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt (-2 / +2 lines)
1	--- packaging/CMakeLists.txt.orig 2018-12-23 20:55:50 UTC	1	--- packaging/CMakeLists.txt.orig 2019-12-05 06:33:57 UTC
2	+++ packaging/CMakeLists.txt	2	+++ packaging/CMakeLists.txt
3	@@ -437,7 +437,7 @@ endforeach(_qt_plugin)	3	@@ -426,7 +426,7 @@ endforeach(_qt_plugin)
4	if(UNIX AND NOT APPLE AND NOT ANDROID)	4	if(UNIX AND NOT APPLE AND NOT ANDROID)
5	install(	5	install(
6	FILES "${PROJECT_SOURCE_DIR}/doc/man/Mapper.1"	6	FILES "${PROJECT_SOURCE_DIR}/doc/man/Mapper.1"

Lines 1-6 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in (-3 / +3 lines)
1	--- packaging/custom_install.cmake.in.orig 2019-10-23 12:42:51.349480000 +0300	1	--- packaging/custom_install.cmake.in.orig 2019-12-05 06:33:57 UTC
2	+++ packaging/custom_install.cmake.in 2019-10-23 12:42:57.488297000 +0300	2	+++ packaging/custom_install.cmake.in
3	@@ -122,4 +122,4 @@	3	@@ -122,4 +122,4 @@ endif()
4	set(runtime "")	4	set(runtime "")
5	set(dirs "@MAPPER_LIB_HINTS@")	5	set(dirs "@MAPPER_LIB_HINTS@")
6	handle_qt_conf()	6	handle_qt_conf()

Lines 1-9 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt (-3 / +5 lines)
1	--- src/CMakeLists.txt.orig 2018-12-23 20:55:50 UTC	1	Add translation files only if the NLS knob is set
		2
		3	--- src/CMakeLists.txt.orig 2019-12-05 06:33:57 UTC
2	+++ src/CMakeLists.txt	4	+++ src/CMakeLists.txt
3	@@ -286,7 +286,9 @@ target_compile_definitions(Mapper_Common PRIVATE	5	@@ -287,7 +287,9 @@ target_compile_definitions(Mapper_Common INTERFACE
4	# MAPPER_ENABLE_COMPATIBILITY
5	)	6	)
6		7
		8
7	-mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})	9	-mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})
8	+if(Mapper_WITH_NLS)	10	+if(Mapper_WITH_NLS)
9	+ mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})	11	+ mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})

Lines 1-6 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt (-2 / +4 lines)
1	--- src/gdal/CMakeLists.txt.orig 2018-12-23 20:55:50 UTC	1	Add translation files only if the NLS knob is set
		2
		3	--- src/gdal/CMakeLists.txt.orig 2019-12-05 06:33:57 UTC
2	+++ src/gdal/CMakeLists.txt	4	+++ src/gdal/CMakeLists.txt
3	@@ -35,7 +35,9 @@ set(MAPPER_GDAL_SOURCES	5	@@ -36,7 +36,9 @@ set(MAPPER_GDAL_SOURCES
4	mapper-osmconf.ini	6	mapper-osmconf.ini
5	)	7	)
6		8

Lines 1-6 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in (-2 / +2 lines)
1	--- src/mapper_config.h.in.orig 2018-12-23 20:55:50 UTC	1	--- src/mapper_config.h.in.orig 2019-12-05 06:33:57 UTC
2	+++ src/mapper_config.h.in	2	+++ src/mapper_config.h.in
3	@@ -30,6 +30,7 @@	3	@@ -32,6 +32,7 @@
4		4
5	#cmakedefine Mapper_DEBUG_TRANSLATIONS	5	#cmakedefine Mapper_DEBUG_TRANSLATIONS
6	#cmakedefine Mapper_PACKAGE_NAME	6	#cmakedefine Mapper_PACKAGE_NAME

Lines 1-8 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt (-3 / +3 lines)
1	Add translation files only if the NLS knob is set	1	Add translation files only if the NLS knob is set
2		2
3	--- src/sensors/CMakeLists.txt.orig 2019-10-23 13:52:38.938027000 +0300	3	--- src/sensors/CMakeLists.txt.orig 2019-12-05 06:33:57 UTC
4	+++ src/sensors/CMakeLists.txt 2019-10-23 13:53:09.513288000 +0300	4	+++ src/sensors/CMakeLists.txt
5	@@ -104,7 +104,9 @@	5	@@ -104,7 +104,9 @@ endforeach()
6		6
7	# Translations	7	# Translations
8		8




man/man1/Mapper.1.gz
share/applications/Mapper.desktop
%%DOCSDIR%%/3rd-party/qtsingleapplication.txt
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.1 Manual.qch
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.1 Manual.qhc
%%DOCSDIR%%/common-licenses/GPL-3.txt
%%DOCSDIR%%/licensing.html
share/icons/hicolor/128x128/apps/Mapper.png

%%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/15000/ISSkiOM_15000.omap
%%DATADIR%%/symbol sets/20000/ISMTBOM_20000.omap
%%DATADIR%%/symbol sets/4000/Course_Design_4000.omap
%%DATADIR%%/symbol sets/4000/ISSOM_4000.omap
%%DATADIR%%/symbol sets/5000/Course_Design_5000.omap
%%DATADIR%%/symbol sets/5000/ISMTBOM_5000.omap
%%DATADIR%%/symbol sets/5000/ISSOM_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/ISOM2000-ISOM 2017-2.crt
%%DATADIR%%/symbol sets/ISOM2000-ISSOM.crt
%%DATADIR%%/symbol sets/OSM-ISOM 2017-2.crt
%%DATADIR%%/symbol sets/OSM-ISOM2000.crt
%%DATADIR%%/symbol sets/OSM-ISSOM.crt
%%DATADIR%%/symbol sets/OSM-ISSkiOM 2019.crt
%%NLS%%%%DATADIR%%/translations/OpenOrienteering_cs.qm
%%NLS%%%%DATADIR%%/translations/OpenOrienteering_da.qm
%%NLS%%%%DATADIR%%/translations/OpenOrienteering_de.qm

Return to bug 242472

Lines 1-6 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-CMakeLists.txt (-4 / +4 lines)
1	--- CMakeLists.txt.orig 2018-12-23 20:55:50 UTC	1	--- CMakeLists.txt.orig 2019-12-05 06:33:57 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -73,6 +73,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug missing transl	3	@@ -66,6 +66,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug missing transl
4	# Used for some Linux distributions which do not provide the polyclipping lib.	4	# Used for some Linux distributions which do not provide the polyclipping lib.
5	option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF)	5	option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF)
6		6
Lines 12-18 Link Here
12	option(Mapper_USE_GDAL "Use the GDAL library" ON)	12	option(Mapper_USE_GDAL "Use the GDAL library" ON)
13		13
14	if(CMAKE_BUILD_TYPE MATCHES Release\|MinSizeRel\|RelWithDebInfo)	14	if(CMAKE_BUILD_TYPE MATCHES Release\|MinSizeRel\|RelWithDebInfo)
15	@@ -231,10 +236,20 @@ endif()	15	@@ -247,10 +252,20 @@ endif()
16		16
17	# Subdirectories	17	# Subdirectories
18		18
Lines 36-42 Link Here
36	add_subdirectory("3rd-party/qbezier")	36	add_subdirectory("3rd-party/qbezier")
37	if(NOT ANDROID)	37	if(NOT ANDROID)
38	add_subdirectory("3rd-party/qtsingleapplication")	38	add_subdirectory("3rd-party/qtsingleapplication")
39	@@ -254,7 +269,7 @@ if(CMAKE_CROSSCOMPILING)	39	@@ -271,7 +286,7 @@ if(CMAKE_CROSSCOMPILING)
40	add_custom_target(TEST_WARNING ALL	40	add_custom_target(TEST_WARNING ALL
41	COMMENT "Crosscompiling, skipping all tests")	41	COMMENT "Crosscompiling, skipping all tests")
42	add_dependencies(TEST_WARNING Mapper)	42	add_dependencies(TEST_WARNING Mapper)

Lines 2-9 bin/Mapper Link Here

(-)w/graphics/openorienteering-mapper/pkg-plist (-8 / +9 lines)
2	man/man1/Mapper.1.gz	2	man/man1/Mapper.1.gz
3	share/applications/Mapper.desktop	3	share/applications/Mapper.desktop
4	%%DOCSDIR%%/3rd-party/qtsingleapplication.txt	4	%%DOCSDIR%%/3rd-party/qtsingleapplication.txt
5	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.0 Manual.qch	5	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.1 Manual.qch
6	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.0 Manual.qhc	6	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.1 Manual.qhc
7	%%DOCSDIR%%/common-licenses/GPL-3.txt	7	%%DOCSDIR%%/common-licenses/GPL-3.txt
8	%%DOCSDIR%%/licensing.html	8	%%DOCSDIR%%/licensing.html
9	share/icons/hicolor/128x128/apps/Mapper.png	9	share/icons/hicolor/128x128/apps/Mapper.png
Lines 38-63 share/mime/packages/openorienteering-mapper.xml Link Here
38	%%DATADIR%%/symbol sets/10000/Course_Design_10000.omap	38	%%DATADIR%%/symbol sets/10000/Course_Design_10000.omap
39	%%DATADIR%%/symbol sets/10000/ISMTBOM_10000.omap	39	%%DATADIR%%/symbol sets/10000/ISMTBOM_10000.omap
40	%%DATADIR%%/symbol sets/10000/ISOM 2017-2_10000.omap	40	%%DATADIR%%/symbol sets/10000/ISOM 2017-2_10000.omap
41	%%DATADIR%%/symbol sets/10000/ISOM2000_10000.omap	41	%%DATADIR%%/symbol sets/10000/ISSkiOM 2019_10000.omap
42	%%DATADIR%%/symbol sets/10000/ISSkiOM_10000.omap	42	%%DATADIR%%/symbol sets/12500/ISSkiOM 2019_12500.omap
43	%%DATADIR%%/symbol sets/15000/Course_Design_15000.omap	43	%%DATADIR%%/symbol sets/15000/Course_Design_15000.omap
44	%%DATADIR%%/symbol sets/15000/ISMTBOM_15000.omap	44	%%DATADIR%%/symbol sets/15000/ISMTBOM_15000.omap
45	%%DATADIR%%/symbol sets/15000/ISOM 2017-2_15000.omap	45	%%DATADIR%%/symbol sets/15000/ISOM 2017-2_15000.omap
46	%%DATADIR%%/symbol sets/15000/ISOM2000_15000.omap	46	%%DATADIR%%/symbol sets/15000/ISSkiOM 2019_15000.omap
47	%%DATADIR%%/symbol sets/15000/ISSkiOM_15000.omap
48	%%DATADIR%%/symbol sets/20000/ISMTBOM_20000.omap	47	%%DATADIR%%/symbol sets/20000/ISMTBOM_20000.omap
49	%%DATADIR%%/symbol sets/4000/Course_Design_4000.omap	48	%%DATADIR%%/symbol sets/4000/Course_Design_4000.omap
50	%%DATADIR%%/symbol sets/4000/ISSOM_4000.omap	49	%%DATADIR%%/symbol sets/4000/ISSOM_4000.omap
51	%%DATADIR%%/symbol sets/5000/Course_Design_5000.omap	50	%%DATADIR%%/symbol sets/5000/Course_Design_5000.omap
52	%%DATADIR%%/symbol sets/5000/ISMTBOM_5000.omap	51	%%DATADIR%%/symbol sets/5000/ISMTBOM_5000.omap
53	%%DATADIR%%/symbol sets/5000/ISSOM_5000.omap	52	%%DATADIR%%/symbol sets/5000/ISSOM_5000.omap
54	%%DATADIR%%/symbol sets/5000/ISSkiOM_5000.omap	53	%%DATADIR%%/symbol sets/5000/ISSkiOM 2019_5000.omap
55	%%DATADIR%%/symbol sets/7500/ISMTBOM_7500.omap	54	%%DATADIR%%/symbol sets/7500/ISMTBOM_7500.omap
		55	%%DATADIR%%/symbol sets/7500/ISSkiOM 2019_7500.omap
		56	%%DATADIR%%/symbol sets/ISOM 2017-2-ISSkiOM 2019.crt
56	%%DATADIR%%/symbol sets/ISOM2000-ISOM 2017-2.crt	57	%%DATADIR%%/symbol sets/ISOM2000-ISOM 2017-2.crt
57	%%DATADIR%%/symbol sets/ISOM2000-ISSOM.crt	58	%%DATADIR%%/symbol sets/ISOM2000-ISSOM.crt
58	%%DATADIR%%/symbol sets/OSM-ISOM 2017-2.crt	59	%%DATADIR%%/symbol sets/OSM-ISOM 2017-2.crt
59	%%DATADIR%%/symbol sets/OSM-ISOM2000.crt
60	%%DATADIR%%/symbol sets/OSM-ISSOM.crt	60	%%DATADIR%%/symbol sets/OSM-ISSOM.crt
		61	%%DATADIR%%/symbol sets/OSM-ISSkiOM 2019.crt
61	%%NLS%%%%DATADIR%%/translations/OpenOrienteering_cs.qm	62	%%NLS%%%%DATADIR%%/translations/OpenOrienteering_cs.qm
62	%%NLS%%%%DATADIR%%/translations/OpenOrienteering_da.qm	63	%%NLS%%%%DATADIR%%/translations/OpenOrienteering_da.qm
63	%%NLS%%%%DATADIR%%/translations/OpenOrienteering_de.qm	64	%%NLS%%%%DATADIR%%/translations/OpenOrienteering_de.qm