Revert "Update to 3.6.3"

This reverts commit f9c99ced77.
2023-03-15 08:53:13 +01:00 · 2023-03-15 08:53:13 +01:00 · 8d9ff61996
parent f9c99ced77
commit 8d9ff61996
6 changed files with 59 additions and 15 deletions
--- a/.gitignore
+++ b/.gitignore
@ -90,5 +90,3 @@ gdalautotest-1.7.0.tar.gz
 /gdal-3.6.1-fedora.tar.xz
 /gdal-3.6.2-fedora.tar.xz
 /gdalautotest-3.6.2.tar.gz
-/gdal-3.6.3-fedora.tar.xz
-/gdalautotest-3.6.3.tar.gz
--- a/gdal-fortify-source.patch
+++ b/gdal-fortify-source.patch
@ -0,0 +1,21 @@
+diff -rupN --no-dereference gdal-3.6.2-fedora/port/vsipreload.cpp gdal-3.6.2-fedora-new/port/vsipreload.cpp
+--- gdal-3.6.2-fedora/port/vsipreload.cpp	2023-01-02 15:38:17.000000000 +0100
+++ gdal-3.6.2-fedora-new/port/vsipreload.cpp	2023-01-05 09:09:34.828929089 +0100
+@@ -62,6 +62,17 @@
+ #undef _FORTIFY_SOURCE
+ #endif
+ 
+
+/*
+ * We need to export open* etc., but _FORTIFY_SOURCE defines conflicting
+ * always_inline versions. Disable _FORTIFY_SOURCE for this file, so we
+ * can define our overrides.
+ */
+#ifdef _FORTIFY_SOURCE
+#undef _FORTIFY_SOURCE
+#endif
+
+
+ #define _GNU_SOURCE 1
+ #define _LARGEFILE64_SOURCE 1
+ #include <stdio.h>
--- a/gdal-include.patch
+++ b/gdal-include.patch
@ -0,0 +1,21 @@
+From 412b7fe6604141ee371f5a5a628bab1c5304de76 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Tue, 17 Jan 2023 13:39:05 +0100
+Subject: [PATCH] testcopywords.cpp: fix build error with clang 15.0.7
+
+---
+ autotest/cpp/testcopywords.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/autotest/cpp/testcopywords.cpp b/autotest/cpp/testcopywords.cpp
+index a59d9bf91a3..07a0f448c69 100644
+--- a/autotest/cpp/testcopywords.cpp
+++ b/autotest/cpp/testcopywords.cpp
+@@ -30,6 +30,7 @@
+ #include "cpl_conv.h"
+ #include "gdal.h"
+ 
+#include <cstdint>
+ #include <iostream>
+ 
+ GByte *pIn;
--- a/gdal.spec
+++ b/gdal.spec
@ -50,8 +50,8 @@


 Name:          gdal
-Version:       3.6.3
-Release:       1%{?dist}
+Version:       3.6.2
+Release:       6%{?dist}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
@ -71,6 +71,13 @@ Source5:       %{name}-cleaner.sh

 # Add some utils to the default install target
 Patch0:        gdal_utils.patch
+# Fix build failure
+#   inlining failed in call to ‘always_inline’ ‘open.localalias’
+# See https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2526 for a similar issue
+Patch1:        gdal-fortify-source.patch
+# Add missing include needed for gcc 13
+# https://github.com/OSGeo/gdal/commit/412b7fe6604141ee371f5a5a628bab1c5304de76
+Patch2:        gdal-include.patch

 BuildRequires: cmake
 BuildRequires: gcc-c++
@ -566,9 +573,6 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config


 %changelog
-* Tue Mar 14 2023 Sandro Mani <manisandro@gmail.com> - 3.6.3-1
- Update to 3.6.3
-
 * Sat Mar 04 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-6
 - Rebuild (proj)

--- a/gdal_utils.patch
+++ b/gdal_utils.patch
@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.6.3-fedora-new/frmts/iso8211/CMakeLists.txt
--- gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt	2023-03-07 18:14:55.000000000 +0100
-+++ gdal-3.6.3-fedora-new/frmts/iso8211/CMakeLists.txt	2023-03-14 09:21:05.455845507 +0100
+diff -rupN --no-dereference gdal-3.6.2-fedora/frmts/iso8211/CMakeLists.txt gdal-3.6.2-fedora-new/frmts/iso8211/CMakeLists.txt
+--- gdal-3.6.2-fedora/frmts/iso8211/CMakeLists.txt	2023-01-02 15:38:16.000000000 +0100
+++ gdal-3.6.2-fedora-new/frmts/iso8211/CMakeLists.txt	2023-01-05 09:09:34.553926914 +0100
@@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211)
 
 # Because linking an OBJECT library
@ -23,9 +23,9 @@ diff -rupN --no-dereference gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt gdal-
     target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
 +    install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif ()
-diff -rupN --no-dereference gdal-3.6.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.6.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
--- gdal-3.6.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-03-07 18:14:55.000000000 +0100
-+++ gdal-3.6.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-03-14 09:21:05.455845507 +0100
+diff -rupN --no-dereference gdal-3.6.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.6.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
+--- gdal-3.6.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-01-02 15:38:17.000000000 +0100
+++ gdal-3.6.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-01-05 09:09:34.554926922 +0100
@@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
 gdal_standard_includes(ogr_S57)
 
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (gdal-3.6.3-fedora.tar.xz) = cacfde8de337fd922cdd22a6061fe14e28bfbd1e36ff58c0990d20fb1cb23c6e06ea02d8c92745028b1699821c19b00617b2cddfacfbe2f86759cb9c5e1b7013
-SHA512 (gdalautotest-3.6.3.tar.gz) = 2967c07a0c5cb426048ead60b6428e8ebb5c5f4bd1ff7409991537575b5a1eabd1d4da2d65607894e16153fd4ce8a31a501788b938a155ddf8cec581fddac1d4
+SHA512 (gdalautotest-3.6.2.tar.gz) = 63dd6f185b766cea9a200190428f2791c99f2d4032e7503404199833fa63cd31bc3b56e198a7d145cd954aace767d16d1d75c602880e9bee962dea98e9cf1859
+SHA512 (gdal-3.6.2-fedora.tar.xz) = b20b36553115c3a76626394bc2ace8f6c7c3d868b40198805da7ea829e56230058ddd469dead2b0a5c26b81d3e4d1d5f365372cfa1effdc4a80ef015d33760db