diff --git a/ports/shapelib/fix-usage.patch b/ports/shapelib/fix-usage.patch new file mode 100644 index 0000000000..8b22423fa2 --- /dev/null +++ b/ports/shapelib/fix-usage.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b3b3b51..ea3f129 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,8 +73,8 @@ set( + + # Export build information to help other projects link installed + # shapelib software. Only one of these signatures is required +-# for the export_shp name. +-install(EXPORT export_shp DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) ++# for the shpConfig name. ++install(EXPORT shpConfig DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) + + # Initial boilerplate done, now build library and executables. + +@@ -127,12 +127,17 @@ if(USE_RPATH) + endif(USE_RPATH) + + install(TARGETS shp +- EXPORT export_shp ++ EXPORT shpConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + ++INSTALL(EXPORT shpConfig ++ DESTINATION share/shp ++) ++ ++ + # executables to be built and installed. + set(executables + shpcreate diff --git a/ports/shapelib/vcpkg.json b/ports/shapelib/vcpkg.json index ae310d8c4b..db87581cf1 100644 --- a/ports/shapelib/vcpkg.json +++ b/ports/shapelib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shapelib", - "version-string": "1.5.0", - "port-version": 2, + "version": "1.5.0", + "port-version": 3, "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles", "homepage": "https://download.osgeo.org/shapelib", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b7f30e46fe..7a0bd8bf5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6414,7 +6414,7 @@ }, "shapelib": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 3 }, "shiva": { "baseline": "1.0", diff --git a/versions/s-/shapelib.json b/versions/s-/shapelib.json index e874311a9f..e558b2abd1 100644 --- a/versions/s-/shapelib.json +++ b/versions/s-/shapelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "befbba83687abe4b10f1fb55ac5ccc344bd11084", + "version": "1.5.0", + "port-version": 3 + }, { "git-tree": "d70a93c1899b5607ca1894c66beacec5c1afec9c", "version-string": "1.5.0",