summaryrefslogtreecommitdiff
path: root/dev-cpp/lucene++/files
diff options
context:
space:
mode:
authorHolger Hoffstätte <holger@applied-asynchrony.com>2025-09-27 14:55:56 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2025-09-30 16:31:50 +0200
commitbbc1170fe2b7397582ccedf95dc8eeb8eed629df (patch)
tree10f7b7a91ce29b7ac050ca3ef06294d3f17d72dd /dev-cpp/lucene++/files
parent8d86cea08244dab3d45172137f674cdc087a6868 (diff)
downloadgentoo-bbc1170fe2b7397582ccedf95dc8eeb8eed629df.tar.gz
gentoo-bbc1170fe2b7397582ccedf95dc8eeb8eed629df.tar.bz2
gentoo-bbc1170fe2b7397582ccedf95dc8eeb8eed629df.zip
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@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@gentoo.org>
Diffstat (limited to 'dev-cpp/lucene++/files')
-rw-r--r--dev-cpp/lucene++/files/lucene++-3.0.9-boost-1.89.patch83
-rw-r--r--dev-cpp/lucene++/files/lucene++-3.0.9-cmake4.patch62
-rw-r--r--dev-cpp/lucene++/files/lucene++-3.0.9-gcc15.patch32
-rw-r--r--dev-cpp/lucene++/files/lucene++-3.0.9-system-gtest.patch21
4 files changed, 198 insertions, 0 deletions
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