early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,16 @@
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

View File

@@ -0,0 +1,26 @@
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@

View File

@@ -0,0 +1,13 @@
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. */

86
externals/vcpkg/ports/freexl/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,86 @@
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
)
vcpkg_extract_source_archive_ex(
ARCHIVE "${ARCHIVE}"
OUT_SOURCE_PATH SOURCE_PATH
PATCHES
fix-makefiles.patch
fix-sources.patch
fix-pc-file.patch
)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
set(OPTFLAGS "/nologo /fp:precise /W3 /D_CRT_SECURE_NO_WARNINGS /DDLL_EXPORT")
set(LIBS_ALL "iconv.lib charset.lib")
if(VCPKG_TARGET_IS_UWP)
string(APPEND OPTFLAGS " /DWINAPI_FAMILY=WINAPI_FAMILY_APP")
string(APPEND LIBS_ALL " WindowsApp.lib /APPCONTAINER")
endif()
cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR INSTDIR)
vcpkg_install_nmake(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
"OPTFLAGS=${OPTFLAGS}"
"CFLAGS=-I. -Iheaders ${OPTFLAGS}"
"LIBS_ALL=${LIBS_ALL}"
OPTIONS_DEBUG
"INSTDIR=${INSTDIR}\\debug"
"LINK_FLAGS=/debug /LIBPATH:\"${CURRENT_INSTALLED_DIR}/debug/lib\""
OPTIONS_RELEASE
"INSTDIR=${INSTDIR}"
"LINK_FLAGS=/LIBPATH:\"${CURRENT_INSTALLED_DIR}/lib\""
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib")
else()
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl.lib")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib")
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/lib/freexl.lib")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib")
endif()
endif()
set(VERSION "${FREEXL_VERSION_STR}")
set(libdir [[${prefix}/lib]])
set(exec_prefix [[${prefix}]])
set(ICONV_LIBS "-liconv -lcharset")
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")
configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY)
vcpkg_replace_string("${outfile}" " -lm" "")
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")
configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY)
vcpkg_replace_string("${outfile}" " -lm" "")
endif()
else()
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
)
vcpkg_install_make()
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)

9
externals/vcpkg/ports/freexl/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,9 @@
{
"name": "freexl",
"version-string": "1.0.6",
"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",
"dependencies": [
"libiconv"
]
}