[packages/gdal] - patched for currnet libxml2, force python2 for now; release 22

[qboosh]

commit 3a102d1f4915e753ebabc7a4303d2c13914ea027
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date:   Wed Jun 19 22:31:15 2024 +0200

    - patched for currnet libxml2, force python2 for now; release 22

 gdal-libxml2.patch | 22 ++++++++++++++++++++++
 gdal.spec          |  5 ++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/gdal.spec b/gdal.spec
index b60a35f..2d26cf1 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -53,7 +53,7 @@ Summary:      Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni 
Ziemi
 Name:          gdal
 Version:       3.0.4
-Release:       21
+Release:       22
 License:       BSD-like
 Group:         Libraries
 Source0:       
https://github.com/OSGeo/gdal/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -69,6 +69,7 @@ Patch7:               decl.patch
 Patch8:                %{name}_tirpcinc.patch
 Patch9:                jasper.patch
 Patch10:       gcc11.patch
+Patch11:       %{name}-libxml2.patch
 URL:           http://www.gdal.org/
 # 1.x or 2.x supported
 BuildRequires: CharLS-devel
@@ -285,6 +286,7 @@ Moduł Pythona GDAL.
 %patch8 -p1
 %patch9 -p2
 %patch10 -p2
+%patch11 -p1
 
 # need to regenerate (old ones don't support perl 5.10)
 %{__rm} swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
@@ -359,6 +361,7 @@ done
 %{__autoconf}
 %{__autoheader}
 %configure \
+       PYTHON=%{__python} \
        --includedir=%{_includedir}/gdal \
        --datadir=%{_datadir}/gdal \
        --with-dods-root=/usr \
diff --git a/gdal-libxml2.patch b/gdal-libxml2.patch
new file mode 100644
index 0000000..8c22f63
--- /dev/null
+++ b/gdal-libxml2.patch
@@ -0,0 +1,22 @@
+--- gdal-3.0.4/port/cpl_xml_validate.cpp.orig  2020-01-28 11:18:54.000000000 
+0100
++++ gdal-3.0.4/port/cpl_xml_validate.cpp       2024-06-19 06:20:46.477418699 
+0200
+@@ -920,7 +920,7 @@ static void CPLLibXMLWarningErrorCallbac
+ 
+     if( strstr(pszStr, "since this namespace was already imported") == 
nullptr )
+     {
+-        xmlErrorPtr pErrorPtr = xmlGetLastError();
++        const xmlError* pErrorPtr = xmlGetLastError();
+         const char* pszFilename = static_cast<char *>(ctx);
+         char* pszStrDup = CPLStrdup(pszStr);
+         int nLen = static_cast<int>(strlen(pszStrDup));
+--- gdal-3.0.4/gcore/gdaljp2metadatagenerator.cpp.orig 2020-01-28 
11:18:45.000000000 +0100
++++ gdal-3.0.4/gcore/gdaljp2metadatagenerator.cpp      2024-06-19 
06:20:34.962346526 +0200
+@@ -335,7 +335,7 @@ static CPLString GDALGMLJP2EvalExpr(cons
+ /************************************************************************/
+ 
+ static void GDALGMLJP2XPathErrorHandler( void * /* userData */,
+-                                         xmlErrorPtr error)
++                                         const xmlError *error)
+ {
+     if( error->domain == XML_FROM_XPATH &&
+         error->str1 != nullptr &&
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdal.git/commitdiff/3a102d1f4915e753ebabc7a4303d2c13914ea027

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit