CVS commit: pkgsrc/geography/gdal-lib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb  1 07:31:50 UTC 2024

Modified Files:
        pkgsrc/geography/gdal-lib: distinfo
Added Files:
        pkgsrc/geography/gdal-lib/patches:
            patch-gcore_gdaljp2metadatagenerator.cpp
            patch-port_cpl__xml__validate.cpp

Log Message:
gdal-lib: fix build with libxml2 2.12.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/geography/gdal-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/gdal-lib/patches/patch-gcore_gdaljp2metadatagenerator.cpp \
    pkgsrc/geography/gdal-lib/patches/patch-port_cpl__xml__validate.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gdal-lib/distinfo
diff -u pkgsrc/geography/gdal-lib/distinfo:1.61 pkgsrc/geography/gdal-lib/distinfo:1.62
--- pkgsrc/geography/gdal-lib/distinfo:1.61     Sun Aug 27 10:59:59 2023
+++ pkgsrc/geography/gdal-lib/distinfo  Thu Feb  1 07:31:50 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2023/08/27 10:59:59 tnn Exp $
+$NetBSD: distinfo,v 1.62 2024/02/01 07:31:50 wiz Exp $
 
 BLAKE2s (gdal-3.5.3.tar.xz) = a9932da1b8d17bc4b37ebe8e74b23eccc6a0ce4810f976587e9617735dffcd4d
 SHA512 (gdal-3.5.3.tar.xz) = b7bac9dd568e9db49d1fa5be8cd48df37f37196b0cacce44f738a981f0c43a77b5750312cd0c3385fdd881a6b525a5ceac56bcd08284d76071bd508d01781f49
@@ -6,3 +6,5 @@ Size (gdal-3.5.3.tar.xz) = 9504740 bytes
 SHA1 (patch-configure) = 86eae1d146161752ba9468d0aca7f2bb7f3b121b
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
 SHA1 (patch-frmts_mrf_LERCV1_Lerc1Image.cpp) = 87bf6e873a0565e8d79700039700a4289cf7c8fa
+SHA1 (patch-gcore_gdaljp2metadatagenerator.cpp) = a6552d7d98059354c1bf2fca87319c561ed5b570
+SHA1 (patch-port_cpl__xml__validate.cpp) = 5e0c1838cb3daa100fe5bdc89b8f193f766a0c93

Added files:

Index: pkgsrc/geography/gdal-lib/patches/patch-gcore_gdaljp2metadatagenerator.cpp
diff -u /dev/null pkgsrc/geography/gdal-lib/patches/patch-gcore_gdaljp2metadatagenerator.cpp:1.1
--- /dev/null   Thu Feb  1 07:31:50 2024
+++ pkgsrc/geography/gdal-lib/patches/patch-gcore_gdaljp2metadatagenerator.cpp  Thu Feb  1 07:31:50 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-gcore_gdaljp2metadatagenerator.cpp,v 1.1 2024/02/01 07:31:50 wiz Exp $
+
+Fix build with libxml 2.
+https://github.com/OSGeo/gdal/commit/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa
+
+--- gcore/gdaljp2metadatagenerator.cpp.orig    2024-02-01 07:27:50.221341841 +0000
++++ gcore/gdaljp2metadatagenerator.cpp
+@@ -355,7 +355,7 @@ static CPLString GDALGMLJP2EvalExpr(cons
+ /************************************************************************/
+ 
+ static void GDALGMLJP2XPathErrorHandler( void * /* userData */,
+-                                         xmlErrorPtr error)
++                                         const xmlError *error)
+ {
+     if( error->domain == XML_FROM_XPATH &&
+         error->str1 != nullptr &&
Index: pkgsrc/geography/gdal-lib/patches/patch-port_cpl__xml__validate.cpp
diff -u /dev/null pkgsrc/geography/gdal-lib/patches/patch-port_cpl__xml__validate.cpp:1.1
--- /dev/null   Thu Feb  1 07:31:50 2024
+++ pkgsrc/geography/gdal-lib/patches/patch-port_cpl__xml__validate.cpp Thu Feb  1 07:31:50 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-port_cpl__xml__validate.cpp,v 1.1 2024/02/01 07:31:50 wiz Exp $
+
+Fix build with libxml 2.
+https://github.com/OSGeo/gdal/commit/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa
+
+--- port/cpl_xml_validate.cpp.orig     2024-02-01 07:23:14.995841703 +0000
++++ port/cpl_xml_validate.cpp
+@@ -928,7 +928,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));