diff --git a/0001-Fix-compilation-errors-with-libxml2-2.12.patch b/0001-Fix-compilation-errors-with-libxml2-2.12.patch new file mode 100644 index 0000000..8759b40 --- /dev/null +++ b/0001-Fix-compilation-errors-with-libxml2-2.12.patch @@ -0,0 +1,50 @@ +From 2cea5a12a35b396800296cb1c3ea08eb00b29760 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 18 Nov 2023 22:13:46 +0100 +Subject: [PATCH] Fix compilation errors with libxml2 2.12 + +--- + mapows.c | 2 +- + mapwcs.cpp | 2 +- + mapwcs20.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +Index: mapserver-8.0.1/mapows.c +=================================================================== +--- mapserver-8.0.1.orig/mapows.c ++++ mapserver-8.0.1/mapows.c +@@ -168,7 +168,7 @@ static int msOWSPreParseRequest(cgiReque + #endif + if (ows_request->document == NULL + || (root = xmlDocGetRootElement(ows_request->document)) == NULL) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + msSetError(MS_OWSERR, "XML parsing error: %s", + "msOWSPreParseRequest()", error->message); + return MS_FAILURE; +Index: mapserver-8.0.1/mapwcs.cpp +=================================================================== +--- mapserver-8.0.1.orig/mapwcs.cpp ++++ mapserver-8.0.1/mapwcs.cpp +@@ -362,7 +362,7 @@ static int msWCSParseRequest(cgiRequestO + /* parse to DOM-Structure and get root element */ + if((doc = xmlParseMemory(request->postrequest, strlen(request->postrequest))) + == NULL) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + msSetError(MS_WCSERR, "XML parsing error: %s", + "msWCSParseRequest()", error->message); + return MS_FAILURE; +Index: mapserver-8.0.1/mapwcs20.cpp +=================================================================== +--- mapserver-8.0.1.orig/mapwcs20.cpp ++++ mapserver-8.0.1/mapwcs20.cpp +@@ -1446,7 +1446,7 @@ int msWCSParseRequest20(mapObj *map, + + /* parse to DOM-Structure and get root element */ + if(doc == NULL) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + msSetError(MS_WCSERR, "XML parsing error: %s", + "msWCSParseRequest20()", error->message); + return MS_FAILURE; diff --git a/mapserver.changes b/mapserver.changes index c6ce702..c7e96e0 100644 --- a/mapserver.changes +++ b/mapserver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 19 20:30:15 UTC 2024 - Jan Engelhardt + +- Add 0001-Fix-compilation-errors-with-libxml2-2.12.patch + ------------------------------------------------------------------- Fri Mar 1 07:34:53 UTC 2024 - Dominique Leuenberger diff --git a/mapserver.spec b/mapserver.spec index 58f2588..ebb3666 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -40,6 +40,7 @@ Group: Productivity/Networking/Web/Servers URL: https://www.mapserver.org/ Source: https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz Source9: %{name}-rpmlintrc +Patch1: 0001-Fix-compilation-errors-with-libxml2-2.12.patch BuildRequires: FastCGI-devel BuildRequires: apache2-devel BuildRequires: autoconf