Attachment 208541 Details for Bug 241444 – Update to 0.9.0

[patch] Update to 0.9.0

openorienteering-mapper.diff (text/plain), 14.40 KB, created by Nikolay Korotkiy on 2019-10-23 20:26:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolay Korotkiy

Created: 2019-10-23 20:26:59 UTC

Size: 14.40 KB

patch

obsolete

>diff --git c/graphics/openorienteering-mapper/Makefile i/graphics/openorienteering-mapper/Makefile
>index eae0dcf961d4..2e38a5202785 100644
>--- c/graphics/openorienteering-mapper/Makefile
>+++ i/graphics/openorienteering-mapper/Makefile
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	openorienteering-mapper
>-PORTVERSION=	0.8.4
>+PORTVERSION=	0.9.0
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	3
>+PORTREVISION=	1
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	sikmir@gmail.com
>@@ -27,7 +27,6 @@ GH_PROJECT=	mapper
> CMAKE_ARGS+=	-DLICENSING_PROVIDER=freebsd \
> 		-DMapper_PACKAGE_NAME=${PORTNAME} \
> 		-Wno-dev
>-CXXFLAGS+=	"-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES GDAL NLS POSITIONING TEST TIFF
> OPTIONS_DEFAULT=	DOCS EXAMPLES GDAL NLS TIFF
>@@ -44,9 +43,9 @@ NLS_BUILD_DEPENDS=	gsed:textproc/gsed
> 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
>-POSITIONING_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=1
>-POSITIONING_USE=	QT=location,sensors
>+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
>diff --git c/graphics/openorienteering-mapper/distinfo i/graphics/openorienteering-mapper/distinfo
>index a99a7819f39b..0fb3feb10d26 100644
>--- c/graphics/openorienteering-mapper/distinfo
>+++ i/graphics/openorienteering-mapper/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1545716945
>-SHA256 (OpenOrienteering-mapper-v0.8.4_GH0.tar.gz) = d39c05a84ad222ed278231c89c353174f35682c79f92467cb08d8f101debd8fd
>-SIZE (OpenOrienteering-mapper-v0.8.4_GH0.tar.gz) = 8600295
>+TIMESTAMP = 1571822907
>+SHA256 (OpenOrienteering-mapper-v0.9.0_GH0.tar.gz) = d545e6d798346a34eb37240d8ed6218039adef42b4edf9384ee34d8eff96cb59
>+SIZE (OpenOrienteering-mapper-v0.9.0_GH0.tar.gz) = 9414101
>diff --git c/graphics/openorienteering-mapper/files/patch-CMakeLists.txt i/graphics/openorienteering-mapper/files/patch-CMakeLists.txt
>index 522c72f13121..1da6b5389ef6 100644
>--- c/graphics/openorienteering-mapper/files/patch-CMakeLists.txt
>+++ i/graphics/openorienteering-mapper/files/patch-CMakeLists.txt
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
>-+++ CMakeLists.txt
>-@@ -73,6 +73,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug missing transl
>+--- CMakeLists.txt.orig	2019-10-23 12:43:10.434258000 +0300
>++++ CMakeLists.txt	2019-10-23 13:14:13.394144000 +0300
>+@@ -65,6 +65,11 @@
>  # Used for some Linux distributions which do not provide the polyclipping lib.
>  option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF)
>  
>@@ -12,7 +12,7 @@
>  option(Mapper_USE_GDAL   "Use the GDAL library" ON)
>  
>  if(CMAKE_BUILD_TYPE MATCHES Release|MinSizeRel|RelWithDebInfo)
>-@@ -231,10 +236,20 @@ endif()
>+@@ -246,10 +251,20 @@
>  
>  # Subdirectories
>  
>@@ -36,7 +36,7 @@
>  add_subdirectory("3rd-party/qbezier")
>  if(NOT ANDROID)
>  	add_subdirectory("3rd-party/qtsingleapplication")
>-@@ -254,7 +269,7 @@ if(CMAKE_CROSSCOMPILING)
>+@@ -270,7 +285,7 @@
>  	add_custom_target(TEST_WARNING ALL
>  	  COMMENT "Crosscompiling, skipping all tests")
>  	add_dependencies(TEST_WARNING Mapper)
>diff --git c/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt i/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt
>index 36635ad21f65..17ff9d16b2a3 100644
>--- c/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt
>+++ i/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt
>@@ -1,6 +1,6 @@
>---- packaging/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
>-+++ packaging/CMakeLists.txt
>-@@ -437,7 +437,7 @@ endforeach(_qt_plugin)
>+--- packaging/CMakeLists.txt.orig	2019-10-23 12:41:49.989056000 +0300
>++++ packaging/CMakeLists.txt	2019-10-23 12:42:30.620447000 +0300
>+@@ -427,7 +427,7 @@
>  if(UNIX AND NOT APPLE AND NOT ANDROID)
>  	install(
>  	  FILES "${PROJECT_SOURCE_DIR}/doc/man/Mapper.1"
>diff --git c/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in i/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in
>index 621c1a0ec52e..632725b321a9 100644
>--- c/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in
>+++ i/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in
>@@ -1,6 +1,6 @@
>---- packaging/custom_install.cmake.in.orig	2018-12-23 20:55:50 UTC
>-+++ packaging/custom_install.cmake.in
>-@@ -215,4 +215,4 @@ endif()
>+--- packaging/custom_install.cmake.in.orig	2019-10-23 12:42:51.349480000 +0300
>++++ packaging/custom_install.cmake.in	2019-10-23 12:42:57.488297000 +0300
>+@@ -122,4 +122,4 @@
>  set(runtime "")
>  set(dirs "@MAPPER_LIB_HINTS@")
>  handle_qt_conf()
>diff --git c/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt i/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt
>index 5bed6a3a81ff..44c757a29a4b 100644
>--- c/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt
>+++ i/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt
>@@ -1,9 +1,9 @@
>---- src/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
>-+++ src/CMakeLists.txt
>-@@ -286,7 +286,9 @@ target_compile_definitions(Mapper_Common PRIVATE
>-   # MAPPER_ENABLE_COMPATIBILITY
>+--- src/CMakeLists.txt.orig	2019-10-23 12:38:24.214617000 +0300
>++++ src/CMakeLists.txt	2019-10-23 12:39:21.586364000 +0300
>+@@ -286,7 +286,9 @@
>  )
>  
>+ 
> -mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})
> +if(Mapper_WITH_NLS)
> +	mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})
>diff --git c/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt i/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt
>index e7449e41eba0..691697e41aae 100644
>--- c/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt
>+++ i/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt
>@@ -1,6 +1,6 @@
>---- src/gdal/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
>-+++ src/gdal/CMakeLists.txt
>-@@ -35,7 +35,9 @@ set(MAPPER_GDAL_SOURCES
>+--- src/gdal/CMakeLists.txt.orig	2019-10-23 12:39:36.209721000 +0300
>++++ src/gdal/CMakeLists.txt	2019-10-23 12:41:20.718991000 +0300
>+@@ -36,7 +36,9 @@
>    mapper-osmconf.ini
>  )
>  	
>diff --git c/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in i/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in
>index 3251d143867e..69a898dd2ae9 100644
>--- c/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in
>+++ i/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in
>@@ -1,5 +1,5 @@
>---- src/mapper_config.h.in.orig	2018-12-23 20:55:50 UTC
>-+++ src/mapper_config.h.in
>+--- src/mapper_config.h.in.orig	2019-10-23 12:37:31.240935000 +0300
>++++ src/mapper_config.h.in	2019-10-23 12:37:57.634746000 +0300
> @@ -30,6 +30,7 @@
>  
>  #cmakedefine Mapper_DEBUG_TRANSLATIONS
>diff --git c/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt i/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt
>new file mode 100644
>index 000000000000..6543cc892a3a
>--- /dev/null
>+++ i/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt
>@@ -0,0 +1,16 @@
>+--- src/sensors/CMakeLists.txt.orig	2019-10-23 13:52:38.938027000 +0300
>++++ src/sensors/CMakeLists.txt	2019-10-23 13:53:09.513288000 +0300
>+@@ -104,7 +104,9 @@
>+ 
>+ # Translations
>+ 
>+-mapper_translations_sources(
>+-  ${MAPPER_SENSORS_SOURCES}
>+-  ${POWERSHELL_POSITION_SOURCES}
>+-)
>++if(Mapper_WITH_NLS)
>++	mapper_translations_sources(
>++	  ${MAPPER_SENSORS_SOURCES}
>++	  ${POWERSHELL_POSITION_SOURCES}
>++	)
>++endif()
>diff --git c/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt i/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt
>deleted file mode 100644
>index a652c4659f68..000000000000
>--- c/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt
>+++ /dev/null
>@@ -1,31 +0,0 @@
>---- translations/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
>-+++ translations/CMakeLists.txt
>-@@ -223,24 +223,24 @@ else()
>- 		
>- 		set(pre_lupdate )
>- 		set(post_lupdate
>--		  COMMAND sed -i -e "/<context>/N\\;/<name>Q[A-Z]/,/<.context>/d" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}"
>-+		  COMMAND gsed -i -e "/<context>/N\\;/<name>Q[A-Z]/,/<.context>/d" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}"
>- 		)
>- 		if("${ts_filename}" STREQUAL "OpenOrienteering_hu")
>- 			# No plural support for Hungarian in Qt
>- 			# Save first numerusform in translatorcomment
>- 			list(APPEND pre_lupdate
>--			  COMMAND sed -i -f "${save_first_numerusform}" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}"
>-+			  COMMAND gsed -i -f "${save_first_numerusform}" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}"
>- 			)
>- 			# Restore first numerusform for translatorcomment
>- 			list(APPEND post_lupdate
>--			  COMMAND sed -i -f "${restore_first_numerusform}" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}"
>-+			  COMMAND gsed -i -f "${restore_first_numerusform}" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}"
>- 			)
>- 		endif()
>- 		
>- 		add_custom_target(Mapper_${ts_filename}_update
>- 		  ${pre_lupdate}
>- 		  COMMAND "${Qt5_LUPDATE_EXECUTABLE}" ${lupdate_options} "@${listfile}" -ts "${CMAKE_CURRENT_SOURCE_DIR}/${translation}"
>--		  COMMAND sed -i -e "/<context>/N;/<name>Q[A-Z]/,/<.context>/d" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}"
>-+		  COMMAND gsed -i -e "/<context>/N;/<name>Q[A-Z]/,/<.context>/d" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}"
>- 		  ${post_lupdate}
>- 		  VERBATIM
>- 		)
>diff --git c/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh i/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh
>deleted file mode 100644
>index 658bee64fab0..000000000000
>--- c/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh
>+++ /dev/null
>@@ -1,58 +0,0 @@
>---- translations/translate_text_files.sh.orig	2018-12-23 20:55:50 UTC
>-+++ translations/translate_text_files.sh
>-@@ -21,8 +21,8 @@ set -e
>- 
>- for FILE
>- do
>--	echo -n "$FILE" | sed -e 's/.*OpenOrienteering_/Comment[/;s/\.ts$/]=/'
>--	cat ${FILE} | sed -n -e '
>-+	echo -n "$FILE" | gsed -e 's/.*OpenOrienteering_/Comment[/;s/\.ts$/]=/'
>-+	cat ${FILE} | gsed -n -e '
>- 	  /<source>A free software for drawing orienteering maps</! d
>- 	  n
>- 	  /<translation>/! n
>-@@ -31,22 +31,22 @@ do
>- 	  p
>- 	  q
>- 	'
>--done | sed -e "
>-+done | gsed -e "
>-   s/^[^=]*\]=$Comment$/\1/
>-   /^[^=]*\]=$/ d
>-   s/&quot;/\"/
>-   s/&apos;/'/
>- " > desktop_file_comment.txt
>- 
>--sed -i "../packaging/linux/Mapper.desktop" -e '
>-+gsed -i "../packaging/linux/Mapper.desktop" -e '
>-   /^Comment=/ r desktop_file_comment.txt
>-   /^Comment\[/ d
>- '
>- 
>- for FILE
>- do
>--	echo -n "$FILE" | sed -e 's/.*OpenOrienteering_/     <comment xml:lang="/;s/\.ts$/">/'
>--	cat ${FILE} | sed -n -e '
>-+	echo -n "$FILE" | gsed -e 's/.*OpenOrienteering_/     <comment xml:lang="/;s/\.ts$/">/'
>-+	cat ${FILE} | gsed -n -e '
>- 	  /<source>Orienteering map</! d
>- 	  n
>- 	  /<translation>/! n
>-@@ -55,7 +55,7 @@ do
>- 	  p
>- 	  q
>- 	'
>--done | sed -e "
>-+done | gsed -e "
>-   s/^[^>]*>$ *<comment$/\1/
>-   /\">$/ d
>-   s/$/<\/comment>/
>-@@ -63,7 +63,7 @@ done | sed -e "
>-   s/&apos;/'/
>- " > mime_type_comment.txt
>- 
>--sed -i "../packaging/linux/openorienteering-mapper.xml" -e '
>-+gsed -i "../packaging/linux/openorienteering-mapper.xml" -e '
>-   /^ *<comment>/ r mime_type_comment.txt
>-   /^ *<comment [^>]*lang=/ d
>- '
>diff --git c/graphics/openorienteering-mapper/pkg-plist i/graphics/openorienteering-mapper/pkg-plist
>index ed5726a1ed9e..29e90ff8d184 100644
>--- c/graphics/openorienteering-mapper/pkg-plist
>+++ i/graphics/openorienteering-mapper/pkg-plist
>@@ -2,8 +2,8 @@ bin/Mapper
> man/man1/Mapper.1.gz
> share/applications/Mapper.desktop
> %%DOCSDIR%%/3rd-party/qtsingleapplication.txt
>-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.4 Manual.qch
>-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.4 Manual.qhc
>+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.0 Manual.qch
>+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.0 Manual.qhc
> %%DOCSDIR%%/common-licenses/GPL-3.txt
> %%DOCSDIR%%/licensing.html
> share/icons/hicolor/128x128/apps/Mapper.png
>@@ -37,13 +37,13 @@ share/mime/packages/openorienteering-mapper.xml
> %%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/ISOM2000_10000.omap
>-%%DATADIR%%/symbol sets/10000/ISOM2017_10000.omap
> %%DATADIR%%/symbol sets/10000/ISSkiOM_10000.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/ISOM2000_15000.omap
>-%%DATADIR%%/symbol sets/15000/ISOM2017_15000.omap
> %%DATADIR%%/symbol sets/15000/ISSkiOM_15000.omap
> %%DATADIR%%/symbol sets/20000/ISMTBOM_20000.omap
> %%DATADIR%%/symbol sets/4000/Course_Design_4000.omap
>@@ -53,10 +53,10 @@ share/mime/packages/openorienteering-mapper.xml
> %%DATADIR%%/symbol sets/5000/ISSOM_5000.omap
> %%DATADIR%%/symbol sets/5000/ISSkiOM_5000.omap
> %%DATADIR%%/symbol sets/7500/ISMTBOM_7500.omap
>-%%DATADIR%%/symbol sets/ISOM2000-ISOM2017.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-ISOM2017.crt
> %%DATADIR%%/symbol sets/OSM-ISSOM.crt
> %%NLS%%%%DATADIR%%/translations/OpenOrienteering_cs.qm
> %%NLS%%%%DATADIR%%/translations/OpenOrienteering_da.qm
>@@ -87,12 +87,12 @@ share/mime/packages/openorienteering-mapper.xml
> %%NLS%%%%DATADIR%%/translations/map_symbols_fi.qm
> %%NLS%%%%DATADIR%%/translations/map_symbols_fr.qm
> %%NLS%%%%DATADIR%%/translations/map_symbols_hu.qm
>+%%NLS%%%%DATADIR%%/translations/map_symbols_it.qm
> %%NLS%%%%DATADIR%%/translations/map_symbols_ru.qm
> %%NLS%%%%DATADIR%%/translations/map_symbols_sv.qm
> %%NLS%%%%DATADIR%%/translations/map_symbols_uk.qm
> %%NLS%%%%DATADIR%%/translations/qt_eo.qm
> %%NLS%%%%DATADIR%%/translations/qt_et.qm
> %%NLS%%%%DATADIR%%/translations/qt_id.qm
>-%%NLS%%%%DATADIR%%/translations/qt_lv.qm
> %%NLS%%%%DATADIR%%/translations/qt_nb.qm
> %%NLS%%%%DATADIR%%/translations/qt_nl.qm

Flags:

sikmir: maintainer-approval+

Actions: View | Diff

Attachments on bug 241444: 208541