[proj] Update to 9.2 (microsoft#30023)

kunitoki · Mar 6, 2023 · 13003d8 · 13003d8
1 parent f3bc121
commit 13003d8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/ports/proj/fix-proj4-targets-cmake.patch b/ports/proj/fix-proj4-targets-cmake.patch
@@ -38,17 +38,11 @@ diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
 index 7d5579ae..0cf96252 100644
 --- a/cmake/project-config.cmake.in
 +++ b/cmake/project-config.cmake.in
-@@ -12,6 +12,13 @@ if(@PROJECT_VARIANT_NAME@ STREQUAL "PROJ4")
- endif()
-
- include(CMakeFindDependencyMacro)
-+cmake_policy(PUSH)
-+cmake_policy(SET CMP0012 NEW)
+@@ -15,6 +15,7 @@ if(@PROJECT_VARIANT_NAME@ STREQUAL "PROJ4")
+
+ cmake_policy(PUSH)
+ cmake_policy(SET CMP0012 NEW)
 +find_dependency(unofficial-sqlite3 CONFIG)
-+if("@ENABLE_TIFF@")
-+    find_dependency(TIFF)
-+endif()
-+cmake_policy(POP)
- if("@CURL_ENABLED@" STREQUAL "TRUE")
-   # Chainload CURL usage requirements
-   find_dependency(CURL)
+ if("@ENABLE_TIFF@")
+     find_dependency(TIFF)
+ endif()
diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake
@@ -1,9 +1,8 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OSGeo/PROJ
     REF "${VERSION}"
-    SHA512 bdc3cba27f330829b30290f563cb1cded75d3861909399177334a354662f4cb54e05baef40b8d267978c746f41543c3de1c119ca08919c87fd9460506c5c566e
+    SHA512 a48980b94b6c68738dd5ab70a1de6aa42f325fd612155623195a14774caadcaceff08035c01696458d3dd706b2277d89ea093949a1855fafa9951c59821cb1cb
     HEAD_REF master
     PATCHES
         fix-win-output-name.patch

diff --git a/ports/proj/remove-doc.patch b/ports/proj/remove-doc.patch
@@ -27,8 +27,11 @@ index 4c9744e6..a6d5e4eb 100644
  # Simplify README.md to README
  add_custom_target(README
    COMMAND ${CMAKE_COMMAND}
-@@ -393,3 +408,4 @@ if(NOT _is_multi_config_generator)
+@@ -393,6 +408,7 @@ if(NOT _is_multi_config_generator)
    )
    message(STATUS "PROJ: Configured 'dist' target")
  endif()
 +endif()
+
+ configure_file(cmake/uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/proj_uninstall.cmake @ONLY)
+ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/proj_uninstall.cmake)
diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "proj",
-  "version": "9.1.1",
+  "version": "9.2.0",
   "description": "PROJ library for cartographic projections",
   "homepage": "https://proj.org/",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6188,7 +6188,7 @@
       "port-version": 2
     },
     "proj": {
-      "baseline": "9.1.1",
+      "baseline": "9.2.0",
       "port-version": 0
     },
     "proj4": {

diff --git a/versions/p-/proj.json b/versions/p-/proj.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "24665244df24460f20293fc879787852554b16c7",
+      "version": "9.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "5ae85e19024d23a2ae8c22c16bab44f2fc236a4a",
       "version": "9.1.1",