Attachment 193914 Details for Bug 228676 – osm2pgrouting 2.3.5

[patch] osm2pgrouting 2.3.5

osm2pgrouting-2.3.5.diff (text/plain), 4.89 KB, created by Loïc Bartoletti on 2018-06-02 13:33:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2018-06-02 13:33:36 UTC

Size: 4.89 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 471348)
>+++ Makefile	(copie de travail)
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	osm2pgrouting
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.3.3
>-PORTREVISION=	2
>+DISTVERSION=	2.3.5
> CATEGORIES=	converters databases geography
> 
> MAINTAINER=	lbartoletti@tuxfamily.org
>Index: distinfo
>===================================================================
>--- distinfo	(rÃ©vision 471348)
>+++ distinfo	(copie de travail)
>@@ -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 = 1527941203
>+SHA256 (pgRouting-osm2pgrouting-v2.3.5_GH0.tar.gz) = 1d26a92d771d83f044f481989c8c422a0e1579d53d08387c367c9efd1ae605f7
>+SIZE (pgRouting-osm2pgrouting-v2.3.5_GH0.tar.gz) = 182153
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(rÃ©vision 471348)
>+++ files/patch-CMakeLists.txt	(nonexistent)
>@@ -1,29 +0,0 @@
>---- CMakeLists.txt.orig	2017-12-18 15:44:24 UTC
>-+++ CMakeLists.txt
>-@@ -106,7 +106,7 @@ TARGET_LINK_LIBRARIES(osm2pgrouting
>-     )
>- 
>- INSTALL(TARGETS osm2pgrouting
>--    RUNTIME DESTINATION "/usr/bin"
>-+    RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
>-     )
>- 
>- if(WIN32)
>-@@ -114,13 +114,15 @@ if(WIN32)
>- endif()
>- 
>- INSTALL(FILES
>--    "${CMAKE_SOURCE_DIR}/COPYING"
>-     "${CMAKE_SOURCE_DIR}/Readme.md"
>-+    DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/osm2pgrouting")
>-+
>-+INSTALL(FILES
>-     "${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} )
>
>Property changes on: files/patch-CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-include_parser_ConfigurationParserCallback.h
>===================================================================
>--- files/patch-include_parser_ConfigurationParserCallback.h	(rÃ©vision 471348)
>+++ files/patch-include_parser_ConfigurationParserCallback.h	(nonexistent)
>@@ -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"
>
>Property changes on: files/patch-include_parser_ConfigurationParserCallback.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-include_parser_OSMDocumentParserCallback.h
>===================================================================
>--- files/patch-include_parser_OSMDocumentParserCallback.h	(rÃ©vision 471348)
>+++ files/patch-include_parser_OSMDocumentParserCallback.h	(nonexistent)
>@@ -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"
>
>Property changes on: files/patch-include_parser_OSMDocumentParserCallback.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(rÃ©vision 471348)
>+++ pkg-plist	(copie de travail)
>@@ -1,5 +1,6 @@
> 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 etc/mapconfig.xml.sample
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 228676: 193914 | 201014