diff --git a/.gitattributes b/.gitattributes index 52326ef4af192a76fe667564ff46b865f6db039b..a6da052b23b10418ddc58a3e732e863a46faa88f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.gz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text diff --git a/backport-Add-compatibility-with-Poppler-25.10-support-for-older-versions-kept.patch b/backport-Add-compatibility-with-Poppler-25.10-support-for-older-versions-kept.patch deleted file mode 100644 index 6e46949209ca556ea5a0399bf58556f12684cfe9..0000000000000000000000000000000000000000 --- a/backport-Add-compatibility-with-Poppler-25.10-support-for-older-versions-kept.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a716a6cd5ffd779b30950f046fce91878fc97b9d Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sun, 5 Oct 2025 00:50:51 +0200 -Subject: [PATCH] Add compatibility with Poppler 25.10 (support for older - versions kept) - -Fixes #13173 ---- - frmts/pdf/pdfobject.cpp | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp -index d8ded01d3e4b..2c5c44ba04d9 100644 ---- a/frmts/pdf/pdfobject.cpp -+++ b/frmts/pdf/pdfobject.cpp -@@ -1437,7 +1437,12 @@ int64_t GDALPDFStreamPoppler::GetLength(int64_t nMaxSize) - - static char *GooStringToCharStart(GooString &gstr) - { -- auto nLength = gstr.getLength(); -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 10) -+ const auto nLength = gstr.size(); -+#else -+ const auto nLength = gstr.getLength(); -+#endif - if (nLength) - { - char *pszContent = static_cast(VSI_MALLOC_VERBOSE(nLength + 1)); -@@ -1514,7 +1519,12 @@ char *GDALPDFStreamPoppler::GetRawBytes() - "GDALPDFStreamPoppler::GetRawBytes(): %s", e.what()); - return nullptr; - } -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 10) -+ m_nRawLength = gstr.size(); -+#else - m_nRawLength = gstr.getLength(); -+#endif - return GooStringToCharStart(gstr); - } - diff --git a/gdal-3.11.4.tar.xz b/gdal-3.12.0.tar.xz similarity index 32% rename from gdal-3.11.4.tar.xz rename to gdal-3.12.0.tar.xz index afbd5fc1b890269d2a37ea8164796a21e951b1de..0e1beca575a86c62d72259e3ab04a9cd202bc7da 100644 --- a/gdal-3.11.4.tar.xz +++ b/gdal-3.12.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6401eba2bb63f5ef7a08d2157f240194f06d508d096898a705637aeea9d3bbe8 -size 9321096 +oid sha256:428c19fff818bbb4136766cfee86fae2eebd3620806aa40af21844f4f0b2dbcf +size 9590436 diff --git a/gdal.spec b/gdal.spec index 9f2a9e1a5f2046d27b2eaa87b83edc9a375429e1..e2bcfdf5471e06e1422a4eacfb8ec97e4aacc2c3 100644 --- a/gdal.spec +++ b/gdal.spec @@ -22,13 +22,13 @@ %endif Name: gdal -Version: 3.11.4 -Release: 2 +Version: 3.12.0 +Release: 1 Summary: GIS file format library License: MIT URL: https://www.gdal.org Source0: https://download.osgeo.org/gdal/%{version}/gdal-%{version}.tar.xz -Source1: https://download.osgeo.org/gdal/%{version}/%{name}autotest-%{version}.tar.gz +Source1: https://download.osgeo.org/gdal/%{version}/%{name}autotest-%{version}.zip # Multilib compatible cpl-config.h header Source2: cpl-config.h # Multilib compatible gdal-config script @@ -39,9 +39,6 @@ Patch1: gdal_incompatible-pointer-types.patch # Add definitions of missing int16_t and int32_t Patch2: gdal-3.10.2-integer-types.patch -# Fix build with poppler 25.10 -Patch6000: backport-Add-compatibility-with-Poppler-25.10-support-for-older-versions-kept.patch - BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gmock-devel @@ -194,7 +191,7 @@ rm -rf mrf/LERCV1 rm -rf third_party/LercLib # Setup autotest directory -tar xf %{SOURCE1} +unzip -q %{SOURCE1} mv %{name}autotest-%{version} autotest # Need to patch autotest @@ -297,8 +294,8 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files libs %license LICENSE.TXT %doc NEWS.md PROVENANCE.TXT COMMITTERS -%{_libdir}/libgdal.so.37 -%{_libdir}/libgdal.so.37.* +%{_libdir}/libgdal.so.38 +%{_libdir}/libgdal.so.38.* %{_datadir}/%{name}/ %{_libdir}/gdalplugins/ @@ -348,6 +345,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_jnidir}/%{name}/gdal-%{version}-javadoc.jar %changelog +* Mon Nov 17 2025 Funda Wang - 3.12.0-1 +- update to 3.12.0 + * Sat Oct 11 2025 lingsheng - 3.11.4-2 - Add compatibility with Poppler 25.10 (support for older versions kept) diff --git a/gdalautotest-3.11.4.tar.gz b/gdalautotest-3.12.0.zip similarity index 32% rename from gdalautotest-3.11.4.tar.gz rename to gdalautotest-3.12.0.zip index 870274a627e03f9998dc3e740bef5f651ff8211d..7794ea0fa093e14cba319958415811093448c1b9 100644 --- a/gdalautotest-3.11.4.tar.gz +++ b/gdalautotest-3.12.0.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d88502397ae13b65aeb9cee69b010f1808e4db02c769cde49bc9f1bce2932053 -size 18587889 +oid sha256:4b16dec31a22e25609af605f5e38092341868435ecbddfe5b82a93e69df3c6c6 +size 23190787