From 6ef263ebab68c3846911096682295bd287a2f988 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Sun, 29 Jan 2023 19:48:59 +0900
Subject: [PATCH] osm2pgsql: Bump to 1.8.0

---
 packages/osm2pgsql/CMakeLists.txt.patch | 8 +++-----
 packages/osm2pgsql/build.sh             | 5 ++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/osm2pgsql/CMakeLists.txt.patch b/packages/osm2pgsql/CMakeLists.txt.patch
index f23cba740e..5b58b97547 100644
--- a/packages/osm2pgsql/CMakeLists.txt.patch
+++ b/packages/osm2pgsql/CMakeLists.txt.patch
@@ -1,19 +1,17 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -177,6 +177,7 @@
+@@ -173,12 +173,13 @@
  
  if (NOT EXTERNAL_FMT)
      set(FMT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include")
 +    include_directories(${FMT_INCLUDE_DIR})
  endif()
  
- if (NOT EXTERNAL_RAPIDJSON)
-@@ -186,7 +187,7 @@
  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
  
  find_package(Osmium 2.17.3 REQUIRED COMPONENTS io)
--include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
-+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
+-include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR})
++include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR})
  
  if (WITH_LUA)
      if (WITH_LUAJIT)
diff --git a/packages/osm2pgsql/build.sh b/packages/osm2pgsql/build.sh
index b29c2ad027..2f0108f3bb 100644
--- a/packages/osm2pgsql/build.sh
+++ b/packages/osm2pgsql/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://osm2pgsql.org/
 TERMUX_PKG_DESCRIPTION="osm2pgsql imports OpenStreetMap (OSM) data into a PostgreSQL/PostGIS database"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.7.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.8.0
 TERMUX_PKG_SRCURL=https://github.com/openstreetmap/osm2pgsql/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5
+TERMUX_PKG_SHA256=b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927
 TERMUX_PKG_DEPENDS="boost, libbz2, libc++, libexpat, liblua54, postgresql, proj, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_GROUPS="science"