Attachment 201014 Details for Bug 228676 – osm2pgrouting 2.3.6

[patch] osm2pgrouting 2.3.6

osm2pgrouting.diff (text/plain), 5.20 KB, created by Loïc Bartoletti on 2019-01-11 08:15:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2019-01-11 08:15:56 UTC

Size: 5.20 KB

patch

obsolete

>diff --git converters/osm2pgrouting/Makefile converters/osm2pgrouting/Makefile
>index b7ae1ec0fe38..04a8f26470bb 100644
>--- converters/osm2pgrouting/Makefile
>+++ converters/osm2pgrouting/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	osm2pgrouting
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.3.3
>-PORTREVISION=	6
>+DISTVERSION=	2.3.6
> CATEGORIES=	converters databases geography
> 
> MAINTAINER=	lbartoletti@tuxfamily.org
>@@ -19,6 +18,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
> USES=		cmake compiler:c++11-lang pgsql
> USE_GITHUB=	yes
> GH_ACCOUNT=	pgRouting
>+
> WANT_PGSQL=	client
> 
> OPTIONS_DEFINE=	DOCS
>@@ -26,12 +26,12 @@ OPTIONS_DEFINE=	DOCS
> PORTDOCS=	Readme.md
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/share/osm2pgrouting/mapconfig.xml|${PREFIX}/etc/mapconfig.xml|' \
>+	@${REINPLACE_CMD} -e 's|/usr/share/osm2pgrouting/mapconfig.xml|${PREFIX}/etc/${PORTNAME}/mapconfig.xml|' \
> 		${WRKSRC}/src/utilities/prog_options.cpp \
> 		${WRKSRC}/Readme.md
> 
> post-install:
>-	@for cf in ${STAGEDIR}${PREFIX}/etc/*.xml; do \
>+	@for cf in ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/*.xml; do \
> 		${MV} $${cf} $${cf}.sample; \
> 	done
> 
>diff --git converters/osm2pgrouting/distinfo converters/osm2pgrouting/distinfo
>index b8e2b7577dd1..b4e28a250307 100644
>--- converters/osm2pgrouting/distinfo
>+++ converters/osm2pgrouting/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1513628294
>-SHA256 (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = ea58d3b2dd0164cf85dfa66044ce1ea2af3080bee2c16ad6f115aa84aa23ba0f
>-SIZE (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = 181159
>+TIMESTAMP = 1547161773
>+SHA256 (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = c4b1f45ff7a9a184956182e40016fdd9455718821adb25822e2ef8182d2712a6
>+SIZE (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = 182168
>diff --git converters/osm2pgrouting/files/patch-CMakeLists.txt converters/osm2pgrouting/files/patch-CMakeLists.txt
>index e399fbc66ec1..529fb4f838c1 100644
>--- converters/osm2pgrouting/files/patch-CMakeLists.txt
>+++ converters/osm2pgrouting/files/patch-CMakeLists.txt
>@@ -1,15 +1,15 @@
>---- CMakeLists.txt.orig	2017-12-18 15:44:24 UTC
>+--- CMakeLists.txt.orig	2019-01-11 07:48:53 UTC
> +++ CMakeLists.txt
>-@@ -106,7 +106,7 @@ TARGET_LINK_LIBRARIES(osm2pgrouting
>-     )
>+@@ -8,7 +8,7 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} 
>+ endif()
>  
>- INSTALL(TARGETS osm2pgrouting
>--    RUNTIME DESTINATION "/usr/bin"
>-+    RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
>-     )
>+ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
>+-SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/osm2pgrouting")
>++SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/etc/osm2pgrouting")
>  
>- if(WIN32)
>-@@ -114,13 +114,15 @@ if(WIN32)
>+ FIND_PACKAGE(PostgreSQL REQUIRED)
>+ find_package(LibPQXX REQUIRED)
>+@@ -114,8 +114,10 @@ if(WIN32)
>  endif()
>  
>  INSTALL(FILES
>@@ -21,9 +21,3 @@
>      "${CMAKE_SOURCE_DIR}/mapconfig.xml"
>      "${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml"
>      "${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml"
>-     "${CMAKE_SOURCE_DIR}/mapconfig_for_pedestrian.xml"
>--    DESTINATION "${SHARE_DIR}")
>-+    DESTINATION "${CMAKE_INSTALL_PREFIX}/etc")
>- 
>- 
>- #INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
>diff --git converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h
>deleted file mode 100644
>index 4c6598c30254..000000000000
>--- converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h
>+++ /dev/null
>@@ -1,17 +0,0 @@
>---- include/parser/ConfigurationParserCallback.h.orig	2017-12-18 15:44:24 UTC
>-+++ include/parser/ConfigurationParserCallback.h
>-@@ -22,12 +22,13 @@
>- #ifndef SRC_CONFIGURATIONPARSERCALLBACK_H_
>- #define SRC_CONFIGURATIONPARSERCALLBACK_H_
>- #pragma once
>--
>-+/*
>- #if __GNUC__ > 4 || \
>-                     (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))
>- #else
>- #define nullptr NULL
>- #endif
>-+*/
>- 
>- #include <string.h>
>- #include "XMLParser.h"
>diff --git converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h
>deleted file mode 100644
>index c94a324e8865..000000000000
>--- converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- include/parser/OSMDocumentParserCallback.h.orig	2017-12-18 15:44:24 UTC
>-+++ include/parser/OSMDocumentParserCallback.h
>-@@ -22,13 +22,13 @@
>- #ifndef SRC_OSMDOCUMENTPARSERCALLBACK_H_
>- #define SRC_OSMDOCUMENTPARSERCALLBACK_H_
>- #pragma once
>--
>-+/*
>- #if __GNUC__ > 4 || \
>-             (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))
>- #else
>- #define nullptr NULL
>- #endif
>--
>-+*/
>- 
>- #include <string.h>
>- #include "./XMLParser.h"
>diff --git converters/osm2pgrouting/pkg-plist converters/osm2pgrouting/pkg-plist
>index 0743a42c3eb6..40b749dcf679 100644
>--- converters/osm2pgrouting/pkg-plist
>+++ converters/osm2pgrouting/pkg-plist
>@@ -1,5 +1,5 @@
> bin/osm2pgrouting
>-@sample etc/mapconfig.xml.sample
>-@sample etc/mapconfig_for_bicycles.xml.sample
>-@sample etc/mapconfig_for_cars.xml.sample
>-@sample etc/mapconfig_for_pedestrian.xml.sample
>+@sample %%ETCDIR%%/mapconfig.xml.sample
>+@sample %%ETCDIR%%/mapconfig_for_bicycles.xml.sample
>+@sample %%ETCDIR%%/mapconfig_for_cars.xml.sample
>+@sample %%ETCDIR%%/mapconfig_for_pedestrian.xml.sample

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 228676: 193914 | 201014