diff --git a/fix-build-error.patch b/fix-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..452d82cb335ab797511634c2c5929e9a289794b4 --- /dev/null +++ b/fix-build-error.patch @@ -0,0 +1,52 @@ +From b233eb588921d155cff519bbff2db53774edbc31 Mon Sep 17 00:00:00 2001 +From: zhangxianting +Date: Tue, 20 Aug 2024 19:10:31 +0800 +Subject: [PATCH] fix build error + +--- + gdal/gcore/gdaljp2metadatagenerator.cpp | 2 +- + gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp | 1 + + gdal/port/cpl_xml_validate.cpp | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/gdal/gcore/gdaljp2metadatagenerator.cpp b/gdal/gcore/gdaljp2metadatagenerator.cpp +index f19a47d..a9bef00 100644 +--- a/gdal/gcore/gdaljp2metadatagenerator.cpp ++++ b/gdal/gcore/gdaljp2metadatagenerator.cpp +@@ -335,7 +335,7 @@ static CPLString GDALGMLJP2EvalExpr(const CPLString& osTemplate, + /************************************************************************/ + + static void GDALGMLJP2XPathErrorHandler( void * /* userData */, +- xmlErrorPtr error) ++ const xmlError* error) + { + if( error->domain == XML_FROM_XPATH && + error->str1 != nullptr && +diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +index 4f2014b..98aad53 100644 +--- a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp ++++ b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__) + // gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string +diff --git a/gdal/port/cpl_xml_validate.cpp b/gdal/port/cpl_xml_validate.cpp +index bd580d0..0c4949f 100644 +--- a/gdal/port/cpl_xml_validate.cpp ++++ b/gdal/port/cpl_xml_validate.cpp +@@ -920,7 +920,7 @@ static void CPLLibXMLWarningErrorCallback ( void * ctx, const char * msg, ... ) + + if( strstr(pszStr, "since this namespace was already imported") == nullptr ) + { +- xmlErrorPtr pErrorPtr = xmlGetLastError(); ++ const xmlError* pErrorPtr = xmlGetLastError(); + const char* pszFilename = static_cast(ctx); + char* pszStrDup = CPLStrdup(pszStr); + int nLen = static_cast(strlen(pszStrDup)); +-- +2.43.0 + diff --git a/gdal.spec b/gdal.spec index a2830fbdb98b49fae034586dc26622121b2b59d3..97abe1798267ac77eca2e71dd53d2013e8bd5816 100644 --- a/gdal.spec +++ b/gdal.spec @@ -30,7 +30,7 @@ Name: gdal Version: 2.3.1 -Release: 2 +Release: 3 Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -52,6 +52,7 @@ Patch2: %{name}-2.3.0-zlib.patch # https://github.com/OSGeo/gdal/pull/876 Patch3: %{name}-2.3.1-perl-build.patch Patch4: gdal_pdfsdk.patch +Patch5: fix-build-error.patch BuildRequires: gcc gcc-c++ BuildRequires: ant @@ -256,6 +257,7 @@ rm -rf frmts/gtiff/libgeotiff \ %patch2 -p1 -b .zlib~ %patch3 -p1 -b .perl-build~ %patch4 -p1 -b .gdal_pdfsdk~ +%patch5 -p1 # Sanitize linebreaks and encoding set +x @@ -738,6 +740,9 @@ popd %endif %changelog +* Thu Aug 20 2024 zhangxianting - 2.3.1-3 +- fix build error + * Fri Apr 01 2022 tanyulong - 2.3.1-2 - add config.rpath and remove jasper ,fix compile error