git: edb227697be5 - 2025Q3 - deskutils/recoll: unbreak with new libxml2 API
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 15 Jul 2025 20:47:33 UTC
The branch 2025Q3 has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=edb227697be5c91cf14f80d3abe11fb6ed1a4d4a
commit edb227697be5c91cf14f80d3abe11fb6ed1a4d4a
Author: George Mitchell <george@m5p.com>
AuthorDate: 2025-06-07 20:33:00 +0000
Commit: Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-07-15 19:32:00 +0000
deskutils/recoll: unbreak with new libxml2 API
which broke because the newer libxml2 error reporting callbacks
now want functions that take const-qualified pointers.
PR: 279960
Approved by: danfe@ (maintainer timeout, 38 days)
Approved by: portmgr@ (just-fix-it blanket approval)
MFH: 2025Q3
Not bumping PORTREVISION this only fixes the build,
and we have one more fix coming up.
(cherry picked from commit bf9552bffcb829ef3dc744be527f2b579251e419)
---
deskutils/recoll/files/patch-internfile_mh__xslt.cpp | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/deskutils/recoll/files/patch-internfile_mh__xslt.cpp b/deskutils/recoll/files/patch-internfile_mh__xslt.cpp
new file mode 100644
index 000000000000..48356e932aa7
--- /dev/null
+++ b/deskutils/recoll/files/patch-internfile_mh__xslt.cpp
@@ -0,0 +1,20 @@
+--- internfile/mh_xslt.cpp.orig 2022-01-14 09:19:06 UTC
++++ internfile/mh_xslt.cpp
+@@ -65,7 +65,7 @@ class FileScanXML : public FileScanDo { (public)
+ xmlDocPtr getDoc() {
+ int ret;
+ if ((ret = xmlParseChunk(ctxt, nullptr, 0, 1))) {
+- xmlError *error = xmlGetLastError();
++ const xmlError *error = xmlGetLastError();
+ LOGERR("FileScanXML: final xmlParseChunk failed with error " <<
+ ret << " error: " <<
+ (error ? error->message :
+@@ -94,7 +94,7 @@ class FileScanXML : public FileScanDo { (public)
+ }
+ int ret;
+ if ((ret = xmlParseChunk(ctxt, buf, cnt, 0))) {
+- xmlError *error = xmlGetLastError();
++ const xmlError *error = xmlGetLastError();
+ LOGERR("FileScanXML: xmlParseChunk failed with error " <<
+ ret << " for [" << buf << "] error " <<
+ (error ? error->message :