From nobody Thu Oct 3 10:27:35 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XK7Cq639Dz5Y6Pj; Thu, 03 Oct 2024 10:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XK7Cq35xhz4D2P; Thu, 3 Oct 2024 10:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a0/X2xgaca5c7MPK3lvk6BY5AS3pzh+jlUfNrxXiOsI=; b=KCoieo6Cu4Axi3WiaBD5wdz/WJbQqNOyMkks0GvHd1CBtRb+JojPO3Sbj0NhdMPUw7k3jC CU5oU1jclJscz+Zig8FPS9Bf/q3ZIhacL10tXGH8Ao3bWQnX6PpDOilBR0WLySwxvbLbSS Xx2+pN430ZesrAC4CqhIovUewZNYdEFNN/CkOGc3ZgLk11BkqOQFoTeB6YuuEAMgsrYIns bgDWTeU1yystQwKSxTFNw5GUMGMgaG28uG5tApP2GwKqKbHHSC7zQrWoQ2KnvbQGAI4Hy2 wzeZW/nCnCiuwO2/jApl781w4jmxlxQUo7k0cUwWWtdTXyDoVQLGGuxdd0FGRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a0/X2xgaca5c7MPK3lvk6BY5AS3pzh+jlUfNrxXiOsI=; b=Bv2BxJc6nKckWRdnbDQQJZYX75xg3mda2Nu1h4tR0rXxjozIjLUFa7BTJV6rmFbICusXk/ x2jIjQ5Bj9EXbU0wg1eHr80XVppEL+DMYJ+Y2rQzD7DZLWnzO6R9dFBDBtGhmxqmoHt35J 5YXUddwV9kTHMVWx57t/MdcE2eWNGyJFjE6vcFu6amXomh+TEcvl5r+0RO/vA+0hwhZuYC 4Nlt/dWO+ygIHQ87o6znt7a9ruOthBvJ1erGrYR6rgwKJpOrt5gT4yK19rvAeX/t89UwqD eU+/AVnlv5whUpr0CvDp2GHzJdJTNnXBhnHJtVrpvp5FJ+kSePvN2W4VIqVs5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727951255; a=rsa-sha256; cv=none; b=ATrIV0QA1/TjIDcfsAjbvD0cOUr3YCZPaU8plqUGadvkOTMdlLbaL7zy7pOZzmmAd3zaU5 wjr1FaxAZShbUyIR+RU6W6dXAfuyiX39CALhTlTnAzwKpdGvy1+Ali1dRhA9HAjpSalNfC r/yXmQIapPnP4yUpU6fZ+GNnqxpTQDvTpP1udyw9bLzKAlZBL5CFIX1h5CK3niWJsAQW78 1BFuli4E0rGXpokmWa8maUVBUboIJ2rfixte9aQS38zhz/xaWm9ZhXY6qU+FaeZBRxiPwg LgJUd/8ud1aG9l5GYo2F0RVwfK4isarVxwMhDtw1N0R2KTeu1jT2EkfVYm0DaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XK7Cq2jrNzmQF; Thu, 3 Oct 2024 10:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493ARZF7042323; Thu, 3 Oct 2024 10:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493ARZsF042320; Thu, 3 Oct 2024 10:27:35 GMT (envelope-from git) Date: Thu, 3 Oct 2024 10:27:35 GMT Message-Id: <202410031027.493ARZsF042320@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: e888b7f02962 - main - textproc/luceneplusplus: unbreak build with boost-1.85 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e888b7f029628187e5839e41b2ee6b6e348854ec Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e888b7f029628187e5839e41b2ee6b6e348854ec commit e888b7f029628187e5839e41b2ee6b6e348854ec Author: Dima Panov AuthorDate: 2024-10-02 23:47:17 +0000 Commit: Dima Panov 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?= +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 + #include + #include ++#include + #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(); + } +