From f9c99ced77845dcacca19d6f57fc811bb97fe309 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 14 Mar 2023 15:15:58 +0100 Subject: [PATCH] Update to 3.6.3 --- .gitignore | 2 ++ gdal-fortify-source.patch | 21 --------------------- gdal-include.patch | 21 --------------------- gdal.spec | 14 +++++--------- gdal_utils.patch | 12 ++++++------ sources | 4 ++-- 6 files changed, 15 insertions(+), 59 deletions(-) delete mode 100644 gdal-fortify-source.patch delete mode 100644 gdal-include.patch diff --git a/.gitignore b/.gitignore index 27a57c4..193f1e3 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,5 @@ 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 diff --git a/gdal-fortify-source.patch b/gdal-fortify-source.patch deleted file mode 100644 index 47519d5..0000000 --- a/gdal-fortify-source.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 diff --git a/gdal-include.patch b/gdal-include.patch deleted file mode 100644 index 6e826ad..0000000 --- a/gdal-include.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 412b7fe6604141ee371f5a5a628bab1c5304de76 Mon Sep 17 00:00:00 2001 -From: Even Rouault -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 - #include - - GByte *pIn; diff --git a/gdal.spec b/gdal.spec index 45eba3d..6724632 100644 --- a/gdal.spec +++ b/gdal.spec @@ -50,8 +50,8 @@ Name: gdal -Version: 3.6.2 -Release: 6%{?dist} +Version: 3.6.3 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -71,13 +71,6 @@ 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++ @@ -573,6 +566,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Tue Mar 14 2023 Sandro Mani - 3.6.3-1 +- Update to 3.6.3 + * Sat Mar 04 2023 Sandro Mani - 3.6.2-6 - Rebuild (proj) diff --git a/gdal_utils.patch b/gdal_utils.patch index 67b72f5..e9bde4c 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -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 +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 @@ -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.2-fedora/frmts/iso8211/CMakeLists.txt gdal- target_link_libraries(8211createfromxml PRIVATE $ gdal_iso8211) + install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif () -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 +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 @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA gdal_standard_includes(ogr_S57) diff --git a/sources b/sources index cff55e2..6f81701 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdalautotest-3.6.2.tar.gz) = 63dd6f185b766cea9a200190428f2791c99f2d4032e7503404199833fa63cd31bc3b56e198a7d145cd954aace767d16d1d75c602880e9bee962dea98e9cf1859 -SHA512 (gdal-3.6.2-fedora.tar.xz) = b20b36553115c3a76626394bc2ace8f6c7c3d868b40198805da7ea829e56230058ddd469dead2b0a5c26b81d3e4d1d5f365372cfa1effdc4a80ef015d33760db +SHA512 (gdal-3.6.3-fedora.tar.xz) = cacfde8de337fd922cdd22a6061fe14e28bfbd1e36ff58c0990d20fb1cb23c6e06ea02d8c92745028b1699821c19b00617b2cddfacfbe2f86759cb9c5e1b7013 +SHA512 (gdalautotest-3.6.3.tar.gz) = 2967c07a0c5cb426048ead60b6428e8ebb5c5f4bd1ff7409991537575b5a1eabd1d4da2d65607894e16153fd4ce8a31a501788b938a155ddf8cec581fddac1d4