git: e888b7f02962 - main - textproc/luceneplusplus: unbreak build with boost-1.85

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e888b7f029628187e5839e41b2ee6b6e348854ec

commit e888b7f029628187e5839e41b2ee6b6e348854ec
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-10-02 23:47:17 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-10-03 10:24:59 +0000

    textproc/luceneplusplus: unbreak build with boost-1.85
    
    With hat:       office
    Sponsored by:   Future Crew, LLC
---
 textproc/luceneplusplus/Makefile               |  2 +-
 textproc/luceneplusplus/files/patch-boost-1.85 | 64 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/textproc/luceneplusplus/Makefile b/textproc/luceneplusplus/Makefile
index f874e46ded60..581cb5f58b3e 100644
--- a/textproc/luceneplusplus/Makefile
+++ b/textproc/luceneplusplus/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lucene++
 PORTVERSION=	3.0.8
-PORTREVISION=	7
+PORTREVISION=	8
 DISTVERSIONPREFIX=	rel_
 CATEGORIES=	textproc
 
diff --git a/textproc/luceneplusplus/files/patch-boost-1.85 b/textproc/luceneplusplus/files/patch-boost-1.85
new file mode 100644
index 000000000000..e066696de28f
--- /dev/null
+++ b/textproc/luceneplusplus/files/patch-boost-1.85
@@ -0,0 +1,64 @@
+From c18ead2b0c4aa62af01450cb12353a0baa51411f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
+Date: Wed, 27 Mar 2024 12:00:18 +0100
+Subject: [PATCH] Fix build with boost 1.85.0
+
+boost::filesystem::wpath has been deprecated (and typedef-ed to
+boost::filesystem::path) for a long time; it is removed from boost
+starting with 1.85.0-beta1.
+
+Use boost::filesystem::path instead.
+
+boost/filesystem/convenience.hpp has been removed (and was being
+included without being used anyway - its only use was indirectly
+pulling in boost/filesystem/directory.hpp, which is actually used).
+
+Include boost/filesystem/directory.hpp directly instead.
+---
+ src/core/store/MMapDirectory.cpp | 2 +-
+ src/core/util/FileUtils.cpp      | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git src/core/store/MMapDirectory.cpp src/core/store/MMapDirectory.cpp
+index beac7828..46156e3a 100644
+--- src/core/store/MMapDirectory.cpp
++++ src/core/store/MMapDirectory.cpp
+@@ -36,7 +36,7 @@ MMapIndexInput::MMapIndexInput(const String& path) {
+     bufferPosition = 0;
+     if (!path.empty()) {
+         try {
+-            file.open(boost::filesystem::wpath(path), _length);
++            file.open(boost::filesystem::path(path), _length);
+         } catch (...) {
+             boost::throw_exception(FileNotFoundException(path));
+         }
+diff --git src/core/util/FileUtils.cpp src/core/util/FileUtils.cpp
+index 51508b57..d92efbb8 100644
+--- src/core/util/FileUtils.cpp
++++ src/core/util/FileUtils.cpp
+@@ -5,9 +5,9 @@
+ /////////////////////////////////////////////////////////////////////////////
+ 
+ #include "LuceneInc.h"
+-#include <boost/filesystem/convenience.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/path.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include "LuceneThread.h"
+ #include "StringUtils.h"
+ #include "FileUtils.h"
+@@ -128,12 +128,12 @@ String joinPath(const String& path, const String& file) {
+ }
+ 
+ String extractPath(const String& path) {
+-    boost::filesystem::wpath parentPath(path.c_str());
++    boost::filesystem::path parentPath(path.c_str());
+     return parentPath.parent_path().wstring().c_str();
+ }
+ 
+ String extractFile(const String& path) {
+-    boost::filesystem::wpath fileName(path.c_str());
++    boost::filesystem::path fileName(path.c_str());
+     return fileName.filename().wstring().c_str();
+ }
+