From 9689f11b5a2112ea4edefb5dfc540eec892bfbf1 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Tue, 8 Feb 2022 23:24:39 +0900
Subject: [PATCH] osm2pgsql: Update to 1.6.0

* Make sure to use bundled fmt headers
---
 packages/osm2pgsql/CMakeLists.txt.patch | 19 +++++++++++++++++++
 packages/osm2pgsql/build.sh             | 11 +++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 packages/osm2pgsql/CMakeLists.txt.patch

diff --git a/packages/osm2pgsql/CMakeLists.txt.patch b/packages/osm2pgsql/CMakeLists.txt.patch
new file mode 100644
index 000000000..f23cba740
--- /dev/null
+++ b/packages/osm2pgsql/CMakeLists.txt.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -177,6 +177,7 @@
+ 
+ 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})
+ 
+ if (WITH_LUA)
+     if (WITH_LUAJIT)
diff --git a/packages/osm2pgsql/build.sh b/packages/osm2pgsql/build.sh
index 31e8451fd..5aa883994 100644
--- a/packages/osm2pgsql/build.sh
+++ b/packages/osm2pgsql/build.sh
@@ -2,9 +2,12 @@ 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.5.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.6.0
 TERMUX_PKG_SRCURL=https://github.com/openstreetmap/osm2pgsql/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
-TERMUX_PKG_DEPENDS="libexpat, proj, bzip2, zlib, boost, postgresql, lua54"
+TERMUX_PKG_SHA256=0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5
+TERMUX_PKG_DEPENDS="libexpat, proj, bzip2, zlib, postgresql, lua54"
+TERMUX_PKG_BUILD_DEPENDS="boost"
 TERMUX_PKG_GROUPS="science"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DEXTERNAL_FMT=OFF
+"