[proj] Update to 9.3.0 (#33628)

This commit is contained in:
Kai Pastor 2023-09-08 09:10:27 +02:00 committed by GitHub
parent 7fe63d9109
commit 7b5ca09708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 49 deletions

View File

@ -2,12 +2,11 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OSGeo/PROJ
REF "${VERSION}"
SHA512 ac6cf14c7a4bf0435b0b6c373b665762f46ea7609fdbffc512efc308441bf0ac7bf4dee2bcf3b60e98a604b2e3f1e7a67fdac9f455c1ad37ad3f705185a2b620
SHA512 ee8170780c70e09efa4bc3fcf6ee9a2c15554a05a8562617fc5e9698fb33c6c0af380dd0de836db91955eb35623ded1fec67c6afe5fd3b692fcf4f4b3e4f0658
HEAD_REF master
PATCHES
fix-win-output-name.patch
fix-proj4-targets-cmake.patch
remove-doc.patch
remove_toolset_restriction.patch
)
@ -55,8 +54,12 @@ if ("tools" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN)
endif ()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/share/doc"
"${CURRENT_PACKAGES_DIR}/share/man"
)
vcpkg_copy_pdbs()

View File

@ -1,37 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c9744e6..a6d5e4eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,15 +335,12 @@ include_directories(${PROJ_SOURCE_DIR}/src)
add_subdirectory(data)
add_subdirectory(include)
add_subdirectory(src)
-add_subdirectory(man)
add_subdirectory(cmake)
if(BUILD_TESTING)
add_subdirectory(test)
endif()
-set(docfiles COPYING NEWS AUTHORS)
-install(FILES ${docfiles}
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
################################################################################
# pkg-config support
@@ -378,6 +392,7 @@ set(CPACK_SOURCE_IGNORE_FILES
include(CPack)
+if(0)
# Simplify README.md to README
add_custom_target(README
COMMAND ${CMAKE_COMMAND}
@@ -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)

View File

@ -2,7 +2,7 @@ diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-versio
index d9807b2c5..7ffe39364 100644
--- a/cmake/project-config-version.cmake.in
+++ b/cmake/project-config-version.cmake.in
@@ -35,14 +35,6 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR
@@ -28,14 +28,6 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR
# since a multi-architecture library is built for that platform).
set (REASON "sizeof(*void) = @CMAKE_SIZEOF_VOID_P@")
set (PACKAGE_VERSION_UNSUITABLE TRUE)
@ -14,6 +14,6 @@ index d9807b2c5..7ffe39364 100644
- # Reject if there's a mismatch in MSVC compiler versions
- set (REASON "MSVC_TOOLSET_VERSION = @MSVC_TOOLSET_VERSION@")
- set (PACKAGE_VERSION_UNSUITABLE TRUE)
elseif (NOT CMAKE_CROSSCOMPILING_STR STREQUAL "@CMAKE_CROSSCOMPILING_STR@")
# Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING}
set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@")
elseif (PACKAGE_FIND_VERSION)
if (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
set (PACKAGE_VERSION_EXACT TRUE)

View File

@ -1,7 +1,6 @@
{
"name": "proj",
"version": "9.2.1",
"port-version": 1,
"version": "9.3.0",
"description": "PROJ library for cartographic projections",
"homepage": "https://proj.org/",
"license": "MIT",

View File

@ -6541,8 +6541,8 @@
"port-version": 2
},
"proj": {
"baseline": "9.2.1",
"port-version": 1
"baseline": "9.3.0",
"port-version": 0
},
"proj4": {
"baseline": "8.9.9",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d3932aae445fce753fd58b103e1dcb0acfff0a39",
"version": "9.3.0",
"port-version": 0
},
{
"git-tree": "b3f5ec4ce13a932cb9f05f074e48b386fd5e4130",
"version": "9.2.1",