[osrm] 05/07: Refresh patches.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osrm.

commit 736abfc8006306cc2756b4b9df1d5f6dfee3fa44
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Oct 4 16:35:15 2016 +0200

    Refresh patches.
---
 debian/changelog                                |  1 +
 debian/patches/use-libosmium-package.patch      |  4 ++--
 debian/patches/use-mapbox-variant-package.patch | 28 ++++++++++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 525f86d..a42cefe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ osrm (5.4.0+ds-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release.
   * Update watch file to ignore pre-releases.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 04 Oct 2016 16:29:43 +0200
 
diff --git a/debian/patches/use-libosmium-package.patch b/debian/patches/use-libosmium-package.patch
index f80f825..ab648c2 100644
--- a/debian/patches/use-libosmium-package.patch
+++ b/debian/patches/use-libosmium-package.patch
@@ -4,10 +4,10 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -244,10 +244,10 @@ if(UNIX AND NOT APPLE)
-   set(MAYBE_RT_LIBRARY rt)
+@@ -267,10 +267,10 @@ if(UNIX AND NOT APPLE)
  endif()
  
+ 
 -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/cmake")
 -set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include")
 -find_package(Osmium REQUIRED COMPONENTS io)
diff --git a/debian/patches/use-mapbox-variant-package.patch b/debian/patches/use-mapbox-variant-package.patch
index 531e377..e6d6a45 100644
--- a/debian/patches/use-mapbox-variant-package.patch
+++ b/debian/patches/use-mapbox-variant-package.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -58,6 +58,7 @@ option(ENABLE_LTO "Use LTO if available"
+@@ -60,6 +60,7 @@ option(ENABLE_GOLD_LINKER "Use GNU gold
  include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
  include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
  include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/)
@@ -12,7 +12,7 @@ Forwarded: not-needed
  
  add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND}
    "-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}"
-@@ -412,7 +413,7 @@ set_property(TARGET osrm-contract PROPER
+@@ -435,7 +436,7 @@ set_property(TARGET osrm-contract PROPER
  set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
  set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
  
@@ -21,7 +21,7 @@ Forwarded: not-needed
  file(GLOB LibraryGlob include/osrm/*.hpp)
  file(GLOB ParametersGlob include/engine/api/*_parameters.hpp)
  set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp include/engine/hint.hpp include/engine/bearing.hpp include/engine/phantom_node.hpp)
-@@ -427,7 +428,7 @@ install(FILES ${ExtractorHeader} DESTINA
+@@ -450,7 +451,7 @@ install(FILES ${ExtractorHeader} DESTINA
  install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor)
  install(FILES ${LibraryGlob} DESTINATION include/osrm)
  install(FILES ${ParametersGlob} DESTINATION include/osrm/engine/api)
@@ -30,3 +30,25 @@ Forwarded: not-needed
  install(TARGETS osrm-extract DESTINATION bin)
  install(TARGETS osrm-contract DESTINATION bin)
  install(TARGETS osrm-datastore DESTINATION bin)
+--- a/include/server/service/base_service.hpp
++++ b/include/server/service/base_service.hpp
+@@ -5,7 +5,7 @@
+ #include "osrm/osrm.hpp"
+ #include "util/coordinate.hpp"
+ 
+-#include <variant/variant.hpp>
++#include <mapbox/variant.hpp>
+ 
+ #include <string>
+ #include <vector>
+--- a/include/util/json_container.hpp
++++ b/include/util/json_container.hpp
+@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #ifndef JSON_CONTAINER_HPP
+ #define JSON_CONTAINER_HPP
+ 
+-#include <variant/variant.hpp>
++#include <mapbox/variant.hpp>
+ 
+ #include <string>
+ #include <unordered_map>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git