mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 02:41:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[freexl,libspatialite,spatialite-tools] Update, [minizip] Enable DLL, [libkml] Update minizip import (#33044)

Browse Source 
* [freexl] Update to 2.0.0

* Skip tests, examples

* [minizip] Build DLL

* [libspatialite] Update to 5.1.0

* Fix utf8 source

* [spatialite-tools] Update to 5.1.0a

* [libkml] Update minizip prefix

* [libkml] Fix all minizip names
This commit is contained in:
Kai Pastor 2023-08-16 01:31:44 +02:00 committed by GitHub
parent 86bdd8f99a
commit 38acea0c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 297 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ports/freexl/dependencies.patch Normal file
View File

@ -0,0 +1,47 @@
diff --git a/configure.ac b/configure.ac
index d79099f..a820b17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,10 +66,12 @@ AC_CONFIG_FILES([Makefile \
AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
# on some systems "iconv()" lives in libc. On others it lives in libiconv
# on older systems "libiconv()" lives in libiconv
+SAVED_LIBS="${LIBS}"
AC_SEARCH_LIBS(iconv,iconv,,
AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),))
AC_SEARCH_LIBS(locale_charset,charset,,
AC_SEARCH_LIBS(nl_langinfo,c,,AC_MSG_ERROR(['libcharset' is required but it doesn't seem to be installed on this system.]),))
+AC_SUBST(ICONV_LIBS, "${LIBS%${SAVED_LIBS}}")
#-----------------------------------------------------------------------
# --enable-xmldocs
@@ -77,14 +79,14 @@ AC_SEARCH_LIBS(locale_charset,charset,,
AC_ARG_ENABLE(xmldocs, [AS_HELP_STRING(
[--enable-xmldocs], [enables XML documents support [default=yes]])],
[], [enable_xmldocs=yes])
+PKG_PROG_PKG_CONFIG
if test x"$enable_xmldocs" != "xyes"; then
AC_DEFINE(OMIT_XMLDOC)
else
-AC_CHECK_HEADERS(minizip/unzip.h,, [AC_MSG_ERROR([cannot find minizip/unzip.h, bailing out])])
-AC_SEARCH_LIBS(unzLocateFile, minizip,,AC_MSG_ERROR(['libminizip' is required but it doesn't seem to be installed on this system.]))
-
-AC_CHECK_HEADERS(expat.h,, [AC_MSG_ERROR([cannot find expat.h, bailing out])])
-AC_CHECK_LIB(expat,XML_ParserCreate,,AC_MSG_ERROR(['expat' is required but it doesn't seem to be installed on this system.]))
+ PKG_CHECK_MODULES(MINIZIP, [minizip], [], [AC_MSG_ERROR([[minizip is required]])])
+ PKG_CHECK_MODULES(EXPAT, [expat], [], [AC_MSG_ERROR([[expat is required]])])
+ CFLAGS="${EXPAT_CFLAGS} ${MINIZIP_CFLAGS} ${CFLAGS}"
+ LIBS="${EXPAT_LIBS} ${MINIZIP_LIBS} ${LIBS}"
fi
#-----------------------------------------------------------------------
diff --git a/freexl.pc.in b/freexl.pc.in
index 5813e68..4393590 100644
--- a/freexl.pc.in
+++ b/freexl.pc.in
@@ -10,3 +10,5 @@ Description: a simple library extracting data from .xls (Excel BIFF) files
Version: @VERSION@
Libs: -L${libdir} -lfreexl -lm
Cflags: -I${includedir}
+Libs.private: @ICONV_LIBS@
+Requires.private: expat minizip

16
ports/freexl/fix-makefiles.patch
View File

@ -1,16 +0,0 @@
diff --git a/makefile.vc b/makefile.vc
index cb8bd36..85c0352 100644
--- a/makefile.vc
+++ b/makefile.vc
@@ -23,9 +23,9 @@ freexl.lib: $(LIBOBJ)
$(FREEXL_DLL): freexl_i.lib
freexl_i.lib: $(LIBOBJ)
- link /debug /dll /out:$(FREEXL_DLL) \
+ link $(LINK_FLAGS) /dll /out:$(FREEXL_DLL) \
/implib:freexl_i.lib $(LIBOBJ) \
- C:\OSGeo4w\lib\iconv.lib
+ $(LIBS_ALL)
if exist $(FREEXL_DLL).manifest mt -manifest \
$(FREEXL_DLL).manifest -outputresource:$(FREEXL_DLL);2

26
ports/freexl/fix-pc-file.patch
View File

@ -1,26 +0,0 @@
diff --git a/configure.ac b/configure.ac
index a44dbf4..55bd768 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,9 +64,11 @@ AC_CONFIG_FILES([Makefile \
AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
# on some systems "iconv()" lives in libc. On others it lives in libiconv
# on older systems "libiconv()" lives in libiconv
+SAVED_LIBS="${LIBS}"
AC_SEARCH_LIBS(iconv,iconv,,
AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),))
AC_SEARCH_LIBS(locale_charset,charset,,
AC_SEARCH_LIBS(nl_langinfo,c,,AC_MSG_ERROR(['libcharset' is required but it doesn't seem to be installed on this system.]),))
+AC_SUBST(ICONV_LIBS, "${LIBS%${SAVED_LIBS}}")
AC_OUTPUT
diff --git a/freexl.pc.in b/freexl.pc.in
index 5813e68..8fc671d 100644
--- a/freexl.pc.in
+++ b/freexl.pc.in
@@ -10,3 +10,4 @@ Description: a simple library extracting data from .xls (Excel BIFF) files
Version: @VERSION@
Libs: -L${libdir} -lfreexl -lm
Cflags: -I${includedir}
+Libs.private: @ICONV_LIBS@

13
ports/freexl/fix-sources.patch
View File

@ -1,13 +0,0 @@
diff --git a/config-msvc.h b/config-msvc.h
index a39d4e7..37f1c0b 100644
--- a/config-msvc.h
+++ b/config-msvc.h
@@ -66,7 +66,7 @@
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
+#undef HAVE_UNISTD_H
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */

29
ports/freexl/portfile.cmake
View File

@ -1,18 +1,15 @@
set(FREEXL_VERSION_STR "1.0.6")
vcpkg_download_distfile(ARCHIVE
URLS "https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${FREEXL_VERSION_STR}.tar.gz"
FILENAME "freexl-${FREEXL_VERSION_STR}.tar.gz"
SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6
URLS "https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${VERSION}.tar.gz"
FILENAME "freexl-${VERSION}.tar.gz"
SHA512 663ccc321c2f0dcab8ad9255b2a77066c2046d531a0aa723fb114301fa27b53bf980787dd2548c46541036eceef988c5eedf2bec053adf628929470e67ddc17a
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES
fix-makefiles.patch
fix-sources.patch
fix-pc-file.patch
dependencies.patch
subdirs.patch
)
vcpkg_configure_make(
@ -22,19 +19,13 @@ vcpkg_configure_make(
vcpkg_install_make()
if(VCPKG_TARGET_IS_WINDOWS)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
set(includedir [[${prefix}/include]])
set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc")
vcpkg_replace_string("${outfile}" " -lm" " -liconv -lcharset")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
set(includedir [[${prefix}/../include]])
set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc")
vcpkg_replace_string("${outfile}" " -lm" " -liconv -lcharset")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc" " -lm" " -liconv -lcharset")
if(NOT DEFINED VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc" " -lm" " -liconv -lcharset")
endif()
endif()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

12
ports/freexl/subdirs.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/Makefile.am b/Makefile.am
index 50dc7f6..cbc99ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = headers src tests examples
+SUBDIRS = headers src
EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \
images/piazza.jpg images/piazza.eps mainpage.doxy config-msvc.h

8
ports/freexl/vcpkg.json
View File

@ -1,10 +1,12 @@
{
"name": "freexl",
"version": "1.0.6",
"port-version": 2,
"version": "2.0.0",
"description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet",
"homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources",
"license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later",
"dependencies": [
"libiconv"
"expat",
"libiconv",
"minizip"
]
}

6
ports/libkml/fix-minizip.patch
View File

@ -7,10 +7,10 @@ index 9728ead..028f50a 100644
endif()
-find_package(MiniZip)
+find_package(MINIZIP NAMES minizip REQUIRED)
+find_package(MINIZIP NAMES unofficial-minizip REQUIRED)
if(MINIZIP_FOUND)
- include_directories(${MINIZIP_INCLUDE_DIR})
+ set(MINIZIP_LIBRARY minizip::minizip)
+ set(MINIZIP_LIBRARY unofficial::minizip::minizip)
else()
include(External_minizip)
list(APPEND KMLBASE_DEPENDS MINIZIP)
@ -20,7 +20,7 @@ index 3e295f4..97826df 100644
+++ b/cmake/LibKMLConfig.cmake.in
@@ -1,3 +1,6 @@
+include(CMakeFindDependencyMacro)
+find_dependency(minizip CONFIG)
+find_dependency(unofficial-minizip CONFIG)
+
# Compute paths
get_filename_component(LIBKML_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)

2
ports/libkml/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libkml",
"version": "1.3.0",
"port-version": 12,
"port-version": 13,
"description": "Reference implementation of OGC KML 2.2",
"homepage": "https://github.com/libkml/libkml",
"license": "BSD-3-Clause",

15
ports/libspatialite/fix-mingw.patch
View File

@ -1,23 +1,10 @@
diff --git a/src/gaiageo/gg_shape.c b/src/gaiageo/gg_shape.c
index ee2f1cf..01f2571 100644
--- a/src/gaiageo/gg_shape.c
+++ b/src/gaiageo/gg_shape.c
@@ -58,7 +58,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
#endif
#ifdef _WIN32
-#include <Windows.h>
+#include <windows.h>
#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(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 \

32
ports/libspatialite/fix-utf8-source.patch Normal file
View File

@ -0,0 +1,32 @@
diff --git a/src/srsinit/epsg_inlined_21.c b/src/srsinit/epsg_inlined_21.c
index 94aa9d4..457b38a 100644
--- a/src/srsinit/epsg_inlined_21.c
+++ b/src/srsinit/epsg_inlined_21.c
@@ -619,9 +619,9 @@ initialize_epsg_21 (int filter, struct epsg_defs **first, struct epsg_defs **las
add_srs_wkt (p, 27,
"lic, Chad, Chile, China, Christmas Island, Cocos (Keelin");
add_srs_wkt (p, 28,
- "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, CÃ");
+ "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, Cô");
add_srs_wkt (p, 29,
- "´te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr");
+ "te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr");
add_srs_wkt (p, 30,
"us, Czechia, Denmark, Djibouti, Dominica, Dominican Repu");
add_srs_wkt (p, 31,
diff --git a/src/srsinit/epsg_inlined_25.c b/src/srsinit/epsg_inlined_25.c
index 1071eb1..a09cb8c 100644
--- a/src/srsinit/epsg_inlined_25.c
+++ b/src/srsinit/epsg_inlined_25.c
@@ -3180,9 +3180,9 @@ initialize_epsg_25 (int filter, struct epsg_defs **first, struct epsg_defs **las
add_srs_wkt (p, 26,
"lic, Chad, Chile, China, Christmas Island, Cocos (Keelin");
add_srs_wkt (p, 27,
- "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, CÃ");
+ "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, Cô");
add_srs_wkt (p, 28,
- "´te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr");
+ "te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr");
add_srs_wkt (p, 29,
"us, Czechia, Denmark, Djibouti, Dominica, Dominican Repu");
add_srs_wkt (p, 30,

9
ports/libspatialite/portfile.cmake
View File

@ -1,8 +1,7 @@
set(LIBSPATIALITE_VERSION_STR "5.0.1")
vcpkg_download_distfile(ARCHIVE
URLS "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz"
FILENAME "libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz"
SHA512 c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf
URLS "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${VERSION}.tar.gz"
FILENAME "libspatialite-${VERSION}.tar.gz"
SHA512 2745b373e31cea58623224def6090c491b58409803bb71231450dfa2cfdf3aafc3fc6f680585d55d085008f8cf362c3062ae67ffc7d80257775a22eb81ef1e57
)
vcpkg_extract_source_archive(
@ -13,6 +12,7 @@ vcpkg_extract_source_archive(
fix-linux-configure.patch
gaiaconfig-msvc.patch
fix-mingw.patch
fix-utf8-source.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS unused
@ -116,7 +116,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
endif()
set(infile "${SOURCE_PATH}/spatialite.pc.in")
set(VERSION "${LIBSPATIALITE_VERSION_STR}")
set(libdir [[${prefix}/lib]])
set(exec_prefix [[${prefix}]])
list(JOIN pkg_config_modules " " requires_private)

3
ports/libspatialite/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "libspatialite",
"version": "5.0.1",
"port-version": 12,
"version": "5.1.0",
"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,

2
ports/minizip/CMakeLists.txt
View File

@ -19,7 +19,7 @@ set(HEADERS
mztools.h
)
if(WIN32)
list(APPEND SRC iowin32.c)
list(APPEND SRC iowin32.c minizip-win32.def)
list(APPEND HEADERS iowin32.h)
endif()

40
ports/minizip/lib-to-def.cmake Normal file
View File

@ -0,0 +1,40 @@
function(lib_to_def)
if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW OR NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
return()
endif()
cmake_parse_arguments(PARSE_ARGV 0 arg "" "BASENAME;REGEX" "")
if(NOT arg_BASENAME)
message(FATAL_ERROR "BASENAME is a required argument.")
endif()
if(NOT arg_REGEX)
set(arg_REGEX "[^ ]+")
endif()
set(logfile "${CURRENT_BUILDTREES_DIR}/dumpbin-${arg_BASENAME}-${TARGET_TRIPLET}-symbols.log")
vcpkg_execute_required_process(
COMMAND dumpbin /symbols "/OUT:${logfile}" "${CURRENT_PACKAGES_DIR}/lib/${arg_BASENAME}.lib"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
LOGNAME "dumpbin-${arg_BASENAME}-${TARGET_TRIPLET}"
)
file(STRINGS "${logfile}" symbols REGEX "^... ........ SECT.. notype .. External [|] ${arg_REGEX}")
list(TRANSFORM symbols REPLACE "^[^|]+[|] " " ")
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
string(REPLACE " _" " " symbols "${symbols}")
endif()
list(JOIN symbols "\n" symbols)
set(symbols "EXPORTS\n${symbols}\n")
set(def_file "${CMAKE_CURRENT_LIST_DIR}/${arg_BASENAME}-${VCPKG_TARGET_ARCHITECTURE}.def")
if(NOT EXISTS "${def_file}")
set(def_file "${CMAKE_CURRENT_LIST_DIR}/${arg_BASENAME}-win32.def")
endif()
if(EXISTS "${def_file}")
file(READ "${def_file}" original_symbols)
else()
set(original_symbols "")
endif()
if(NOT symbols STREQUAL original_symbols)
file(WRITE "${CURRENT_BUILDTREES_DIR}/${arg_BASENAME}-${VCPKG_TARGET_ARCHITECTURE}.def.log" "${symbols}")
message(SEND_ERROR "${arg_BASENAME}-${VCPKG_TARGET_ARCHITECTURE}.def has changed.")
endif()
endfunction()

78
ports/minizip/minizip-win32.def Normal file
View File

@ -0,0 +1,78 @@
EXPORTS
fill_win32_filefunc
fill_win32_filefunc64
fill_win32_filefunc64A
fill_win32_filefunc64W
win32_open_file_func
win32_read_file_func
win32_write_file_func
win32_tell64_file_func
win32_seek64_file_func
win32_close_file_func
win32_error_file_func
win32_open64_file_func
win32_open64_file_funcA
win32_open64_file_funcW
win32_tell_file_func
win32_seek_file_func
unzRepair
zip_copyright
zipOpen
zipOpen64
zipOpen2
zipOpen2_64
zipOpen3
zipOpenNewFileInZip
zipOpenNewFileInZip64
zipOpenNewFileInZip2
zipOpenNewFileInZip2_64
zipOpenNewFileInZip3
zipOpenNewFileInZip3_64
zipOpenNewFileInZip4
zipOpenNewFileInZip4_64
zipWriteInFileInZip
zipCloseFileInZip
zipCloseFileInZipRaw
zipCloseFileInZipRaw64
zipClose
zipRemoveExtraInfoBlock
unz_copyright
unzStringFileNameCompare
unzOpen
unzOpen64
unzOpen2
unzOpen2_64
unzClose
unzGetGlobalInfo
unzGetGlobalInfo64
unzGetGlobalComment
unzGoToFirstFile
unzGoToNextFile
unzLocateFile
unzGetFilePos
unzGoToFilePos
unzGetFilePos64
unzGoToFilePos64
unzGetCurrentFileInfo64
unzGetCurrentFileInfo
unzGetCurrentFileZStreamPos64
unzOpenCurrentFile
unzOpenCurrentFilePassword
unzOpenCurrentFile2
unzOpenCurrentFile3
unzCloseCurrentFile
unzReadCurrentFile
unztell
unztell64
unzeof
unzGetLocalExtrafield
unzGetOffset64
unzGetOffset
unzSetOffset64
unzSetOffset
fill_fopen64_filefunc
fill_fopen_filefunc
call_zopen64
call_zseek64
call_ztell64
fill_zlib_filefunc64_32_def_from_filefunc32

25
ports/minizip/portfile.cmake
View File

@ -1,7 +1,4 @@
# When this port is updated, the minizip port should be updated at the same time
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
# When zlib updated, the minizip port should be updated at the same time
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO madler/zlib
@ -15,6 +12,20 @@ vcpkg_from_github(
pkgconfig.patch
)
vcpkg_cmake_get_vars(cmake_vars_file)
include("${cmake_vars_file}")
# Maintainer switch: Temporarily set this to 1 to re-generate the lists
# of exported symbols. This is needed when the version is bumped.
set(GENERATE_SYMBOLS 0)
if(GENERATE_SYMBOLS)
if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
else()
set(GENERATE_SYMBOLS 0)
endif()
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
bzip2 ENABLE_BZIP2
@ -23,6 +34,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
"${CMAKE_CURRENT_LIST_DIR}/minizip-win32.def"
"${CMAKE_CURRENT_LIST_DIR}/unofficial-minizipConfig.cmake.in"
DESTINATION "${SOURCE_PATH}/contrib/minizip"
)
@ -56,3 +68,8 @@ endif()
configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/minizipConfig.cmake" @ONLY)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt")
if(GENERATE_SYMBOLS)
include("${CMAKE_CURRENT_LIST_DIR}/lib-to-def.cmake")
lib_to_def(BASENAME minizip REGEX "(call|fill|unz|win32|zip)")
endif()

6
ports/minizip/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "minizip",
"version-semver": "1.2.13",
"port-version": 2,
"port-version": 3,
"description": "Minizip zip file manipulation library",
"homepage": "https://github.com/madler/zlib",
"license": "Zlib",
@ -14,6 +14,10 @@
"name": "vcpkg-cmake-config",
"host": true
},
{
"name": "vcpkg-cmake-get-vars",
"host": true
},
"zlib"
],
"features": {

4
ports/spatialite-tools/portfile.cmake
View File

@ -1,11 +1,11 @@
# Allow empty include directory
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
set(SPATIALITE_TOOLS_VERSION_STR "5.0.1")
string(REPLACE "-" "" SPATIALITE_TOOLS_VERSION_STR "${VERSION}")
vcpkg_download_distfile(ARCHIVE
URLS "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz"
FILENAME "spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz"
SHA512 dad52f6ed3c66ffd95f3a5c21225cd1b20641523af616f7e8defba8e4e46921da169e5f7bf9c53a355e132b6e74750d6db3fe02c870a3386f850df49c83bb8cd
SHA512 cf255c9e04e78e450e20019e3c988b2b0a770c6b7857a5b1c95d0696ee29902e7a85667c1a38dec9aa164fa6d28a444be6365b0444b78015180c1f27fa68ea89
)
vcpkg_extract_source_archive(SOURCE_PATH

3
ports/spatialite-tools/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "spatialite-tools",
"version": "5.0.1",
"port-version": 4,
"version": "5.1.0-a",
"description": "Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)",
"homepage": "https://www.gaia-gis.it/fossil/spatialite-tools/index",
"license": "GPL-3.0-or-later",

16
versions/baseline.json
View File

@ -2697,8 +2697,8 @@
"port-version": 2
},
"freexl": {
"baseline": "1.0.6",
"port-version": 2
"baseline": "2.0.0",
"port-version": 0
},
"fribidi": {
"baseline": "1.0.12",
@ -4262,7 +4262,7 @@
},
"libkml": {
"baseline": "1.3.0",
"port-version": 12
"port-version": 13
},
"liblas": {
"baseline": "1.8.1",
@ -4629,8 +4629,8 @@
"port-version": 3
},
"libspatialite": {
"baseline": "5.0.1",
"port-version": 12
"baseline": "5.1.0",
"port-version": 0
},
"libspnav": {
"baseline": "0.2.3",
@ -5390,7 +5390,7 @@
},
"minizip": {
"baseline": "1.2.13",
"port-version": 2
"port-version": 3
},
"minizip-ng": {
"baseline": "4.0.0",
@ -7761,8 +7761,8 @@
"port-version": 4
},
"spatialite-tools": {
"baseline": "5.0.1",
"port-version": 4
"baseline": "5.1.0-a",
"port-version": 0
},
"spdk": {
"baseline": "19.01.1",

5
versions/f-/freexl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d2f0c530b5cb259f17171cb8fc6b58e3642e9334",
"version": "2.0.0",
"port-version": 0
},
{
"git-tree": "7ffd19cd7345be08a7b93d1d4c806d27b98a83ef",
"version": "1.0.6",

5
versions/l-/libkml.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "010ce552eaee999aaf220936eb3e46b5bb88a9fc",
"version": "1.3.0",
"port-version": 13
},
{
"git-tree": "84ea1bd884a5d5afee127b15e73ef5bb7ba638dc",
"version": "1.3.0",

5
versions/l-/libspatialite.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6c988a575680cb06fded62a1f63d43426d683dfd",
"version": "5.1.0",
"port-version": 0
},
{
"git-tree": "ea959bb978266565d868fff1aed8641b56493131",
"version": "5.0.1",

5
versions/m-/minizip.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "68d2e759e03b54cd9970328b1cede845ebccf7c2",
"version-semver": "1.2.13",
"port-version": 3
},
{
"git-tree": "48d519ab0025623c54756c482453f8405d2646bd",
"version-semver": "1.2.13",

5
versions/s-/spatialite-tools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "706b7879f1ae2e597ffefd6ab923251be8706605",
"version": "5.1.0-a",
"port-version": 0
},
{
"git-tree": "200da5b412aa158df73737b51ef1b679c5bbf27f",
"version": "5.0.1",