From ce6def8f40464f5ac33c812e29c933b240458f76 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 15 Jun 2022 22:43:48 +0200 Subject: [PATCH 1/2] Update to 9.0.1 --- ports/proj/fix-proj4-targets-cmake.patch | 16 ++++++---------- ports/proj/portfile.cmake | 4 ++-- ports/proj/vcpkg.json | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ports/proj/fix-proj4-targets-cmake.patch b/ports/proj/fix-proj4-targets-cmake.patch index 62964308619a55..a6ed22b38bae7a 100644 --- a/ports/proj/fix-proj4-targets-cmake.patch +++ b/ports/proj/fix-proj4-targets-cmake.patch @@ -46,21 +46,17 @@ diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in index 23f997abd..8baef00f0 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in -@@ -7,6 +7,17 @@ - # @PROJECT_VARIANT_NAME@_LIBRARY_DIRS = /usr/local/lib - # @PROJECT_VARIANT_NAME@_BINARY_DIRS = /usr/local/bin +@@ -9,6 +9,13 @@ # @PROJECT_VARIANT_NAME@_VERSION = 4.9.1 (for example) + + include(CMakeFindDependencyMacro) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) -+include(CMakeFindDependencyMacro) +find_dependency(unofficial-sqlite3 CONFIG) +if("@ENABLE_TIFF@") + find_dependency(TIFF) +endif() -+if("@ENABLE_CURL@") -+ find_dependency(CURL CONFIG) -+endif() +cmake_policy(POP) - - # Tell the user project where to find our headers and libraries - get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) + if("@CURL_ENABLED@" STREQUAL "TRUE") + # Chainload CURL usage requirements + find_dependency(CURL) diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index 63a50506c3ea18..7e66dc9e8b7d91 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ - REF 9.0.0 - SHA512 f11a20e9f9615c513755f54ac400cc2e144e40caa91f616c8f640aef9caf779487dc94927b3a4b57b15a595c17b70636b872d9a77d7baaf912b1a507004e6520 + REF 9.0.1 + SHA512 b92a196e6801dd8d77e6c2131e15a392077e8e049a6d9befdb39ee035a3cca5a725b95196b29a4c5d7bad4d826a285e40abc3fdc040b5e11ede5c04ba4f6dbb5 HEAD_REF master PATCHES fix-win-output-name.patch diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index a17d5a8aa352f1..a3de02b637c567 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proj", - "version": "9.0.0", + "version": "9.0.1", "description": "PROJ library for cartographic projections", "homepage": "https://proj.org/", "license": "MIT", From 72fa717e88370b195df2355bd02ad644c83da88c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 15 Jun 2022 22:44:11 +0200 Subject: [PATCH 2/2] Update versions --- versions/baseline.json | 2 +- versions/p-/proj.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index e7de1400fc69ce..f1bd5f0cbacb7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5609,7 +5609,7 @@ "port-version": 1 }, "proj": { - "baseline": "9.0.0", + "baseline": "9.0.1", "port-version": 0 }, "proj4": { diff --git a/versions/p-/proj.json b/versions/p-/proj.json index 59f4dd4bc8f6d0..25ab82f93f0937 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55c13547b4c812fc8bbb32a09260b3e54bc0a352", + "version": "9.0.1", + "port-version": 0 + }, { "git-tree": "1566fbbbd7d8abba35cebac6c8821339d1da1d16", "version": "9.0.0",