Fix gdal-cleaner.sh not removing intended files (#2384093 )

Update to 3.9.3
Rebuild for poppler 24.08.0
2025-07-29 08:03:36 +02:00 · 2024-10-15 09:34:47 +02:00 · 2024-08-22 12:51:39 +02:00 · 2024-08-17 23:35:38 +02:00 · 2024-08-17 23:30:52 +02:00 · 2024-08-14 22:26:54 +02:00
5 changed files with 302 additions and 658 deletions
--- a/.gitignore
+++ b/.gitignore
@ -118,26 +118,5 @@ gdalautotest-1.7.0.tar.gz
 /gdalautotest-3.9.0.tar.gz
 /gdal-3.9.1-fedora.tar.xz
 /gdalautotest-3.9.1.tar.gz
-/gdal-3.9.2-fedora.tar.xz
-/gdalautotest-3.9.2.tar.gz
 /gdalautotest-3.9.3.tar.gz
 /gdal-3.9.3-fedora.tar.xz
-/gdal-3.10.0-fedora.tar.xz
-/gdalautotest-3.10.0.tar.gz
-/gdal-3.10.1-fedora.tar.xz
-/gdalautotest-3.10.1.tar.gz
-/gdal-3.10.2-fedora.tar.xz
-/gdalautotest-3.10.2.tar.gz
-/gdal-3.10.3-fedora.tar.xz
-/gdalautotest-3.10.3.tar.gz
-/gdal-3.11.3-fedora.tar.xz
-/gdalautotest-3.11.3.tar.gz
-/gdal-3.11.4-fedora.tar.xz
-/gdalautotest-3.11.4.tar.gz
-/gdal-3.11.5-fedora.tar.xz
-/gdalautotest-3.11.5.tar.gz
-/gdal-3.12.0-fedora.tar.xz
-/gdal-3.12.0.tar.xz
-/gdalautotest-3.12.0.zip
-/gdal-3.12.1-fedora.tar.xz
-/gdalautotest-3.12.1.zip
--- a/gdal.spec
+++ b/gdal.spec
--- a/gdal_incompatible-pointer-types.patch
+++ b/gdal_incompatible-pointer-types.patch
@ -0,0 +1,21 @@
+diff -rupN --no-dereference gdal-3.9.3-fedora/port/cpl_vsil_win32.cpp gdal-3.9.3-fedora-new/port/cpl_vsil_win32.cpp
+--- gdal-3.9.3-fedora/port/cpl_vsil_win32.cpp	2024-10-07 18:02:07.000000000 +0200
+++ gdal-3.9.3-fedora-new/port/cpl_vsil_win32.cpp	2024-10-15 08:07:44.994694330 +0200
+@@ -868,7 +868,7 @@ int VSIWin32FilesystemHandler::Stat(cons
+             pwszFilename[nLen - 1] = 0;
+ #endif
+ 
+-        int nResult = _wstat64(pwszFilename, pStatBuf);
+        int nResult = _wstat64(pwszFilename, reinterpret_cast<struct _stat64 *>(pStatBuf));
+ 
+         // If _wstat64() fails and the original name is not an extended one,
+         // then retry with an extended filename
+@@ -879,7 +879,7 @@ int VSIWin32FilesystemHandler::Stat(cons
+                 nLastError == ERROR_FILENAME_EXCED_RANGE)
+             {
+                 VSIWin32TryLongFilename(pwszFilename);
+-                nResult = _wstat64(pwszFilename, pStatBuf);
+                nResult = _wstat64(pwszFilename, reinterpret_cast<struct _stat64 *>(pStatBuf));
+             }
+         }
+ 
--- a/gdal_utils.patch
+++ b/gdal_utils.patch
@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt
--- gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt	2025-12-18 15:15:18.000000000 +0100
-+++ gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt	2025-12-18 16:35:42.369730740 +0100
+diff -rupN --no-dereference gdal-3.9.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.9.3-fedora-new/frmts/iso8211/CMakeLists.txt
+--- gdal-3.9.3-fedora/frmts/iso8211/CMakeLists.txt	2024-10-07 18:02:06.000000000 +0200
+++ gdal-3.9.3-fedora-new/frmts/iso8211/CMakeLists.txt	2024-10-15 08:07:44.760697595 +0200
@@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P
 gdal_standard_includes(gdal_iso8211)
 
@ -22,12 +22,12 @@ diff -rupN --no-dereference gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt gdal
 target_include_directories(8211createfromxml PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
 target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
 +install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff -rupN --no-dereference gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
--- gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2025-12-18 15:15:18.000000000 +0100
-+++ gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2025-12-18 16:35:42.369966573 +0100
-@@ -38,7 +38,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
-     target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
- endif()
+diff -rupN --no-dereference gdal-3.9.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.9.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
+--- gdal-3.9.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-10-07 18:02:06.000000000 +0200
+++ gdal-3.9.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-10-15 08:07:44.760697595 +0200
+@@ -27,7 +27,8 @@ set_property(
+   APPEND
+   PROPERTY RESOURCE "${GDAL_DATA_FILES}")
 
 -add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp)
 +add_executable(s57dump s57dump.cpp)
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5
-SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5
+SHA512 (gdalautotest-3.9.3.tar.gz) = a9f44065bb5817cdc32995cd57f65f8a588dfaea77d4a5bc2d9ea361ef1423843358d7e31be2e27505b6e991d07b18f0f5c3fd9526cf697c74bc88f558205d61
+SHA512 (gdal-3.9.3-fedora.tar.xz) = 55d2351e103372e3effd74dd21e763a9c281b1005d9c452f058da9f78469470e910fceff2d4f92b028c0185f55ecbcd62f044cbe9faf0f3702d7361f84324772
Author	SHA1	Message	Date
Sandro Mani	24aa2ab918	Fix gdal-cleaner.sh not removing intended files (#2384093 )	2025-07-29 08:03:36 +02:00
Sandro Mani	ec7ab4f2a9	Update to 3.9.3	2024-10-15 09:34:47 +02:00
Marek Kasik	f846f36ab5	Rebuild for poppler 24.08.0	2024-08-22 12:51:39 +02:00
Sandro Mani	4a27de9df1	Update sources	2024-08-17 23:35:38 +02:00
Sandro Mani	c4a66b6456	Update to 3.9.2	2024-08-17 23:30:52 +02:00
Marek Kasik	e0eee5c4b1	Rebuild for poppler 24.08.0	2024-08-14 22:26:54 +02:00