diff options
| -rw-r--r-- | ports/proj4/CONTROL | 2 | ||||
| -rw-r--r-- | ports/proj4/disable-export-for-static-lib.patch | 26 | ||||
| -rw-r--r-- | ports/proj4/portfile.cmake | 5 |
3 files changed, 3 insertions, 30 deletions
diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL index 0bcabb5a6..298010928 100644 --- a/ports/proj4/CONTROL +++ b/ports/proj4/CONTROL @@ -1,5 +1,5 @@ Source: proj4 -Version: 6.2.1-2 +Version: 6.3.0-1 Homepage: https://github.com/OSGeo/PROJ Description: PROJ.4 library for cartographic projections Build-Depends: sqlite3[core] diff --git a/ports/proj4/disable-export-for-static-lib.patch b/ports/proj4/disable-export-for-static-lib.patch deleted file mode 100644 index f9bd086ca..000000000 --- a/ports/proj4/disable-export-for-static-lib.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/geodesic.h b/src/geodesic.h -index 11484ec7..479a9462 100644 ---- a/src/geodesic.h -+++ b/src/geodesic.h -@@ -158,7 +158,7 @@ - GEODESIC_VERSION_PATCH) - - #ifndef GEOD_DLL --#if defined(_MSC_VER) -+#if defined(_MSC_VER) && defined(PROJ_MSVC_DLL_EXPORT) - #define GEOD_DLL __declspec(dllexport) - #elif defined(__GNUC__) - #define GEOD_DLL __attribute__ ((visibility("default"))) -diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake -index bad60324..2e90f98f 100644 ---- a/src/lib_proj.cmake -+++ b/src/lib_proj.cmake -@@ -443,7 +443,7 @@ endif() - include_directories(${SQLITE3_INCLUDE_DIR}) - target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY}) - --if(MSVC) -+if(MSVC AND BUILD_LIBPROJ_SHARED) - target_compile_definitions(${PROJ_CORE_TARGET} - PRIVATE PROJ_MSVC_DLL_EXPORT=1) - endif() diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index dc91d41a5..05ef8f8e3 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ - REF 6.2.1 - SHA512 43f0356a1f4df871e09a738fb8ac386c0fbe543b35c3c1b9c9685469ca7a2a540427edb9b17d4c010c06a4818d17d0421dfcdca9af9d091854da71690fddfbf3 + REF 6.3.0 + SHA512 603256c27fb73b82e9af245ad09b46e6bc6e1934cb6375bf476f8b63177e933fb210b932b6890c425722c509189a0323755e311466f226d64694013c6c4a52de HEAD_REF master PATCHES fix-sqlite3-bin.patch disable-export-namespace.patch - disable-export-for-static-lib.patch disable-projdb-with-arm-uwp.patch fix-win-output-name.patch fix-sqlite-dependency-export.patch |