* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/lucene++/, dev-cpp/lucene++/files/
@ 2015-11-07 11:39 Sergey Popov
0 siblings, 0 replies; 4+ messages in thread
From: Sergey Popov @ 2015-11-07 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 6f2a47bbaec096fcd4bc9b8d6a3977f026f96afa
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 11:36:38 2015 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 11:39:33 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f2a47bb
dev-cpp/lucene++: drop old version
Package-Manager: portage-2.2.24
dev-cpp/lucene++/Manifest | 1 -
.../files/lucene++-3.0.6-disable-demos.patch | 13 -------
.../files/lucene++-3.0.6-disable-tests.patch | 42 ----------------------
| 39 --------------------
dev-cpp/lucene++/lucene++-3.0.6.ebuild | 39 --------------------
5 files changed, 134 deletions(-)
diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index 611bcb3..7e1a6ec 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1,2 +1 @@
-DIST lucene++-3.0.6.tar.gz 1529066 SHA256 3e7092a4935e0d1ad5c6d7ac8f3c6ed2f53e51321237ce83744bbf02e0d61519 SHA512 c65aac4cdc92b4593a7d9996273047ff68cc097b755bacdd424266ffcf9143b491ef91123b8e78d9f1fba3d9ac39078a0c2c97c22a39f646f84a0fef0f2956ef WHIRLPOOL 7064b69214d62e05986c78fee2873222c85c2a7a4c892fcc29a5b47f0b1cb67e64789f3665dc3b8ca3628daf28e05c331a99cd0111062683e9323a6827e7ebf5
DIST lucene++-3.0.7.tar.gz 2013570 SHA256 6c19f203311e4b44a0ccf7b1127db77436eb47159ea1c54f7531a0b1ca585e0c SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220 WHIRLPOOL e5d18d6d0ac90f8b0ace161dc0457b2ca3546c211e96ac3c44dea4ba7d9bbd6bd9183016ceb2bccd8516261db0ca2dd4331701bb37e653e96df9453d6acbc878
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-demos.patch b/dev-cpp/lucene++/files/lucene++-3.0.6-disable-demos.patch
deleted file mode 100644
index ba5deca..0000000
--- a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-demos.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9217c21..d4e7b86 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -118,7 +118,7 @@ enable_testing()
-
- add_subdirectory(src/core)
- add_subdirectory(src/contrib)
--add_subdirectory(src/demo)
-+#add_subdirectory(src/demo)
- add_subdirectory(src/test)
-
- #################################
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-tests.patch b/dev-cpp/lucene++/files/lucene++-3.0.6-disable-tests.patch
deleted file mode 100644
index 1fae17e..0000000
--- a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Forwarded: https://github.com/luceneplusplus/LucenePlusPlus/pull/64
-Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Description: Disabling tests until we find a proper way for building and including gtest
- In the next release this might become possible, after commit 83356d9681fb52
- https://github.com/luceneplusplus/LucenePlusPlus/commit/83356d9681fb52a4c190d2cf033279006c1bf57d
-Last-Update: 2014-08-25
---- a/CMakeExternal.txt
-+++ b/CMakeExternal.txt
-@@ -1,5 +1,6 @@
- # Enable ExternalProject CMake module
- include(ExternalProject)
-+find_package(Subversion REQUIRED)
-
- # main directory for external projects
- set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty)
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,6 @@
- # bootstrap
- ####################################
-
--find_package(Subversion REQUIRED)
- find_package(Threads REQUIRED)
- find_package(Boost COMPONENTS
- date_time
-@@ -114,13 +113,13 @@
- ${CMAKE_CURRENT_BINARY_DIR}/include
- )
-
--include(CMakeExternal.txt)
--enable_testing()
-+#include(CMakeExternal.txt)
-+#enable_testing()
-
- add_subdirectory(src/core)
- add_subdirectory(src/contrib)
- #add_subdirectory(src/demo)
--add_subdirectory(src/test)
-+#add_subdirectory(src/test)
-
- #################################
- # install pkg-config file
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.6-fix-installing-headers.patch b/dev-cpp/lucene++/files/lucene++-3.0.6-fix-installing-headers.patch
deleted file mode 100644
index f9ccc84..0000000
--- a/dev-cpp/lucene++/files/lucene++-3.0.6-fix-installing-headers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: rezso <rezso@example.com>
-Date: Mon, 19 May 2014 09:20:40 +0100
-Subject: [PATCH] fix installing lucene++ headers in 3.0.6
-
-Origin: upstream, https://github.com/luceneplusplus/LucenePlusPlus/commit/994f03cf736229044a168835ae7387696041658f
-Description: backport upstream patch to fix missing headers install
-
-Index: lucene++-3.0.6/CMakeLists.txt
-===================================================================
---- lucene++-3.0.6.orig/CMakeLists.txt
-+++ lucene++-3.0.6/CMakeLists.txt
-@@ -139,6 +139,14 @@ if(NOT WIN32)
- DESTINATION ${LIB_DESTINATION}/pkgconfig)
- endif()
-
-+#################################
-+# install Config.h
-+#################################
-+install(
-+ FILES
-+ "${CMAKE_CURRENT_BINARY_DIR}/include/Config.h"
-+ DESTINATION include/lucene++)
-+
- ####################################
- # custom targets
- ####################################
-Index: lucene++-3.0.6/src/core/CMakeLists.txt
-===================================================================
---- lucene++-3.0.6.orig/src/core/CMakeLists.txt
-+++ lucene++-3.0.6/src/core/CMakeLists.txt
-@@ -20,7 +20,7 @@ file(GLOB_RECURSE lucene_internal_header
- )
-
- file(GLOB_RECURSE lucene_headers
-- include/*.h
-+ "${lucene++_SOURCE_DIR}/include/*.h"
- )
-
- add_definitions(-DLPP_BUILDING_LIB)
diff --git a/dev-cpp/lucene++/lucene++-3.0.6.ebuild b/dev-cpp/lucene++/lucene++-3.0.6.ebuild
deleted file mode 100644
index 702ca21..0000000
--- a/dev-cpp/lucene++/lucene++-3.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="LucenePlusPlus-rel_${PV}"
-inherit cmake-utils multilib
-
-DESCRIPTION="C++ port of Java Lucene library, a high-performance, full-featured text search engine"
-HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
-SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS README.rst )
-
-PATCHES=(
- "${FILESDIR}/${P}-disable-demos.patch"
- "${FILESDIR}/${P}-disable-tests.patch"
- "${FILESDIR}/${P}-fix-installing-headers.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_DESTINATION=$(get_libdir)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/lucene++/, dev-cpp/lucene++/files/
@ 2024-05-21 16:57 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2024-05-21 16:57 UTC (permalink / raw
To: gentoo-commits
commit: 6e2a1355dea10e09d9fb4d04320fb0913801cb89
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 16:57:07 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <fordfrog <AT> 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?= <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 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 <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();
+ }
+
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=(
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/lucene++/, dev-cpp/lucene++/files/
@ 2025-09-30 14:32 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-09-30 14:32 UTC (permalink / raw
To: gentoo-commits
commit: bbc1170fe2b7397582ccedf95dc8eeb8eed629df
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Sat Sep 27 12:55:56 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 30 14:31:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc1170f
dev-cpp/lucene++: fixes for boost-1.89, cmake4, gtest & gcc-15
Closes: https://bugs.gentoo.org/957220
Closes: https://bugs.gentoo.org/963333
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Part-of: https://github.com/gentoo/gentoo/pull/43958
Closes: https://github.com/gentoo/gentoo/pull/43958
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../lucene++/files/lucene++-3.0.9-boost-1.89.patch | 83 ++++++++++++++++++++++
dev-cpp/lucene++/files/lucene++-3.0.9-cmake4.patch | 62 ++++++++++++++++
dev-cpp/lucene++/files/lucene++-3.0.9-gcc15.patch | 32 +++++++++
.../files/lucene++-3.0.9-system-gtest.patch | 21 ++++++
dev-cpp/lucene++/lucene++-3.0.9-r1.ebuild | 53 ++++++++++++++
5 files changed, 251 insertions(+)
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.9-boost-1.89.patch b/dev-cpp/lucene++/files/lucene++-3.0.9-boost-1.89.patch
new file mode 100644
index 000000000000..6ed4f4b4a03e
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.9-boost-1.89.patch
@@ -0,0 +1,83 @@
+Bug: https://bugs.gentoo.org/963333
+
+--- LucenePlusPlus-rel_3.0.9/cmake/dependencies.cmake
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/cmake/dependencies.cmake
+@@ -7,7 +7,6 @@ find_package(Boost COMPONENTS
+ filesystem
+ iostreams
+ regex
+- system
+ thread
+ REQUIRED
+ )
+@@ -20,7 +19,6 @@ set(lucene_boost_libs
+ ${Boost_FILESYSTEM_LIBRARIES}
+ ${Boost_IOSTREAMS_LIBRARIES}
+ ${Boost_REGEX_LIBRARIES}
+- ${Boost_SYSTEM_LIBRARIES}
+ ${Boost_THREAD_LIBRARIES}
+ )
+
+--- LucenePlusPlus-rel_3.0.9/src/contrib/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/contrib/CMakeLists.txt
+@@ -67,7 +67,6 @@ target_link_libraries(lucene++-contrib
+ Boost::filesystem
+ Boost::iostreams
+ Boost::regex
+- Boost::system
+ Boost::thread
+ ZLIB::ZLIB
+ lucene++::lucene++)
+--- LucenePlusPlus-rel_3.0.9/src/core/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/core/CMakeLists.txt
+@@ -57,7 +57,6 @@ target_link_libraries(lucene++
+ Boost::filesystem
+ Boost::iostreams
+ Boost::regex
+- Boost::system
+ Boost::thread
+ ZLIB::ZLIB
+ )
+--- LucenePlusPlus-rel_3.0.9/src/demo/deletefiles/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/deletefiles/CMakeLists.txt
+@@ -38,7 +38,6 @@ target_link_libraries(deletefiles
+ Boost::filesystem
+ Boost::iostreams
+ Boost::regex
+- Boost::system
+ Boost::thread
+ ZLIB::ZLIB
+ lucene++::lucene++
+diff -rup LucenePlusPlus-rel_3.0.9/src/demo/indexfiles/CMakeLists.txt LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/indexfiles/CMakeLists.txt
+--- LucenePlusPlus-rel_3.0.9/src/demo/indexfiles/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/indexfiles/CMakeLists.txt
+@@ -39,7 +39,6 @@ target_link_libraries(indexfiles
+ Boost::filesystem
+ Boost::iostreams
+ Boost::regex
+- Boost::system
+ Boost::thread
+ ZLIB::ZLIB
+ lucene++::lucene++
+diff -rup LucenePlusPlus-rel_3.0.9/src/demo/searchfiles/CMakeLists.txt LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/searchfiles/CMakeLists.txt
+--- LucenePlusPlus-rel_3.0.9/src/demo/searchfiles/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/demo/searchfiles/CMakeLists.txt
+@@ -38,7 +38,6 @@ target_link_libraries(searchfiles
+ Boost::filesystem
+ Boost::iostreams
+ Boost::regex
+- Boost::system
+ Boost::thread
+ ZLIB::ZLIB
+ lucene++::lucene++
+diff -rup LucenePlusPlus-rel_3.0.9/src/test/CMakeLists.txt LucenePlusPlus-rel_3.0.9-boost-1.89/src/test/CMakeLists.txt
+--- LucenePlusPlus-rel_3.0.9/src/test/CMakeLists.txt
++++ LucenePlusPlus-rel_3.0.9-boost-1.89/src/test/CMakeLists.txt
+@@ -59,7 +59,6 @@ target_link_libraries(lucene++-tester
+ Boost::filesystem
+ Boost::iostreams
+ Boost::regex
+- Boost::system
+ Boost::thread
+ ZLIB::ZLIB
+ gtest_main
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.9-cmake4.patch b/dev-cpp/lucene++/files/lucene++-3.0.9-cmake4.patch
new file mode 100644
index 000000000000..4e4805fc852d
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.9-cmake4.patch
@@ -0,0 +1,62 @@
+From: https://github.com/luceneplusplus/LucenePlusPlus/pull/218
+
+From: Gianfranco Costamagna <locutusofborg@debian.org>
+Date: Mon, 8 Sep 2025 15:05:10 +0200
+Subject: [PATCH] Bump minimum required cmake version to 3.10, for new cmake 4
+ compatibility fix
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # init
+ ####################################
+
+-cmake_minimum_required(VERSION 3.5)
++cmake_minimum_required(VERSION 3.10)
+
+ project(lucene++)
+
+--- a/cmake/cotire.cmake
++++ b/cmake/cotire.cmake
+@@ -37,7 +37,7 @@ set(__COTIRE_INCLUDED TRUE)
+ if (NOT CMAKE_SCRIPT_MODE_FILE)
+ cmake_policy(PUSH)
+ endif()
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.10)
+ if (NOT CMAKE_SCRIPT_MODE_FILE)
+ cmake_policy(POP)
+ endif()
+--- a/src/test/gtest/CMakeLists.txt
++++ b/src/test/gtest/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Note: CMake support is community-based. The maintainers do not use CMake
+ # internally.
+
+-cmake_minimum_required(VERSION 2.8.8)
++cmake_minimum_required(VERSION 3.10)
+
+ if (POLICY CMP0048)
+ cmake_policy(SET CMP0048 NEW)
+--- a/src/test/gtest/googlemock/CMakeLists.txt
++++ b/src/test/gtest/googlemock/CMakeLists.txt
+@@ -42,7 +42,7 @@ else()
+ cmake_policy(SET CMP0048 NEW)
+ project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
+ endif()
+-cmake_minimum_required(VERSION 2.6.4)
++cmake_minimum_required(VERSION 3.10)
+
+ if (COMMAND set_up_hermetic_build)
+ set_up_hermetic_build()
+--- a/src/test/gtest/googletest/CMakeLists.txt
++++ b/src/test/gtest/googletest/CMakeLists.txt
+@@ -53,7 +53,7 @@ else()
+ cmake_policy(SET CMP0048 NEW)
+ project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
+ endif()
+-cmake_minimum_required(VERSION 2.6.4)
++cmake_minimum_required(VERSION 3.10)
+
+ if (POLICY CMP0063) # Visibility
+ cmake_policy(SET CMP0063 NEW)
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.9-gcc15.patch b/dev-cpp/lucene++/files/lucene++-3.0.9-gcc15.patch
new file mode 100644
index 000000000000..44d935e8eb14
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.9-gcc15.patch
@@ -0,0 +1,32 @@
+From: https://github.com/luceneplusplus/LucenePlusPlus/pull/218
+
+From: Gianfranco Costamagna <locutusofborg@debian.org>
+Date: Mon, 8 Sep 2025 15:05:58 +0200
+Subject: [PATCH] Bump minimum std-version to 17, fixing FTBFS with new gcc-15
+ and googletest
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,7 +47,7 @@ include(dependencies)
+ include(Lucene++Docs)
+
+ # Enable C++11
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+ ####################################
+--- a/src/test/gtest/CMakeLists.txt
++++ b/src/test/gtest/CMakeLists.txt
+@@ -11,9 +11,9 @@ project(googletest-distribution)
+ set(GOOGLETEST_VERSION 1.10.0)
+
+ if (CMAKE_VERSION VERSION_LESS "3.1")
+- add_definitions(-std=c++11)
++ add_definitions(-std=c++17)
+ else()
+- set(CMAKE_CXX_STANDARD 11)
++ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ if(NOT CYGWIN)
+ set(CMAKE_CXX_EXTENSIONS OFF)
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.9-system-gtest.patch b/dev-cpp/lucene++/files/lucene++-3.0.9-system-gtest.patch
new file mode 100644
index 000000000000..11469a2c60fb
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.9-system-gtest.patch
@@ -0,0 +1,21 @@
+From: https://github.com/luceneplusplus/LucenePlusPlus/pull/218
+
+From: Gianfranco Costamagna <locutusofborg@debian.org>
+Date: Mon, 8 Sep 2025 15:05:34 +0200
+Subject: [PATCH] Find and use system googletest if available
+
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -8,8 +8,10 @@ if(MSVC)
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+ endif()
+
+-add_subdirectory(gtest)
+-
++find_package(GTest)
++if(NOT GTEST_FOUND)
++ add_subdirectory(gtest)
++endif()
+
+ ####################################
+ # src
diff --git a/dev-cpp/lucene++/lucene++-3.0.9-r1.ebuild b/dev-cpp/lucene++/lucene++-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..14b3fda60ca6
--- /dev/null
+++ b/dev-cpp/lucene++/lucene++-3.0.9-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="LucenePlusPlus-rel_${PV}"
+inherit edo cmake flag-o-matic
+
+DESCRIPTION="C++ port of Lucene library, a high-performance, full-featured text search engine"
+HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
+SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( LGPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/boost:=[zlib]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.7-boost-1.85.patch"
+ "${FILESDIR}/${PN}-3.0.9-boost-1.87.patch"
+ "${FILESDIR}/${PN}-3.0.9-pkgconfig.patch"
+ "${FILESDIR}/${PN}-3.0.9-tests-gtest-cstdint.patch"
+ "${FILESDIR}/${PN}-3.0.9-cmake4.patch"
+ "${FILESDIR}/${PN}-3.0.9-system-gtest.patch"
+ "${FILESDIR}/${PN}-3.0.9-gcc15.patch"
+ "${FILESDIR}/${PN}-3.0.9-boost-1.89.patch"
+)
+
+src_configure() {
+ # Can't be tested with LTO because of ODR issues in test mocks
+ filter-lto
+
+ local mycmakeargs=(
+ -DENABLE_DEMO=OFF
+ -DENABLE_TEST=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ edo "${BUILD_DIR}"/src/test/lucene++-tester \
+ --test_dir="${S}"/src/test/testfiles \
+ --gtest_filter="-ParallelMultiSearcherTest*:SortTest.*:"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/lucene++/, dev-cpp/lucene++/files/
@ 2025-09-30 14:32 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-09-30 14:32 UTC (permalink / raw
To: gentoo-commits
commit: ac25d15d85f470a448b07b3d1049d9549ba01aa6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 29 19:52:57 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 30 14:31:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac25d15d
dev-cpp/lucene++: drop 3.0.7-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-cpp/lucene++/Manifest | 1 -
.../lucene++/files/lucene++-3.0.7-boost-1.58.patch | 37 ---------------------
dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild | 38 ----------------------
3 files changed, 76 deletions(-)
diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index 3b24633ebe78..2cb8154eec92 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1,2 +1 @@
-DIST lucene++-3.0.7.tar.gz 2013570 BLAKE2B 26abb1a2fa2a24d7240505f11639c078744313541b4993ed84e4d0129fda74346e841f0c4c7552e58a15dd492af9ffd33ea66866c8e6810cd41e5d675833ce79 SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220
DIST lucene++-3.0.9.tar.gz 2458287 BLAKE2B cbc6c32bd23525ad53fbcf500628f1806496d7f0575ee33baf0bc189d2ea5710334d07b23869e9b3b205bfa229400bc09c108ba6919e2b83bf0c6259e0a88564 SHA512 220fe1b46518018d176ae16434f03b1453fc345d8d552a294d1af927ea4ab69a83ee4b03c82938e648edaa3e7064526ca047fc86e1c71743b0958b520d59e225
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch
deleted file mode 100644
index 9ff33fd03005..000000000000
--- a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 1987082cf9278a639d772b4f35a8ae2d34944177
-Author: Václav Slavík <vaclav@slavik.io>
-Date: Mon May 4 18:04:46 2015 +0200
-
- Fix compilation with Boost 1.58
-
- 1.58 introduces strict type checking in boost::get() and while that's
- good in theory, the VariantUtils code makes it impractical to use.
- Instead, use relaxed_get() to get the old behavior. relaxed_get() didn't
- exist in older versions of Boost, so the code must check BOOST_VERSION.
-
- Fixes #93.
-
-diff --git a/include/VariantUtils.h b/include/VariantUtils.h
-index 1e6c243..5a72e59 100644
---- a/include/VariantUtils.h
-+++ b/include/VariantUtils.h
-@@ -8,6 +8,7 @@
- #define VARIANTUTILS_H
-
- #include <boost/any.hpp>
-+#include <boost/version.hpp>
- #include "Lucene.h"
- #include "MiscUtils.h"
-
-@@ -22,7 +23,11 @@ public:
-
- template <typename TYPE, typename VAR>
- static TYPE get(VAR var) {
-+#if BOOST_VERSION < 105800
- return var.type() == typeid(TYPE) ? boost::get<TYPE>(var) : TYPE();
-+#else
-+ return var.type() == typeid(TYPE) ? boost::relaxed_get<TYPE>(var) : TYPE();
-+#endif
- }
-
- template <typename TYPE, typename VAR>
diff --git a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild b/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild
deleted file mode 100644
index c62a0aa44ca0..000000000000
--- a/dev-cpp/lucene++/lucene++-3.0.7-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="LucenePlusPlus-rel_${PV}"
-inherit cmake
-
-DESCRIPTION="C++ port of Lucene library, a high-performance, full-featured text search engine"
-HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
-SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( LGPL-3 Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~loong ppc ppc64 ~sparc x86"
-IUSE="debug"
-
-RESTRICT="test"
-
-DEPEND="dev-libs/boost:=[zlib]"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS README.rst )
-
-PATCHES=(
- "${FILESDIR}/${P}-boost-1.58.patch"
- "${FILESDIR}/${P}-boost-1.85.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DEMO=OFF
- -DENABLE_TEST=OFF
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-09-30 14:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-30 14:32 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/lucene++/, dev-cpp/lucene++/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-09-30 14:32 Andreas Sturmlechner
2024-05-21 16:57 Miroslav Šulc
2015-11-07 11:39 Sergey Popov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox