import libspatialite-5.1.0-8.el10

.gitignore

@@ -1,2 +1 @@
-/libspatialite-5.0.0.tar.gz
-/libspatialite-5.0.1.tar.gz
+SOURCES/libspatialite-5.1.0.tar.gz

.libspatialite.metadata

@@ -0,0 +1 @@
+c5b4d73ba630740d888cb34321a42d9cac303f2c  SOURCES/libspatialite-5.1.0.tar.gz

SOURCES/libspatialite_geos.patch

@@ -1,7 +1,7 @@
-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:19.015858195 +0100
-+++ libspatialite-5.0.1-new/configure.ac	2021-03-08 08:57:19.017858195 +0100
-@@ -312,35 +312,10 @@ AC_ARG_ENABLE(geos, [AS_HELP_STRING(
+diff -rupN --no-dereference libspatialite-5.1.0/configure.ac libspatialite-5.1.0-new/configure.ac
+--- libspatialite-5.1.0/configure.ac	2024-03-05 17:10:33.912526691 +0100
++++ libspatialite-5.1.0-new/configure.ac	2024-03-05 17:10:33.922526658 +0100
+@@ -299,35 +299,10 @@ AC_ARG_ENABLE(geos, [AS_HELP_STRING(
    [], [enable_geos=yes])
  if test x"$enable_geos" != "xno"; then
    #-----------------------------------------------------------------------

SOURCES/libspatialite_incompat-ptrs.patch

@@ -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

SOURCES/libspatialite_mingw.patch

@@ -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>
+ 

SOURCES/libspatialite_pkgconfig.patch

@@ -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}

SPECS/libspatialite.spec

@@ -5,11 +5,11 @@
 %endif
 
 Name:          libspatialite
-Version:       5.0.1
-Release:       17%{?dist}
+Version:       5.1.0
+Release:       8%{?dist}
 Summary:       Enables SQLite to support spatial data
 
-License:       MPLv1.1 or GPLv2+ or LGPLv2+
+License:       MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.0-or-later
 URL:           https://www.gaia-gis.it/fossil/libspatialite
 Source0:       http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-%{version}.tar.gz
 
@@ -17,10 +17,10 @@ Source0:       http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatial
 Patch0:        libspatialite_pkgconfig.patch
 # Fix mingw detection in configure.ac
 Patch1:        libspatialite_mingw.patch
-# Fix obsolete macros
-Patch2:        libspatialite_macros.patch
 # Use pkgconfig to find geos
-Patch3:        libspatialite_geos.patch
+Patch2:        libspatialite_geos.patch
+# Fix incompatibile pointer types
+Patch3:        libspatialite_incompat-ptrs.patch
 
 BuildRequires: autoconf automake libtool
 BuildRequires: freexl-devel
@@ -29,7 +29,7 @@ BuildRequires: geos-devel >= 3.7.1
 BuildRequires: librttopo-devel
 BuildRequires: libxml2-devel
 BuildRequires: make
-BuildRequires: minizip-devel
+BuildRequires: minizip-ng-compat-devel
 BuildRequires: proj-devel >= 6.2.0
 BuildRequires: sqlite-devel
 BuildRequires: zlib-devel
@@ -147,8 +147,8 @@ make check  -C build_native %{?_smp_mflags} || :
 %files
 %doc AUTHORS
 %license COPYING
-%{_libdir}/%{name}.so.7*
-%{_libdir}/mod_spatialite.so.7*
+%{_libdir}/%{name}.so.8*
+%{_libdir}/mod_spatialite.so.8*
 # The symlink must be present to allow loading the extension
 # https://groups.google.com/forum/#!topic/spatialite-users/zkGP-gPByXk
 %{_libdir}/mod_spatialite.so
@@ -163,7 +163,7 @@ make check  -C build_native %{?_smp_mflags} || :
 %if %{with mingw}
 %files -n mingw32-%{name}
 %license COPYING
-%{mingw32_bindir}/libspatialite-4.dll
+%{mingw32_bindir}/libspatialite-5.dll
 %{mingw32_includedir}/spatialite.h
 %{mingw32_includedir}/spatialite/
 %{mingw32_libdir}/libspatialite.dll.a
@@ -172,7 +172,7 @@ make check  -C build_native %{?_smp_mflags} || :
 
 %files -n mingw64-%{name}
 %license COPYING
-%{mingw64_bindir}/libspatialite-4.dll
+%{mingw64_bindir}/libspatialite-5.dll
 %{mingw64_includedir}/spatialite.h
 %{mingw64_includedir}/spatialite/
 %{mingw64_libdir}/libspatialite.dll.a
@@ -181,6 +181,52 @@ make check  -C build_native %{?_smp_mflags} || :
 %endif
 
 %changelog
+* Sat Dec 28 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 5.1.0-8
+- Rebuilt for MSVSphere 10
+
+* Tue Sep 17 2024 Sandro Mani <manisandro@gmail.com> - 5.1.0-8
+- Rebuild (proj)
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Mar 05 2024 Sandro Mani <manisandro@gmail.com> - 5.1.0-6
+- Rebuild (proj)
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 04 2023 Lukas Javorsky <ljavorsk@redhat.com> - 5.1.0-3
+- Rebuilt for minizip-ng transition Fedora change
+- Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition
+
+* Sun Sep 03 2023 Sandro Mani <manisandro@gmail.com> - 5.1.0-2
+- Rebuild (proj)
+
+* Fri Aug 04 2023 Sandro Mani <manisandro@gmail.com> - 5.1.0-1
+- Update to 5.1.0
+
+* Fri Aug 04 2023 Sandro Mani <manisandro@gmail.com> - 5.0.1-1
+- Update to 5.0.1
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Mar 04 2023 Sandro Mani <manisandro@gmail.com> - 5.0.1-21
+- Rebuild (proj)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Nov 18 2022 Sandro Mani <manisandro@gmail.com> - 5.0.1-19
+- Rebuild (mingw-minizip)
+
+* Tue Nov 15 2022 Lukas Javorsky <ljavorsk@redhat.com> - 5.0.1-18
+- Rebuild for minizip-ng soname bump
+
 * Fri Sep 23 2022 Orion Poplawski <orion@nwra.com> - 5.0.1-17
 - Disable mingw for EL9
 

libspatialite_macros.patch

@@ -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

libspatialite_mingw.patch

@@ -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>
- 

libspatialite_pkgconfig.patch

@@ -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}

sources

@@ -1 +0,0 @@
-SHA512 (libspatialite-5.0.1.tar.gz) = c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf