diff --git a/ports/libspatialite/fix-mingw.patch b/ports/libspatialite/fix-mingw.patch index 0c90851f150..c29b0344982 100644 --- a/ports/libspatialite/fix-mingw.patch +++ b/ports/libspatialite/fix-mingw.patch @@ -11,3 +11,14 @@ index ee2f1cf..01f2571 100644 #endif #if OMIT_ICONV == 0 /* if ICONV is disabled no SHP support is available */ +diff --color -ur a/configure.ac b/configure.ac +--- a/configure.ac 2022-07-21 17:23:50.490298108 +0200 ++++ b/configure.ac 2022-07-21 17:25:45.671489524 +0200 +@@ -116,7 +116,6 @@ + + # Checks for installed libraries + AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is required but it doesn't seem to be installed on this system.]),-lm) +-AC_CHECK_LIB(z,inflateInit_,,AC_MSG_ERROR(['libz' is required but it doesn't seem to be installed on this system.]),-lm) + + AC_CONFIG_FILES([Makefile \ + src/Makefile \ diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 59959dd9ca2..e4ff7e9e0f0 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -178,6 +178,7 @@ else() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG + DETERMINE_BUILD_TRIPLET OPTIONS ${TARGET_ALIAS} ${FREEXL_OPTION} diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 46cd4fbd443..27c8a1b49e3 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 6, + "port-version": 7, "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index b8f1d7ab680..ae6472c983a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4098,7 +4098,7 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 6 + "port-version": 7 }, "libspnav": { "baseline": "0.2.3", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index c664463066d..2a93500efa8 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e92008bb08f680c156f894b77774f76b5ff89f21", + "version": "5.0.1", + "port-version": 7 + }, { "git-tree": "17b2434a466cabf41bd653845871d5b4ec6bfdeb", "version": "5.0.1",