Compare commits
1 Commits
Author | SHA1 | Date |
---|---|---|
|
cf1a61cd79 | 1 month ago |
@ -1,2 +1 @@
|
|||||||
/libspatialite-5.0.0.tar.gz
|
SOURCES/libspatialite-5.1.0.tar.gz
|
||||||
/libspatialite-5.0.1.tar.gz
|
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
c5b4d73ba630740d888cb34321a42d9cac303f2c SOURCES/libspatialite-5.1.0.tar.gz
|
@ -1,7 +1,7 @@
|
|||||||
diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac
|
diff -rupN --no-dereference libspatialite-5.1.0/configure.ac libspatialite-5.1.0-new/configure.ac
|
||||||
--- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:19.015858195 +0100
|
--- libspatialite-5.1.0/configure.ac 2024-03-05 17:10:33.912526691 +0100
|
||||||
+++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:19.017858195 +0100
|
+++ libspatialite-5.1.0-new/configure.ac 2024-03-05 17:10:33.922526658 +0100
|
||||||
@@ -312,35 +312,10 @@ AC_ARG_ENABLE(geos, [AS_HELP_STRING(
|
@@ -299,35 +299,10 @@ AC_ARG_ENABLE(geos, [AS_HELP_STRING(
|
||||||
[], [enable_geos=yes])
|
[], [enable_geos=yes])
|
||||||
if test x"$enable_geos" != "xno"; then
|
if test x"$enable_geos" != "xno"; then
|
||||||
#-----------------------------------------------------------------------
|
#-----------------------------------------------------------------------
|
@ -0,0 +1,175 @@
|
|||||||
|
diff -rupN libspatialite-5.1.0/src/gaiaaux/gg_utf8.c libspatialite-5.1.0-new/src/gaiaaux/gg_utf8.c
|
||||||
|
--- libspatialite-5.1.0/src/gaiaaux/gg_utf8.c 2023-08-04 09:51:40.000000000 +0200
|
||||||
|
+++ libspatialite-5.1.0-new/src/gaiaaux/gg_utf8.c 2024-03-05 23:09:38.938054342 +0100
|
||||||
|
@@ -130,7 +130,12 @@ gaiaConvertCharset (char **buf, const ch
|
||||||
|
pBuf = *buf;
|
||||||
|
utf8buf = sqlite3_malloc (utf8len);
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
- if (iconv (cvt, &pBuf, &len, &pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
+ if (iconv (cvt, ppBuf, &len, &pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
goto error;
|
||||||
|
utf8buf[maxlen - utf8len] = '\0';
|
||||||
|
sqlite3_free (*buf);
|
||||||
|
@@ -188,7 +193,12 @@ gaiaConvertToUTF8 (void *cvtCS, const ch
|
||||||
|
utf8len = maxlen;
|
||||||
|
pBuf = (char *) buf;
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
- if (iconv (cvtCS, &pBuf, &len, &pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
+ if (iconv (cvtCS, ppBuf, &len, &pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
{
|
||||||
|
free (utf8buf);
|
||||||
|
*err = 1;
|
||||||
|
@@ -224,7 +234,12 @@ url_toUtf8 (const char *url, const char
|
||||||
|
utf8len = maxlen;
|
||||||
|
utf8buf = malloc (maxlen);
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
- if (iconv (cvt, &pBuf, &len, &pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
+ if (iconv (cvt, ppBuf, &len, &pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
goto error;
|
||||||
|
utf8buf[maxlen - utf8len] = '\0';
|
||||||
|
iconv_close (cvt);
|
||||||
|
@@ -252,6 +267,12 @@ url_fromUtf8 (const char *url, const cha
|
||||||
|
#else /* not WIN32 */
|
||||||
|
char *pBuf = (char *) url;
|
||||||
|
#endif
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
|
||||||
|
if (url == NULL || out_charset == NULL)
|
||||||
|
return NULL;
|
||||||
|
@@ -263,7 +284,7 @@ url_fromUtf8 (const char *url, const cha
|
||||||
|
utf8len = maxlen;
|
||||||
|
utf8buf = malloc (maxlen);
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
- if (iconv (cvt, &pBuf, &len, &pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
+ if (iconv (cvt, ppBuf, &len, &pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
goto error;
|
||||||
|
utf8buf[maxlen - utf8len] = '\0';
|
||||||
|
iconv_close (cvt);
|
||||||
|
diff -rupN libspatialite-5.1.0/src/gaiageo/gg_shape.c libspatialite-5.1.0-new/src/gaiageo/gg_shape.c
|
||||||
|
--- libspatialite-5.1.0/src/gaiageo/gg_shape.c 2023-08-04 09:51:40.000000000 +0200
|
||||||
|
+++ libspatialite-5.1.0-new/src/gaiageo/gg_shape.c 2024-03-05 23:21:43.191027073 +0100
|
||||||
|
@@ -694,8 +694,13 @@ gaiaOpenShpRead (gaiaShapefilePtr shp, c
|
||||||
|
utf8len = 2048;
|
||||||
|
pBuf = (char *) field_name;
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
if (iconv
|
||||||
|
- ((iconv_t) (shp->IconvObj), &pBuf, &len, &pUtf8buf,
|
||||||
|
+ ((iconv_t) (shp->IconvObj), ppBuf, &len, &pUtf8buf,
|
||||||
|
&utf8len) == (size_t) (-1))
|
||||||
|
{
|
||||||
|
spatialite_e
|
||||||
|
@@ -1178,8 +1183,13 @@ gaiaOpenShpWriteEx (gaiaShapefilePtr shp
|
||||||
|
utf8len = 2048;
|
||||||
|
pBuf = buf;
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
if (iconv
|
||||||
|
- ((iconv_t) (shp->IconvObj), &pBuf, &len, &pUtf8buf,
|
||||||
|
+ ((iconv_t) (shp->IconvObj), ppBuf, &len, &pUtf8buf,
|
||||||
|
&utf8len) == (size_t) (-1))
|
||||||
|
sprintf (buf, "FLD#%d", defaultId++);
|
||||||
|
else
|
||||||
|
@@ -1546,8 +1556,13 @@ parseDbfField (unsigned char *buf_dbf, v
|
||||||
|
utf8len = 2048;
|
||||||
|
pBuf = (char *) buf;
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
if (iconv
|
||||||
|
- ((iconv_t) (iconv_obj), &pBuf, &len, &pUtf8buf,
|
||||||
|
+ ((iconv_t) (iconv_obj), ppBuf, &len, &pUtf8buf,
|
||||||
|
&utf8len) == (size_t) (-1))
|
||||||
|
return 0;
|
||||||
|
memcpy (buf, utf8buf, 2048 - utf8len);
|
||||||
|
@@ -3029,8 +3044,13 @@ gaiaWriteShpEntity (gaiaShapefilePtr shp
|
||||||
|
utf8len = 2048;
|
||||||
|
pBuf = dynbuf;
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
if (iconv
|
||||||
|
- ((iconv_t) (shp->IconvObj), &pBuf, &len,
|
||||||
|
+ ((iconv_t) (shp->IconvObj), ppBuf, &len,
|
||||||
|
&pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
{
|
||||||
|
spatialite_e
|
||||||
|
@@ -5115,8 +5135,13 @@ gaiaOpenDbfRead (gaiaDbfPtr dbf, const c
|
||||||
|
utf8len = 2048;
|
||||||
|
pBuf = (char *) field_name;
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
if (iconv
|
||||||
|
- ((iconv_t) (dbf->IconvObj), &pBuf, &len, &pUtf8buf,
|
||||||
|
+ ((iconv_t) (dbf->IconvObj), ppBuf, &len, &pUtf8buf,
|
||||||
|
&utf8len) == (size_t) (-1))
|
||||||
|
{
|
||||||
|
spatialite_e
|
||||||
|
@@ -5311,8 +5336,13 @@ gaiaOpenDbfWriteEx (gaiaDbfPtr dbf, cons
|
||||||
|
utf8len = 2048;
|
||||||
|
pBuf = buf;
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
if (iconv
|
||||||
|
- ((iconv_t) (dbf->IconvObj), &pBuf, &len, &pUtf8buf,
|
||||||
|
+ ((iconv_t) (dbf->IconvObj), ppBuf, &len, &pUtf8buf,
|
||||||
|
&utf8len) == (size_t) (-1))
|
||||||
|
sprintf (buf, "FLD#%d", defaultId++);
|
||||||
|
else
|
||||||
|
@@ -5432,8 +5462,13 @@ gaiaWriteDbfEntity (gaiaDbfPtr dbf, gaia
|
||||||
|
utf8len = 2048;
|
||||||
|
pBuf = dynbuf;
|
||||||
|
pUtf8buf = utf8buf;
|
||||||
|
+#if defined(__MINGW32__)
|
||||||
|
+ WINICONV_CONST char ** ppBuf = (WINICONV_CONST char**)&pBuf;
|
||||||
|
+#else
|
||||||
|
+ char ** ppBuf = &pBuf;
|
||||||
|
+#endif
|
||||||
|
if (iconv
|
||||||
|
- ((iconv_t) (dbf->IconvObj), &pBuf, &len,
|
||||||
|
+ ((iconv_t) (dbf->IconvObj), ppBuf, &len,
|
||||||
|
&pUtf8buf, &utf8len) == (size_t) (-1))
|
||||||
|
{
|
||||||
|
spatialite_e
|
@ -0,0 +1,24 @@
|
|||||||
|
diff -rupN --no-dereference libspatialite-5.1.0/configure.ac libspatialite-5.1.0-new/configure.ac
|
||||||
|
--- libspatialite-5.1.0/configure.ac 2023-08-04 09:51:40.000000000 +0200
|
||||||
|
+++ libspatialite-5.1.0-new/configure.ac 2024-03-05 17:10:33.524527969 +0100
|
||||||
|
@@ -498,7 +498,7 @@ AM_CONDITIONAL(MODULE_ONLY, [test x"$ena
|
||||||
|
#-----------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Checking for MinGW
|
||||||
|
-AM_CONDITIONAL([MINGW], [test "$target_alias" = "mingw32"])
|
||||||
|
+AM_CONDITIONAL([MINGW], [[[[ "$target_alias" = *"mingw32" ]]]])
|
||||||
|
# Checking for Mac OsX
|
||||||
|
AM_CONDITIONAL([MACOSX], [test "$target_alias" = "macosx"])
|
||||||
|
# Checking for Android
|
||||||
|
diff -rupN --no-dereference libspatialite-5.1.0/test/scandir4win.h libspatialite-5.1.0-new/test/scandir4win.h
|
||||||
|
--- libspatialite-5.1.0/test/scandir4win.h 2023-08-04 09:51:40.000000000 +0200
|
||||||
|
+++ libspatialite-5.1.0-new/test/scandir4win.h 2024-03-05 17:10:33.528527956 +0100
|
||||||
|
@@ -11,7 +11,7 @@ even implied
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
|
||||||
|
-#include <Windows.h>
|
||||||
|
+#include <windows.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
@ -0,0 +1,11 @@
|
|||||||
|
diff -rupN --no-dereference libspatialite-5.1.0/spatialite.pc.in libspatialite-5.1.0-new/spatialite.pc.in
|
||||||
|
--- libspatialite-5.1.0/spatialite.pc.in 2023-08-04 09:51:40.000000000 +0200
|
||||||
|
+++ libspatialite-5.1.0-new/spatialite.pc.in 2024-03-05 17:10:33.154529187 +0100
|
||||||
|
@@ -8,5 +8,6 @@ includedir=@includedir@
|
||||||
|
Name: spatialite
|
||||||
|
Description: Spatial SQL database engine based on SQLite
|
||||||
|
Version: @VERSION@
|
||||||
|
-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm
|
||||||
|
+Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm
|
||||||
|
+Libs: -L${libdir} -lspatialite
|
||||||
|
Cflags: -I${includedir}
|
@ -1,12 +0,0 @@
|
|||||||
diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac
|
|
||||||
--- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:18.748858216 +0100
|
|
||||||
+++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:18.751858215 +0100
|
|
||||||
@@ -96,7 +96,7 @@ AC_PROG_INSTALL
|
|
||||||
AC_PROG_LN_S
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
AC_LIBTOOL_WIN32_DLL
|
|
||||||
-AC_PROG_LIBTOOL
|
|
||||||
+LT_INIT
|
|
||||||
|
|
||||||
# Checks for typedefs, structures, and compiler characteristics.
|
|
||||||
AC_C_CONST
|
|
@ -1,36 +0,0 @@
|
|||||||
diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac
|
|
||||||
--- libspatialite-5.0.1/configure.ac 2021-02-07 16:53:46.000000000 +0100
|
|
||||||
+++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:18.484858236 +0100
|
|
||||||
@@ -489,7 +489,7 @@ AM_CONDITIONAL(MODULE_ONLY, [test x"$ena
|
|
||||||
#-----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Checking for MinGW
|
|
||||||
-AM_CONDITIONAL([MINGW], [test "$target_alias" = "mingw32"])
|
|
||||||
+AM_CONDITIONAL([MINGW], [[[[ "$target_alias" = *"mingw32" ]]]])
|
|
||||||
# Checking for Mac OsX
|
|
||||||
AM_CONDITIONAL([MACOSX], [test "$target_alias" = "macosx"])
|
|
||||||
# Checking for Android
|
|
||||||
diff -rupN --no-dereference libspatialite-5.0.1/src/gaiageo/gg_shape.c libspatialite-5.0.1-new/src/gaiageo/gg_shape.c
|
|
||||||
--- libspatialite-5.0.1/src/gaiageo/gg_shape.c 2021-02-07 16:53:46.000000000 +0100
|
|
||||||
+++ libspatialite-5.0.1-new/src/gaiageo/gg_shape.c 2021-03-08 08:57:18.485858236 +0100
|
|
||||||
@@ -58,7 +58,7 @@ the terms of any one of the MPL, the GPL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
-#include <Windows.h>
|
|
||||||
+#include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if OMIT_ICONV == 0 /* if ICONV is disabled no SHP support is available */
|
|
||||||
diff -rupN --no-dereference libspatialite-5.0.1/test/scandir4win.h libspatialite-5.0.1-new/test/scandir4win.h
|
|
||||||
--- libspatialite-5.0.1/test/scandir4win.h 2021-02-07 16:53:47.000000000 +0100
|
|
||||||
+++ libspatialite-5.0.1-new/test/scandir4win.h 2021-03-08 08:57:18.485858236 +0100
|
|
||||||
@@ -11,7 +11,7 @@ even implied
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
|
|
||||||
-#include <Windows.h>
|
|
||||||
+#include <windows.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
|||||||
diff -rupN libspatialite-5.0.1/spatialite.pc.in libspatialite-5.0.1-new/spatialite.pc.in
|
|
||||||
--- libspatialite-5.0.1/spatialite.pc.in 2021-02-07 16:53:46.000000000 +0100
|
|
||||||
+++ libspatialite-5.0.1-new/spatialite.pc.in 2021-02-10 09:54:09.647552994 +0100
|
|
||||||
@@ -8,5 +8,6 @@ includedir=@includedir@
|
|
||||||
Name: spatialite
|
|
||||||
Description: Spatial SQL database engine based on SQLite
|
|
||||||
Version: @VERSION@
|
|
||||||
-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ -lm
|
|
||||||
+Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ -lm
|
|
||||||
+Libs: -L${libdir} -lspatialite
|
|
||||||
Cflags: -I${includedir}
|
|
Loading…
Reference in new issue