Loading pkgs/servers/geospatial/mapserver/default.nix +5 −0 Original line number Diff line number Diff line Loading @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-fAf4kOe/6bQW0i46+EZbD/6iWI2Bjkn2no6XeR/+mg4="; }; patches = [ # drop this patch for version 8.0.2 ./fix-build-w-libxml2-12.patch ]; nativeBuildInputs = [ cmake pkg-config Loading pkgs/servers/geospatial/mapserver/fix-build-w-libxml2-12.patch 0 → 100644 +39 −0 Original line number Diff line number Diff line diff --git a/mapows.c b/mapows.c index f141a7b..5a94ecb 100644 --- a/mapows.c +++ b/mapows.c @@ -168,7 +168,7 @@ static int msOWSPreParseRequest(cgiRequestObj *request, #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; diff --git a/mapwcs.cpp b/mapwcs.cpp index 70e63b8..19afa79 100644 --- a/mapwcs.cpp +++ b/mapwcs.cpp @@ -362,7 +362,7 @@ static int msWCSParseRequest(cgiRequestObj *request, wcsParamsObj *params, mapOb /* 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; diff --git a/mapwcs20.cpp b/mapwcs20.cpp index b35e803..2431bdc 100644 --- a/mapwcs20.cpp +++ b/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; Loading
pkgs/servers/geospatial/mapserver/default.nix +5 −0 Original line number Diff line number Diff line Loading @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-fAf4kOe/6bQW0i46+EZbD/6iWI2Bjkn2no6XeR/+mg4="; }; patches = [ # drop this patch for version 8.0.2 ./fix-build-w-libxml2-12.patch ]; nativeBuildInputs = [ cmake pkg-config Loading
pkgs/servers/geospatial/mapserver/fix-build-w-libxml2-12.patch 0 → 100644 +39 −0 Original line number Diff line number Diff line diff --git a/mapows.c b/mapows.c index f141a7b..5a94ecb 100644 --- a/mapows.c +++ b/mapows.c @@ -168,7 +168,7 @@ static int msOWSPreParseRequest(cgiRequestObj *request, #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; diff --git a/mapwcs.cpp b/mapwcs.cpp index 70e63b8..19afa79 100644 --- a/mapwcs.cpp +++ b/mapwcs.cpp @@ -362,7 +362,7 @@ static int msWCSParseRequest(cgiRequestObj *request, wcsParamsObj *params, mapOb /* 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; diff --git a/mapwcs20.cpp b/mapwcs20.cpp index b35e803..2431bdc 100644 --- a/mapwcs20.cpp +++ b/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;