From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B56A1581D3 for ; Tue, 21 May 2024 16:57:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C117E2A8D; Tue, 21 May 2024 16:57:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F377E2A8D for ; Tue, 21 May 2024 16:57:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC6DF335C2E for ; Tue, 21 May 2024 16:57:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 255D41AF2 for ; Tue, 21 May 2024 16:57:35 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1716310627.6e2a1355dea10e09d9fb4d04320fb0913801cb89.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/lucene++/, dev-cpp/lucene++/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.85.patch dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild X-VCS-Directories: dev-cpp/lucene++/files/ dev-cpp/lucene++/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 6e2a1355dea10e09d9fb4d04320fb0913801cb89 X-VCS-Branch: master Date: Tue, 21 May 2024 16:57:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 81e06aa8-9a08-43b6-b498-bc5f447f2440 X-Archives-Hash: 48bce15922854854b5ef879646d1c642 commit: 6e2a1355dea10e09d9fb4d04320fb0913801cb89 Author: Miroslav Šulc gentoo org> AuthorDate: Tue May 21 16:57:07 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue May 21 16:57:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2a1355 dev-cpp/lucene++: fixed compilation with boost 1.85 Closes: https://bugs.gentoo.org/932253 Signed-off-by: Miroslav Šulc gentoo.org> .../lucene++/files/lucene++-3.0.7-boost-1.85.patch | 64 ++++++++++++++++++++++ dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild | 7 ++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.85.patch b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.85.patch new file mode 100644 index 000000000000..05babf97a08d --- /dev/null +++ b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.85.patch @@ -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 a/src/core/store/MMapDirectory.cpp b/src/core/store/MMapDirectory.cpp +index beac7828..46156e3a 100644 +--- a/src/core/store/MMapDirectory.cpp ++++ b/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 a/src/core/util/FileUtils.cpp b/src/core/util/FileUtils.cpp +index 51508b57..d92efbb8 100644 +--- a/src/core/util/FileUtils.cpp ++++ b/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(); + } + diff --git a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild b/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild index 025c5aad888e..29cd859016d7 100644 --- a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild +++ b/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,10 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS README.rst ) -PATCHES=( "${FILESDIR}/${P}-boost-1.58.patch" ) +PATCHES=( + "${FILESDIR}/${P}-boost-1.58.patch" + "${FILESDIR}/${P}-boost-1.85.patch" +) src_configure() { local mycmakeargs=(