From 5f8c38f408a4c80b7008ad32c3e41440b8b58c3eac672db1856c8892b387a22e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 28 Mar 2025 16:27:12 +0000 Subject: [PATCH 1/2] - Add lucene++-3.0.9-migrate-to-boost-asio-io_context.patch * fix with boost 1.87 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/lucene++?expand=0&rev=22 --- .gitattributes | 23 +++ .gitignore | 1 + lucene++-3.0.8-fix-cmake-issues.patch | 147 ++++++++++++++++++ lucene++-3.0.8-fix-contrib-soname.patch | 24 +++ lucene++-3.0.8-fix-missing-headers.patch | 33 ++++ lucene++-3.0.8-fix-pc-libdir.patch | 49 ++++++ lucene++-3.0.8.tar.gz | 3 + lucene++-3.0.9-fix-boost1.85.patch | 67 ++++++++ ...0.9-migrate-to-boost-asio-io_context.patch | 78 ++++++++++ lucene++.changes | 89 +++++++++++ lucene++.spec | 108 +++++++++++++ 11 files changed, 622 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 lucene++-3.0.8-fix-cmake-issues.patch create mode 100644 lucene++-3.0.8-fix-contrib-soname.patch create mode 100644 lucene++-3.0.8-fix-missing-headers.patch create mode 100644 lucene++-3.0.8-fix-pc-libdir.patch create mode 100644 lucene++-3.0.8.tar.gz create mode 100644 lucene++-3.0.9-fix-boost1.85.patch create mode 100644 lucene++-3.0.9-migrate-to-boost-asio-io_context.patch create mode 100644 lucene++.changes create mode 100644 lucene++.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/lucene++-3.0.8-fix-cmake-issues.patch b/lucene++-3.0.8-fix-cmake-issues.patch new file mode 100644 index 0000000..29f2b06 --- /dev/null +++ b/lucene++-3.0.8-fix-cmake-issues.patch @@ -0,0 +1,147 @@ +From 1cd2509ed74ae47965006d16de3c09db029b4efe Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Mon, 4 Jan 2021 23:45:13 +0100 +Subject: [PATCH] Fix various cmake issues: "CMAKE_INSTALL_FULL_LIBDIR" not + being correctly evaluated and used pkgconfig directory wrongly set to include + instead of lib cmake directory wrongly set to include instead of lib + core_libname contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR + PACKAGE_CMAKE_INSTALL_LIBDIR variables not being substituted to cmake.in + files cmake helpers not being correctly set + +--- + CMakeLists.txt | 2 +- + src/config/CMakeLists.txt | 12 ++++++------ + src/config/contrib/CMakeLists.txt | 7 ++++--- + .../contrib/liblucene++-contribConfig.cmake.in | 6 +++--- + src/config/core/CMakeLists.txt | 7 ++++--- + src/config/core/liblucene++Config.cmake.in | 6 +++--- + 6 files changed, 21 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 41de688b..71dbbd56 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) + endif() + + set(LIB_DESTINATION +- "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Define lib output directory name") ++ "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Define lib output directory name") + + + #################################### +diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt +index e5e66240..fe8e8b89 100644 +--- a/src/config/CMakeLists.txt ++++ b/src/config/CMakeLists.txt +@@ -1,16 +1,16 @@ + #################################### + # Set config vars + #################################### +-set(core_libname, "lucene++") +-set(contrib_libname, "lucene++-contrib") ++set(core_libname "lucene++") ++set(contrib_libname "lucene++-contrib") + + set( +- PACKAGE_CMAKE_INSTALL_INCLUDEDIR, +- "${lucene++_INCLUDE_DIR}/lucene++/") ++ PACKAGE_CMAKE_INSTALL_INCLUDEDIR ++ "${CMAKE_INSTALL_INCLUDEDIR}/lucene++/") + + set( +- PACKAGE_CMAKE_INSTALL_LIBDIR, +- "${LIB_INSTALL_DIR}/cmake") ++ PACKAGE_CMAKE_INSTALL_LIBDIR ++ "${LIB_DESTINATION}") + + + #################################### +diff --git a/src/config/contrib/CMakeLists.txt b/src/config/contrib/CMakeLists.txt +index c0dd86fc..b4a4391c 100644 +--- a/src/config/contrib/CMakeLists.txt ++++ b/src/config/contrib/CMakeLists.txt +@@ -9,7 +9,7 @@ if(NOT WIN32) + install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc" +- DESTINATION "include/pkgconfig") ++ DESTINATION "${LIB_DESTINATION}/pkgconfig") + endif() + + +@@ -19,7 +19,8 @@ endif() + configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++-contribConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake" +- INSTALL_DESTINATION "${LIB_DESTINATION}/cmake") ++ INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib" ++ PATH_VARS contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR) + + write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake" +@@ -30,4 +31,4 @@ install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake" +- DESTINATION "include/cmake") ++ DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib") +diff --git a/src/config/contrib/liblucene++-contribConfig.cmake.in b/src/config/contrib/liblucene++-contribConfig.cmake.in +index f92f6830..85fdfd2e 100644 +--- a/src/config/contrib/liblucene++-contribConfig.cmake.in ++++ b/src/config/contrib/liblucene++-contribConfig.cmake.in +@@ -20,6 +20,6 @@ if (NOT DEFINED set_and_check) + endif() + + +-set_and_check(liblucene++-contrib_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@contrib_libname@") +-set_and_check(liblucene++-contrib_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") +-set(liblucene++-contrib_LIBRARIES "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@contrib_libname@") ++set_and_check(liblucene++-contrib_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") ++set_and_check(liblucene++-contrib_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@") ++set(liblucene++-contrib_LIBRARIES "@contrib_libname@") +diff --git a/src/config/core/CMakeLists.txt b/src/config/core/CMakeLists.txt +index a3eb17a1..65376f55 100644 +--- a/src/config/core/CMakeLists.txt ++++ b/src/config/core/CMakeLists.txt +@@ -9,7 +9,7 @@ if(NOT WIN32) + install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc" +- DESTINATION "include/pkgconfig") ++ DESTINATION "${LIB_DESTINATION}/pkgconfig") + endif() + + +@@ -19,7 +19,8 @@ endif() + configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++Config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake" +- INSTALL_DESTINATION "${LIB_DESTINATION}/cmake") ++ INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++" ++ PATH_VARS core_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR) + + write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake +@@ -30,4 +31,4 @@ install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake" +- DESTINATION "include/cmake") ++ DESTINATION "${LIB_DESTINATION}/cmake/liblucene++") +diff --git a/src/config/core/liblucene++Config.cmake.in b/src/config/core/liblucene++Config.cmake.in +index 89b48a3d..574f8129 100644 +--- a/src/config/core/liblucene++Config.cmake.in ++++ b/src/config/core/liblucene++Config.cmake.in +@@ -20,8 +20,8 @@ if (NOT DEFINED set_and_check) + endif() + + +-set_and_check(liblucene++_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@core_libname@") +-set_and_check(liblucene++_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") +-set(liblucene++_LIBRARIES "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@core_libname@") ++set_and_check(liblucene++_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") ++set_and_check(liblucene++_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@") ++set(liblucene++_LIBRARIES "@core_libname@") + + diff --git a/lucene++-3.0.8-fix-contrib-soname.patch b/lucene++-3.0.8-fix-contrib-soname.patch new file mode 100644 index 0000000..bb66068 --- /dev/null +++ b/lucene++-3.0.8-fix-contrib-soname.patch @@ -0,0 +1,24 @@ +From 5c06dc53560668606b72fa0e673c9eb96948ff39 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Mon, 4 Jan 2021 15:47:21 +0100 +Subject: [PATCH] CMakeLists.txt: fix typo preventing lucene++-contrib library + symlink from being created correctly + +The SONAME/SOVERSION weren't evaluated and set correctly because of the wrong target name. +--- + src/contrib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/contrib/CMakeLists.txt b/src/contrib/CMakeLists.txt +index 46ed8a24..afeccb4e 100644 +--- a/src/contrib/CMakeLists.txt ++++ b/src/contrib/CMakeLists.txt +@@ -77,7 +77,7 @@ endif() + #################################### + target_compile_options(lucene++-contrib PRIVATE -DLPP_BUILDING_LIB) + +-set_target_properties(lucene++ ++set_target_properties(lucene++-contrib + PROPERTIES + COTIRE_CXX_PREFIX_HEADER_INIT "include/ContribInc.h" + CXX_VISIBILITY_PRESET hidden diff --git a/lucene++-3.0.8-fix-missing-headers.patch b/lucene++-3.0.8-fix-missing-headers.patch new file mode 100644 index 0000000..36d3faf --- /dev/null +++ b/lucene++-3.0.8-fix-missing-headers.patch @@ -0,0 +1,33 @@ +diff -Nur a/src/contrib/CMakeLists.txt b/src/contrib/CMakeLists.txt +--- a/src/contrib/CMakeLists.txt 2020-12-29 20:10:43.000000000 +0800 ++++ b/src/contrib/CMakeLists.txt 2021-06-08 13:50:28.225527544 +0800 +@@ -3,6 +3,8 @@ + #################################### + # create library target + #################################### ++add_subdirectory(include) ++ + if (LUCENE_BUILD_SHARED) + add_library(lucene++-contrib SHARED) + else() +@@ -94,4 +96,5 @@ + install( + FILES ${contrib_headers} + DESTINATION "include/lucene++" ++ DESTINATION "src/contrib/include" + COMPONENT development-contrib) +diff -Nur a/src/contrib/include/CMakeLists.txt b/src/contrib/include/CMakeLists.txt +--- a/src/contrib/include/CMakeLists.txt 1970-01-01 08:00:00.000000000 +0800 ++++ b/src/contrib/include/CMakeLists.txt 2020-12-29 20:10:43.000000000 +0800 +@@ -0,0 +1,11 @@ ++#################################### ++# install headers ++#################################### ++ ++file(GLOB_RECURSE lucene_headers ++ "${CMAKE_CURRENT_SOURCE_DIR}/*.h" ++) ++ ++install( ++ FILES ${lucene_headers} ++ DESTINATION include/lucene++ ) diff --git a/lucene++-3.0.8-fix-pc-libdir.patch b/lucene++-3.0.8-fix-pc-libdir.patch new file mode 100644 index 0000000..0b91c0c --- /dev/null +++ b/lucene++-3.0.8-fix-pc-libdir.patch @@ -0,0 +1,49 @@ +From 39cd44bd54e918d25ee464477992ad0dc234dcba Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Mon, 4 Jan 2021 16:29:25 +0100 +Subject: [PATCH] pkgconfig: use correct LIBDIR for destination library + +--- + src/config/contrib/liblucene++-contrib.pc.in | 4 ++-- + src/config/core/liblucene++.pc.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/config/contrib/liblucene++-contrib.pc.in b/src/config/contrib/liblucene++-contrib.pc.in +index 21026e0a..64c3acac 100644 +--- a/src/config/contrib/liblucene++-contrib.pc.in ++++ b/src/config/contrib/liblucene++-contrib.pc.in +@@ -1,13 +1,13 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=@LIB_DESTINATION@ ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include/lucene++ + lib=lucene++-contrib + + Name: liblucene++-contrib + Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene + Version: @lucene++_VERSION@ +-Libs: -L@LIB_DESTINATION@ -l${lib} ++Libs: -L${libdir} -l${lib} + Cflags: -I${includedir} + Requires: liblucene++ = @lucene++_VERSION@ + +diff --git a/src/config/core/liblucene++.pc.in b/src/config/core/liblucene++.pc.in +index 32d16ad7..690f7d24 100644 +--- a/src/config/core/liblucene++.pc.in ++++ b/src/config/core/liblucene++.pc.in +@@ -1,12 +1,12 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=@LIB_DESTINATION@ ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include/lucene++ + lib=lucene++ + + Name: liblucene++ + Description: Lucene++ - a C++ search engine, ported from the popular Apache Lucene + Version: @lucene++_VERSION@ +-Libs: -L@LIB_DESTINATION@ -l${lib} ++Libs: -L${libdir} -l${lib} + Cflags: -I${includedir} + diff --git a/lucene++-3.0.8.tar.gz b/lucene++-3.0.8.tar.gz new file mode 100644 index 0000000..f6613b8 --- /dev/null +++ b/lucene++-3.0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af5cf59a93cf6dce86828e108e010359517c25ce487152af68520785d183813c +size 2456644 diff --git a/lucene++-3.0.9-fix-boost1.85.patch b/lucene++-3.0.9-fix-boost1.85.patch new file mode 100644 index 0000000..0ce2ced --- /dev/null +++ b/lucene++-3.0.9-fix-boost1.85.patch @@ -0,0 +1,67 @@ +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 beac782..46156e3 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 51508b5..d92efbb 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(); + } + +-- +2.44.0 + diff --git a/lucene++-3.0.9-migrate-to-boost-asio-io_context.patch b/lucene++-3.0.9-migrate-to-boost-asio-io_context.patch new file mode 100644 index 0000000..99fded8 --- /dev/null +++ b/lucene++-3.0.9-migrate-to-boost-asio-io_context.patch @@ -0,0 +1,78 @@ +From e6a376836e5c891577eae6369263152106b9bc02 Mon Sep 17 00:00:00 2001 +From: Christian Heusel +Date: Tue, 21 Jan 2025 01:01:58 +0100 +Subject: [PATCH] Migrate to boost::asio::io_context + +The code previously used the deprecated (and with bost 1.87.0 removed) +`boost::asio::io_service`, which used to be an alias to `io_context`. +The new version heavily changes the `io_context` API and therefore is no +the old interface was removed. + +Fixes https://github.com/luceneplusplus/LucenePlusPlus/issues/208 + +Signed-off-by: Christian Heusel +--- + include/lucene++/ThreadPool.h | 10 ++++++---- + src/core/util/ThreadPool.cpp | 9 +++++---- + 2 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/include/lucene++/ThreadPool.h b/include/lucene++/ThreadPool.h +index dc6446ff..175ac8ad 100644 +--- a/include/lucene++/ThreadPool.h ++++ b/include/lucene++/ThreadPool.h +@@ -14,7 +14,9 @@ + + namespace Lucene { + +-typedef boost::shared_ptr workPtr; ++ ++typedef boost::asio::io_context io_context_t; ++typedef boost::asio::executor_work_guard work_t; + + /// A Future represents the result of an asynchronous computation. Methods are provided to check if the computation + /// is complete, to wait for its completion, and to retrieve the result of the computation. The result can only be +@@ -51,8 +53,8 @@ class ThreadPool : public LuceneObject { + LUCENE_CLASS(ThreadPool); + + protected: +- boost::asio::io_service io_service; +- workPtr work; ++ io_context_t io_context; ++ work_t work; + boost::thread_group threadGroup; + + static const int32_t THREADPOOL_SIZE; +@@ -64,7 +66,7 @@ class ThreadPool : public LuceneObject { + template + FuturePtr scheduleTask(FUNC func) { + FuturePtr future(newInstance()); +- io_service.post(boost::bind(&ThreadPool::execute, this, func, future)); ++ boost::asio::post(io_context, boost::bind(&ThreadPool::execute, this, func, future)); + return future; + } + +diff --git a/src/core/util/ThreadPool.cpp b/src/core/util/ThreadPool.cpp +index 8086d8b1..116f521c 100644 +--- a/src/core/util/ThreadPool.cpp ++++ b/src/core/util/ThreadPool.cpp +@@ -14,15 +14,16 @@ Future::~Future() { + + const int32_t ThreadPool::THREADPOOL_SIZE = 5; + +-ThreadPool::ThreadPool() { +- work.reset(new boost::asio::io_service::work(io_service)); ++ThreadPool::ThreadPool() ++ : ++ work(boost::asio::make_work_guard(io_context)) ++{ + for (int32_t i = 0; i < THREADPOOL_SIZE; ++i) { +- threadGroup.create_thread(boost::bind(&boost::asio::io_service::run, &io_service)); ++ threadGroup.create_thread(boost::bind(&boost::asio::io_context::run, &io_context)); + } + } + + ThreadPool::~ThreadPool() { +- work.reset(); // stop all threads + threadGroup.join_all(); // wait for all competition + } + diff --git a/lucene++.changes b/lucene++.changes new file mode 100644 index 0000000..ba04c19 --- /dev/null +++ b/lucene++.changes @@ -0,0 +1,89 @@ +------------------------------------------------------------------- +Tue Mar 18 08:51:27 UTC 2025 - Markéta Machová + +- Add lucene++-3.0.9-migrate-to-boost-asio-io_context.patch + * fix with boost 1.87 + +------------------------------------------------------------------- +Fri Apr 26 08:11:30 UTC 2024 - Ana Guerrero + +- Fix build with boost 1.85, add patch lucene++-3.0.9-fix-boost1.85.patch + +------------------------------------------------------------------- +Wed Apr 12 12:55:45 UTC 2023 - Antoine Belvire + +- Add explicit build dependency on libboost_atomic-devel: Fix build + with older boost version (Leap 15.5). + +------------------------------------------------------------------- +Tue Jun 8 06:41:05 UTC 2021 - Hillwood Yang + +- Contrib headers should be installed, add lucene++-3.0.8-fix-missing-headers.patch + +------------------------------------------------------------------- +Thu Jan 21 20:00:18 UTC 2021 - antoine.belvire@opensuse.org + +- Add CMake option to prevent installation of gtest files instead + of removing them by hand. +- Remove obsolete build dependency on subversion. + +------------------------------------------------------------------- +Sat Jan 16 16:43:36 UTC 2021 - antoine.belvire@opensuse.org + +- Update to version 3.0.8: + * No changelog provided. +- Remove 0001-Fix-compilation-with-Boost-1.58.patch: Merged + upstream. +- Add some patches from upstream, mainly build system fixes: + * lucene++-3.0.8-fix-contrib-soname.patch + * lucene++-3.0.8-fix-pc-libdir.patch + * lucene++-3.0.8-fix-cmake-issues.patch +- Require CMake >= 3.5 to build. +- Run test suite on build. +- Add new cmake files to list of installed files. + +------------------------------------------------------------------- +Sat Dec 26 18:09:24 UTC 2020 - antoine.belvire@opensuse.org + +- Add some build dependencies (used to be implicitly pulled): + * pkgconfig(bzip2) + * pkgconfig(zlib) +- Remove obsolete conditionals. + +------------------------------------------------------------------- +Wed Feb 1 14:51:41 UTC 2017 - adam.majer@suse.de + +- use individual libboost-*-devel packages instead of boost-devel + +------------------------------------------------------------------- +Tue May 19 20:35:16 UTC 2015 - astieger@suse.com + +- fix build with boost 1.58, adding upstream patch + 0001-Fix-compilation-with-Boost-1.58.patch + +------------------------------------------------------------------- +Fri Feb 27 09:31:43 UTC 2015 - astieger@suse.com + +- lucene++ 3.0.7: + * no upstream changelog + * remove patches now upstream: + lucene++-3.0.6-fix_installing_headers.patch + lucene++-3.0.6-multiarch.patch + lucene++-3.0.6-pc_files_fix.patch + +------------------------------------------------------------------- +Sun Oct 19 19:34:10 UTC 2014 - andreas.stieger@gmx.de + +- fixes for .pc files in lucene++-3.0.6-pc_files_fix.patch +- add upstream patch lucene++-3.0.6-multiarch.patch to work with + %cmake makro +- fix build for openSUSE 12.3 + +------------------------------------------------------------------- +Sat Oct 18 09:55:11 UTC 2014 - andreas.stieger@gmx.de + +- lucene++ 3.0.6, a high-performance, full-featured text search + engine written in C++, +- upstream patches: + * lucene++-3.0.6-pc_files_fix.patch - fix pkgconfig files + * lucene++-3.0.6-fix_installing_headers.patch fix header install diff --git a/lucene++.spec b/lucene++.spec new file mode 100644 index 0000000..a8c511a --- /dev/null +++ b/lucene++.spec @@ -0,0 +1,108 @@ +# +# spec file for package lucene++ +# +# Copyright (c) 2025 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: lucene++ +Version: 3.0.8 +Release: 0 +Summary: A high-performance, full-featured text search engine written in C++ +License: Apache-2.0 OR LGPL-3.0-or-later +Group: Development/Libraries/C and C++ +URL: https://github.com/luceneplusplus/LucenePlusPlus +Source: https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_%{version}/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM lucene++-3.0.8-fix-contrib-soname.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/161 +Patch0: lucene++-3.0.8-fix-contrib-soname.patch +# PATCH-FIX-UPSTREAM lucene++-3.0.8-fix-pc-libdir.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/162 +Patch1: lucene++-3.0.8-fix-pc-libdir.patch +# PATCH-FIX-UPSTREAM lucene++-3.0.8-fix-cmake-issues.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/163 +Patch2: lucene++-3.0.8-fix-cmake-issues.patch +# PATCH-FIX-UPSTREAM lucene++-3.0.8-fix-missing-headers.patch -- hillwood@opensuse.org +# contrib headers should be installed +Patch3: lucene++-3.0.8-fix-missing-headers.patch +# PATCH-FIX-UPSTREAM lucene++-3.0.9-fix-cmake-issues.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/203 +Patch4: lucene++-3.0.9-fix-boost1.85.patch +# PATCH-FIX-UPSTREAM lucene++-3.0.9-migrate-to-boost-asio-io_context.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/210 +Patch5: lucene++-3.0.9-migrate-to-boost-asio-io_context.patch +BuildRequires: cmake >= 3.5 +BuildRequires: gcc-c++ +BuildRequires: libboost_atomic-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_iostreams-devel +BuildRequires: libboost_regex-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_thread-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(zlib) + +%description +An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine. + +%package -n liblucene++0 +Summary: A high-performance, full-featured text search engine written in C++ +Group: Development/Libraries/C and C++ + +%description -n liblucene++0 +An up to date C++ port of the popular Java Lucene library, a high-performance, full-featured text search engine. + +%package devel +Summary: Development files for lucene++ +Group: Development/Libraries/C and C++ +Requires: liblucene++0 = %{version} + +%description devel +Development files for lucene++, a high-performance, full-featured text search engine written in C++ + +%prep +%autosetup -p1 -n LucenePlusPlus-rel_%{version} + +%build +%cmake -DINSTALL_GTEST=OFF +%make_build lucene++ lucene++-contrib + +%install +%cmake_install + +%check +# Exclude known failing test on ix86 (https://github.com/luceneplusplus/LucenePlusPlus/issues/98) +%ifarch %{ix86} +%define test_filter -Boolean2Test.testRandomQueries +%endif +# Tweak path to allow lucene++-tester to find liblucene++ and libgtest +export LD_LIBRARY_PATH="$PWD/build/src/core:$PWD/build/src/contrib:$PWD/build/lib" +build/src/test/lucene++-tester %{?test_filter:--gtest_filter=%{test_filter}} + +%post -n liblucene++0 -p /sbin/ldconfig +%postun -n liblucene++0 -p /sbin/ldconfig + +%files -n liblucene++0 +%{_libdir}/liblucene++.so.* +%{_libdir}/liblucene++-contrib.so.* +%license COPYING APACHE.license GPL.license LGPL.license +%doc AUTHORS README* REQUESTS + +%files devel +%license COPYING APACHE.license GPL.license LGPL.license +%{_includedir}/lucene++/ +%{_libdir}/cmake/liblucene++/ +%{_libdir}/cmake/liblucene++-contrib/ +%{_libdir}/liblucene++.so +%{_libdir}/liblucene++-contrib.so +%{_libdir}/pkgconfig/liblucene++.pc +%{_libdir}/pkgconfig/liblucene++-contrib.pc + +%changelog From c2cdc4383fb8997768282dd63b3a41ff74ace4ef0b4d6f2aa3668777d81b45ab Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Tue, 15 Apr 2025 09:59:28 +0000 Subject: [PATCH 2/2] lucene++ 3.0.9 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/lucene++?expand=0&rev=23 --- lucene++-3.0.8-fix-cmake-issues.patch | 147 ------------------ lucene++-3.0.8-fix-contrib-soname.patch | 24 --- lucene++-3.0.8-fix-missing-headers.patch | 33 ---- lucene++-3.0.8-fix-pc-libdir.patch | 49 ------ lucene++-3.0.8.tar.gz | 3 - ...-3.0.9-fix-linking-DefaultSimilarity.patch | 129 +++++++++++++++ lucene++-3.0.9.tar.gz | 3 + lucene++.changes | 13 ++ lucene++.spec | 33 ++-- 9 files changed, 162 insertions(+), 272 deletions(-) delete mode 100644 lucene++-3.0.8-fix-cmake-issues.patch delete mode 100644 lucene++-3.0.8-fix-contrib-soname.patch delete mode 100644 lucene++-3.0.8-fix-missing-headers.patch delete mode 100644 lucene++-3.0.8-fix-pc-libdir.patch delete mode 100644 lucene++-3.0.8.tar.gz create mode 100644 lucene++-3.0.9-fix-linking-DefaultSimilarity.patch create mode 100644 lucene++-3.0.9.tar.gz diff --git a/lucene++-3.0.8-fix-cmake-issues.patch b/lucene++-3.0.8-fix-cmake-issues.patch deleted file mode 100644 index 29f2b06..0000000 --- a/lucene++-3.0.8-fix-cmake-issues.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 1cd2509ed74ae47965006d16de3c09db029b4efe Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Mon, 4 Jan 2021 23:45:13 +0100 -Subject: [PATCH] Fix various cmake issues: "CMAKE_INSTALL_FULL_LIBDIR" not - being correctly evaluated and used pkgconfig directory wrongly set to include - instead of lib cmake directory wrongly set to include instead of lib - core_libname contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR - PACKAGE_CMAKE_INSTALL_LIBDIR variables not being substituted to cmake.in - files cmake helpers not being correctly set - ---- - CMakeLists.txt | 2 +- - src/config/CMakeLists.txt | 12 ++++++------ - src/config/contrib/CMakeLists.txt | 7 ++++--- - .../contrib/liblucene++-contribConfig.cmake.in | 6 +++--- - src/config/core/CMakeLists.txt | 7 ++++--- - src/config/core/liblucene++Config.cmake.in | 6 +++--- - 6 files changed, 21 insertions(+), 19 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 41de688b..71dbbd56 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,7 +21,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) - endif() - - set(LIB_DESTINATION -- "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Define lib output directory name") -+ "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Define lib output directory name") - - - #################################### -diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt -index e5e66240..fe8e8b89 100644 ---- a/src/config/CMakeLists.txt -+++ b/src/config/CMakeLists.txt -@@ -1,16 +1,16 @@ - #################################### - # Set config vars - #################################### --set(core_libname, "lucene++") --set(contrib_libname, "lucene++-contrib") -+set(core_libname "lucene++") -+set(contrib_libname "lucene++-contrib") - - set( -- PACKAGE_CMAKE_INSTALL_INCLUDEDIR, -- "${lucene++_INCLUDE_DIR}/lucene++/") -+ PACKAGE_CMAKE_INSTALL_INCLUDEDIR -+ "${CMAKE_INSTALL_INCLUDEDIR}/lucene++/") - - set( -- PACKAGE_CMAKE_INSTALL_LIBDIR, -- "${LIB_INSTALL_DIR}/cmake") -+ PACKAGE_CMAKE_INSTALL_LIBDIR -+ "${LIB_DESTINATION}") - - - #################################### -diff --git a/src/config/contrib/CMakeLists.txt b/src/config/contrib/CMakeLists.txt -index c0dd86fc..b4a4391c 100644 ---- a/src/config/contrib/CMakeLists.txt -+++ b/src/config/contrib/CMakeLists.txt -@@ -9,7 +9,7 @@ if(NOT WIN32) - install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc" -- DESTINATION "include/pkgconfig") -+ DESTINATION "${LIB_DESTINATION}/pkgconfig") - endif() - - -@@ -19,7 +19,8 @@ endif() - configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++-contribConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake" -- INSTALL_DESTINATION "${LIB_DESTINATION}/cmake") -+ INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib" -+ PATH_VARS contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR) - - write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake" -@@ -30,4 +31,4 @@ install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake" -- DESTINATION "include/cmake") -+ DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib") -diff --git a/src/config/contrib/liblucene++-contribConfig.cmake.in b/src/config/contrib/liblucene++-contribConfig.cmake.in -index f92f6830..85fdfd2e 100644 ---- a/src/config/contrib/liblucene++-contribConfig.cmake.in -+++ b/src/config/contrib/liblucene++-contribConfig.cmake.in -@@ -20,6 +20,6 @@ if (NOT DEFINED set_and_check) - endif() - - --set_and_check(liblucene++-contrib_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@contrib_libname@") --set_and_check(liblucene++-contrib_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") --set(liblucene++-contrib_LIBRARIES "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@contrib_libname@") -+set_and_check(liblucene++-contrib_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") -+set_and_check(liblucene++-contrib_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@") -+set(liblucene++-contrib_LIBRARIES "@contrib_libname@") -diff --git a/src/config/core/CMakeLists.txt b/src/config/core/CMakeLists.txt -index a3eb17a1..65376f55 100644 ---- a/src/config/core/CMakeLists.txt -+++ b/src/config/core/CMakeLists.txt -@@ -9,7 +9,7 @@ if(NOT WIN32) - install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc" -- DESTINATION "include/pkgconfig") -+ DESTINATION "${LIB_DESTINATION}/pkgconfig") - endif() - - -@@ -19,7 +19,8 @@ endif() - configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++Config.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake" -- INSTALL_DESTINATION "${LIB_DESTINATION}/cmake") -+ INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++" -+ PATH_VARS core_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR) - - write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake -@@ -30,4 +31,4 @@ install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake" -- DESTINATION "include/cmake") -+ DESTINATION "${LIB_DESTINATION}/cmake/liblucene++") -diff --git a/src/config/core/liblucene++Config.cmake.in b/src/config/core/liblucene++Config.cmake.in -index 89b48a3d..574f8129 100644 ---- a/src/config/core/liblucene++Config.cmake.in -+++ b/src/config/core/liblucene++Config.cmake.in -@@ -20,8 +20,8 @@ if (NOT DEFINED set_and_check) - endif() - - --set_and_check(liblucene++_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@core_libname@") --set_and_check(liblucene++_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") --set(liblucene++_LIBRARIES "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@core_libname@") -+set_and_check(liblucene++_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") -+set_and_check(liblucene++_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@") -+set(liblucene++_LIBRARIES "@core_libname@") - - diff --git a/lucene++-3.0.8-fix-contrib-soname.patch b/lucene++-3.0.8-fix-contrib-soname.patch deleted file mode 100644 index bb66068..0000000 --- a/lucene++-3.0.8-fix-contrib-soname.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5c06dc53560668606b72fa0e673c9eb96948ff39 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Mon, 4 Jan 2021 15:47:21 +0100 -Subject: [PATCH] CMakeLists.txt: fix typo preventing lucene++-contrib library - symlink from being created correctly - -The SONAME/SOVERSION weren't evaluated and set correctly because of the wrong target name. ---- - src/contrib/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/contrib/CMakeLists.txt b/src/contrib/CMakeLists.txt -index 46ed8a24..afeccb4e 100644 ---- a/src/contrib/CMakeLists.txt -+++ b/src/contrib/CMakeLists.txt -@@ -77,7 +77,7 @@ endif() - #################################### - target_compile_options(lucene++-contrib PRIVATE -DLPP_BUILDING_LIB) - --set_target_properties(lucene++ -+set_target_properties(lucene++-contrib - PROPERTIES - COTIRE_CXX_PREFIX_HEADER_INIT "include/ContribInc.h" - CXX_VISIBILITY_PRESET hidden diff --git a/lucene++-3.0.8-fix-missing-headers.patch b/lucene++-3.0.8-fix-missing-headers.patch deleted file mode 100644 index 36d3faf..0000000 --- a/lucene++-3.0.8-fix-missing-headers.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur a/src/contrib/CMakeLists.txt b/src/contrib/CMakeLists.txt ---- a/src/contrib/CMakeLists.txt 2020-12-29 20:10:43.000000000 +0800 -+++ b/src/contrib/CMakeLists.txt 2021-06-08 13:50:28.225527544 +0800 -@@ -3,6 +3,8 @@ - #################################### - # create library target - #################################### -+add_subdirectory(include) -+ - if (LUCENE_BUILD_SHARED) - add_library(lucene++-contrib SHARED) - else() -@@ -94,4 +96,5 @@ - install( - FILES ${contrib_headers} - DESTINATION "include/lucene++" -+ DESTINATION "src/contrib/include" - COMPONENT development-contrib) -diff -Nur a/src/contrib/include/CMakeLists.txt b/src/contrib/include/CMakeLists.txt ---- a/src/contrib/include/CMakeLists.txt 1970-01-01 08:00:00.000000000 +0800 -+++ b/src/contrib/include/CMakeLists.txt 2020-12-29 20:10:43.000000000 +0800 -@@ -0,0 +1,11 @@ -+#################################### -+# install headers -+#################################### -+ -+file(GLOB_RECURSE lucene_headers -+ "${CMAKE_CURRENT_SOURCE_DIR}/*.h" -+) -+ -+install( -+ FILES ${lucene_headers} -+ DESTINATION include/lucene++ ) diff --git a/lucene++-3.0.8-fix-pc-libdir.patch b/lucene++-3.0.8-fix-pc-libdir.patch deleted file mode 100644 index 0b91c0c..0000000 --- a/lucene++-3.0.8-fix-pc-libdir.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 39cd44bd54e918d25ee464477992ad0dc234dcba Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Mon, 4 Jan 2021 16:29:25 +0100 -Subject: [PATCH] pkgconfig: use correct LIBDIR for destination library - ---- - src/config/contrib/liblucene++-contrib.pc.in | 4 ++-- - src/config/core/liblucene++.pc.in | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/config/contrib/liblucene++-contrib.pc.in b/src/config/contrib/liblucene++-contrib.pc.in -index 21026e0a..64c3acac 100644 ---- a/src/config/contrib/liblucene++-contrib.pc.in -+++ b/src/config/contrib/liblucene++-contrib.pc.in -@@ -1,13 +1,13 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix}/bin --libdir=@LIB_DESTINATION@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ - includedir=${prefix}/include/lucene++ - lib=lucene++-contrib - - Name: liblucene++-contrib - Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene - Version: @lucene++_VERSION@ --Libs: -L@LIB_DESTINATION@ -l${lib} -+Libs: -L${libdir} -l${lib} - Cflags: -I${includedir} - Requires: liblucene++ = @lucene++_VERSION@ - -diff --git a/src/config/core/liblucene++.pc.in b/src/config/core/liblucene++.pc.in -index 32d16ad7..690f7d24 100644 ---- a/src/config/core/liblucene++.pc.in -+++ b/src/config/core/liblucene++.pc.in -@@ -1,12 +1,12 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix}/bin --libdir=@LIB_DESTINATION@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ - includedir=${prefix}/include/lucene++ - lib=lucene++ - - Name: liblucene++ - Description: Lucene++ - a C++ search engine, ported from the popular Apache Lucene - Version: @lucene++_VERSION@ --Libs: -L@LIB_DESTINATION@ -l${lib} -+Libs: -L${libdir} -l${lib} - Cflags: -I${includedir} - diff --git a/lucene++-3.0.8.tar.gz b/lucene++-3.0.8.tar.gz deleted file mode 100644 index f6613b8..0000000 --- a/lucene++-3.0.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af5cf59a93cf6dce86828e108e010359517c25ce487152af68520785d183813c -size 2456644 diff --git a/lucene++-3.0.9-fix-linking-DefaultSimilarity.patch b/lucene++-3.0.9-fix-linking-DefaultSimilarity.patch new file mode 100644 index 0000000..8b535e8 --- /dev/null +++ b/lucene++-3.0.9-fix-linking-DefaultSimilarity.patch @@ -0,0 +1,129 @@ +From 57fc3923f6ec0d569142b83d2d9332e2c0926d2a Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Sat, 24 Feb 2024 21:26:58 +0100 +Subject: [PATCH] Update DefaultSimilarity.cpp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes a linker failure when building tests (lto related?) +https://launchpadlibrarian.net/715939877/buildlog_ubuntu-noble-amd64.lucene++_3.0.9-1_BUILDING.txt.gz + +/usr/bin/c++ -g -O2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffile-prefix-map=/<>=. -flto=auto -ffat-lto-objects -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -fdebug-prefix-map=/<>=/usr/src/lucene++-3.0.9-1 -Wdate-time -D_FORTIFY_SOURCE=3 -O2 -g -DNDEBUG -Wl,-Bsymbolic-functions -flto=auto -ffat-lto-objects -Wl,-z,relro "CMakeFiles/lucene++-tester.dir/analysis/AnalyzersTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/BaseTokenStreamFixture.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/CachingTokenFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/CharFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/KeywordAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/LengthFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/MappingCharFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/NumericTokenStreamTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/PerFieldAnalzyerWrapperTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/StopAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/StopFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/TeeSinkTokenFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/TokenTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/standard/StandardAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/tokenattributes/SimpleAttributeTest.cpp.o" "CMakeFiles/lucene++-tester.dir/analysis/tokenattributes/TermAttributeTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/ar/ArabicAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/ar/ArabicNormalizationFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/ar/ArabicStemFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/br/BrazilianStemmerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/cjk/CJKTokenizerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/cn/ChineseTokenizerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/cz/CzechAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/de/GermanStemFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/el/GreekAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/fa/PersianAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/fa/PersianNormalizationFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/fr/ElisionTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/fr/FrenchAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/nl/DutchStemmerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/reverse/ReverseStringFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/ru/RussianAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/analyzers/common/analysis/ru/RussianStemTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/highlighter/HighlighterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/memory/MemoryIndexTest.cpp.o" "CMakeFiles/lucene++-tester.dir/contrib/snowball/SnowballTest.cpp.o" "CMakeFiles/lucene++-tester.dir/document/BinaryDocumentTest.cpp.o" "CMakeFiles/lucene++-tester.dir/document/DateFieldTest.cpp.o" "CMakeFiles/lucene++-tester.dir/document/DateToolsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/document/DocumentTest.cpp.o" "CMakeFiles/lucene++-tester.dir/document/NumberToolsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/AddIndexesNoOptimizeTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/AtomicUpdateTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/BackwardsCompatibilityTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/ByteSlicesTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/CheckIndexTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/CompoundFileTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/ConcurrentMergeSchedulerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/CrashTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/DeletionPolicyTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/DirectoryReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/DocHelper.cpp.o" "CMakeFiles/lucene++-tester.dir/index/DocTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/DocumentWriterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/FieldInfosTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/FieldsReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/FilterIndexReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexCommitTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexFileDeleterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexInputTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexReaderCloneNormsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexReaderCloneTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexReaderReopenTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexWriterDeleteTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexWriterExceptionsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexWriterLockReleaseTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexWriterMergePolicyTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexWriterMergingTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexWriterReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/IndexWriterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/LazyBugTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/LazyProxSkippingTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/MockIndexInput.cpp.o" "CMakeFiles/lucene++-tester.dir/index/MultiLevelSkipListTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/MultiReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/NRTReaderWithThreadsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/NormsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/OmitTfTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/ParallelReaderEmptyIndexTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/ParallelReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/ParallelTermEnumTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/PayloadsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/PositionBasedTermVectorMapperTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/SegmentMergerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/SegmentReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/SegmentTermDocsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/SegmentTermEnumTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/SnapshotDeletionPolicyTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/StressIndexingTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/TermDocsPerfTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/TermTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/TermVectorsReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/ThreadedOptimizeTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/TransactionRollbackTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/TransactionsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/index/WordlistLoaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/main/main.cpp.o" "CMakeFiles/lucene++-tester.dir/queryparser/MultiAnalyzerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/queryparser/MultiFieldQueryParserTest.cpp.o" "CMakeFiles/lucene++-tester.dir/queryparser/QueryParserTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/BaseTestRangeFilterFixture.cpp.o" "CMakeFiles/lucene++-tester.dir/search/BaseTestRangeFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/Boolean2Test.cpp.o" "CMakeFiles/lucene++-tester.dir/search/BooleanMinShouldMatchTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/BooleanOrTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/BooleanPrefixQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/BooleanQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/BooleanScorerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/CachingSpanFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/CachingWrapperFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/CheckHits.cpp.o" "CMakeFiles/lucene++-tester.dir/search/ComplexExplanationsOfNonMatchesTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/ComplexExplanationsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/CustomSearcherSortTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/DateFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/DateSortTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/DisjunctionMaxQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/DocBoostTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/DocIdSetTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/ElevationComparatorTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/ExplanationsFixture.cpp.o" "CMakeFiles/lucene++-tester.dir/search/FieldCacheRangeFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/FieldCacheTermsFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/FieldCacheTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/FilteredQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/FilteredSearchTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/FuzzyQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/MatchAllDocsQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/MockFilter.cpp.o" "CMakeFiles/lucene++-tester.dir/search/MultiPhraseQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/MultiSearcherRankingTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/MultiSearcherTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/MultiTermConstantScoreTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/MultiThreadTermVectorsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/MultiValuedNumericRangeQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/NotTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/NumericRangeQuery32Test.cpp.o" "CMakeFiles/lucene++-tester.dir/search/NumericRangeQuery64Test.cpp.o" "CMakeFiles/lucene++-tester.dir/search/ParallelMultiSearcherTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/PhrasePrefixQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/PhraseQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/PositionIncrementTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/PositiveScoresOnlyCollectorTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/PrefixFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/PrefixInBooleanQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/PrefixQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/QueryTermVectorTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/QueryUtils.cpp.o" "CMakeFiles/lucene++-tester.dir/search/QueryWrapperFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/ScoreCachingWrappingScorerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/ScorerPerfTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/SearchForDuplicatesTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/SearchTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/SetNormTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/SimilarityTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/SimpleExplanationsOfNonMatchesTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/SimpleExplanationsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/SloppyPhraseQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/SortTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/SpanQueryFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/TermRangeFilterTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/TermRangeQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/TermScorerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/TermVectorsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/ThreadSafeTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/TimeLimitingCollectorTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/TopDocsCollectorTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/TopScoreDocCollectorTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/WildcardTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/function/CustomScoreQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/function/DocValuesTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/function/FieldScoreQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/function/FunctionFixture.cpp.o" "CMakeFiles/lucene++-tester.dir/search/function/OrdValuesTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/payloads/PayloadHelper.cpp.o" "CMakeFiles/lucene++-tester.dir/search/payloads/PayloadNearQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/payloads/PayloadTermQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/spans/BasicSpansTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/spans/FieldMaskingSpanQueryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/spans/NearSpansOrderedTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/spans/PayloadSpansTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/spans/SpanExplanationsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/spans/SpansAdvanced2Test.cpp.o" "CMakeFiles/lucene++-tester.dir/search/spans/SpansAdvancedTest.cpp.o" "CMakeFiles/lucene++-tester.dir/search/spans/SpansTest.cpp.o" "CMakeFiles/lucene++-tester.dir/store/BufferedIndexInputTest.cpp.o" "CMakeFiles/lucene++-tester.dir/store/BufferedIndexOutputTest.cpp.o" "CMakeFiles/lucene++-tester.dir/store/DirectoryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/store/FileSwitchDirectoryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/store/IndexOutputTest.cpp.o" "CMakeFiles/lucene++-tester.dir/store/LockFactoryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/store/MMapDirectoryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/store/MockFSDirectory.cpp.o" "CMakeFiles/lucene++-tester.dir/store/MockLock.cpp.o" "CMakeFiles/lucene++-tester.dir/store/MockLockFactory.cpp.o" "CMakeFiles/lucene++-tester.dir/store/MockRAMDirectory.cpp.o" "CMakeFiles/lucene++-tester.dir/store/MockRAMInputStream.cpp.o" "CMakeFiles/lucene++-tester.dir/store/MockRAMOutputStream.cpp.o" "CMakeFiles/lucene++-tester.dir/store/RAMDirectoryTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/AttributeSourceTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/Base64Test.cpp.o" "CMakeFiles/lucene++-tester.dir/util/BitVectorTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/BufferedReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/CloseableThreadLocalTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/CompressionToolsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/FieldCacheSanityCheckerTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/FileReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/FileUtilsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/InputStreamReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/LuceneGlobalFixture.cpp.o" "CMakeFiles/lucene++-tester.dir/util/LuceneTestFixture.cpp.o" "CMakeFiles/lucene++-tester.dir/util/NumericUtilsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/OpenBitSetTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/PriorityQueueTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/SimpleLRUCacheTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/SortedVIntListTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/StringReaderTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/StringUtilsTest.cpp.o" "CMakeFiles/lucene++-tester.dir/util/TestUtils.cpp.o" "CMakeFiles/lucene++-tester.dir/util/VersionTest.cpp.o" -o lucene++-tester -Wl,-rpath,/<>/obj-x86_64-linux-gnu/src/contrib:/<>/obj-x86_64-linux-gnu/src/core /usr/lib/x86_64-linux-gnu/libz.so ../../lib/libgtest_main.a ../../lib/libgtest.a ../contrib/liblucene++-contrib.so.3.0.9 ../core/liblucene++.so.3.0.9 /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.83.0 /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.83.0 /usr/lib/x86_64-linux-gnu/libboost_iostreams.so.1.83.0 /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.83.0 /usr/lib/x86_64-linux-gnu/libboost_system.so.1.83.0 /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.83.0 /usr/lib/x86_64-linux-gnu/libboost_atomic.so.1.83.0 /usr/lib/x86_64-linux-gnu/libz.so +/usr/src/lucene++-3.0.9-1/src/test/index/AtomicUpdateTest.cpp:27:7: warning: type ‘struct MockIndexWriter’ violates the C++ One Definition Rule [-Wodr] +/usr/src/lucene++-3.0.9-1/src/test/index/IndexWriterExceptionsTest.cpp:122:7: note: a different type is defined in another translation unit +/usr/src/lucene++-3.0.9-1/src/test/index/AtomicUpdateTest.cpp:37:15: note: the first difference of corresponding definitions is field ‘random’ +/usr/src/lucene++-3.0.9-1/src/test/index/IndexWriterExceptionsTest.cpp:132:15: note: a field with different name is defined in another translation unit +/usr/src/lucene++-3.0.9-1/src/test/store/IndexOutputTest.cpp:118:7: warning: type ‘struct SourceIndexInput’ violates the C++ One Definition Rule [-Wodr] +/usr/src/lucene++-3.0.9-1/src/test/store/BufferedIndexOutputTest.cpp:100:7: note: a type with the same name but different base type is defined in another translation unit +/usr/src/lucene++-3.0.9-1/include/lucene++/IndexInput.h:17:14: note: type name ‘Lucene::IndexInput’ should match type name ‘Lucene::BufferedIndexInput’ +/usr/src/lucene++-3.0.9-1/include/lucene++/BufferedIndexInput.h:15:14: note: the incompatible type is defined here +/usr/src/lucene++-3.0.9-1/src/test/store/IndexOutputTest.cpp:146:27: warning: type of ‘clone’ does not match original declaration [-Wlto-type-mismatch] +/usr/src/lucene++-3.0.9-1/src/test/store/BufferedIndexOutputTest.cpp:117:27: note: ‘clone’ was previously declared here +/usr/src/lucene++-3.0.9-1/src/test/store/BufferedIndexOutputTest.cpp:117:27: note: code may be misoptimized unless ‘-fno-strict-aliasing’ is used +/usr/src/lucene++-3.0.9-1/src/test/store/IndexOutputTest.cpp:142:21: warning: type of ‘length’ does not match original declaration [-Wlto-type-mismatch] +/usr/src/lucene++-3.0.9-1/src/test/store/BufferedIndexOutputTest.cpp:113:21: note: ‘length’ was previously declared here +/usr/src/lucene++-3.0.9-1/src/test/store/BufferedIndexOutputTest.cpp:113:21: note: code may be misoptimized unless ‘-fno-strict-aliasing’ is used +/usr/src/lucene++-3.0.9-1/src/test/search/ScorerPerfTest.cpp:27:7: warning: virtual table of type ‘struct CountingHitCollector’ violates one definition rule [-Wodr] +/usr/src/lucene++-3.0.9-1/src/test/index/OmitTfTest.cpp:88:7: note: the conflicting type defined in another translation unit +/usr/src/lucene++-3.0.9-1/src/test/index/OmitTfTest.cpp:99:5: note: virtual method ‘getClassName’ +/usr/src/lucene++-3.0.9-1/include/lucene++/Collector.h:103:5: note: ought to match virtual method ‘getClassName’ but does not +/usr/src/lucene++-3.0.9-1/src/test/index/IndexReaderCloneNormsTest.cpp:25:7: warning: virtual table of type ‘struct SimilarityOne’ violates one definition rule [-Wodr] +/usr/src/lucene++-3.0.9-1/src/test/index/IndexReaderCloneNormsTest.cpp:25:7: note: the conflicting type defined in another translation unit +/usr/src/lucene++-3.0.9-1/include/lucene++/DefaultSimilarity.h:20:5: note: virtual method ‘getClassName’ +/usr/src/lucene++-3.0.9-1/src/test/index/NormsTest.cpp:26:5: note: ought to match virtual method ‘getClassName’ but does not +/usr/src/lucene++-3.0.9-1/src/test/store/BufferedIndexOutputTest.cpp:100:7: warning: type ‘struct SourceIndexInput’ violates the C++ One Definition Rule [-Wodr] +/usr/src/lucene++-3.0.9-1/src/test/store/BufferedIndexOutputTest.cpp:100:7: note: a type with the same name but different base type is defined in another translation unit +/usr/src/lucene++-3.0.9-1/include/lucene++/IndexInput.h:17:14: note: type name ‘Lucene::IndexInput’ should match type name ‘Lucene::BufferedIndexInput’ +/usr/src/lucene++-3.0.9-1/include/lucene++/BufferedIndexInput.h:15:14: note: the incompatible type is defined here +/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x558): undefined reference to `Lucene::DefaultSimilarity::queryNorm(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x568): undefined reference to `Lucene::DefaultSimilarity::sloppyFreq(int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x570): undefined reference to `Lucene::DefaultSimilarity::tf(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x588): undefined reference to `Lucene::DefaultSimilarity::idf(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans35.ltrans.o:(.data.rel.ro+0x590): undefined reference to `Lucene::DefaultSimilarity::coord(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans72.ltrans.o:(.data.rel.ro+0x360): undefined reference to `Lucene::DefaultSimilarity::lengthNorm(std::__cxx11::basic_string, std::allocator > const&, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans72.ltrans.o:(.data.rel.ro+0x368): undefined reference to `Lucene::DefaultSimilarity::queryNorm(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans72.ltrans.o:(.data.rel.ro+0x378): undefined reference to `Lucene::DefaultSimilarity::sloppyFreq(int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans72.ltrans.o:(.data.rel.ro+0x380): undefined reference to `Lucene::DefaultSimilarity::tf(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans72.ltrans.o:(.data.rel.ro+0x398): undefined reference to `Lucene::DefaultSimilarity::idf(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans75.ltrans.o:(.data.rel.ro+0x328): undefined reference to `Lucene::DefaultSimilarity::lengthNorm(std::__cxx11::basic_string, std::allocator > const&, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans75.ltrans.o:(.data.rel.ro+0x340): undefined reference to `Lucene::DefaultSimilarity::sloppyFreq(int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans75.ltrans.o:(.data.rel.ro+0x348): undefined reference to `Lucene::DefaultSimilarity::tf(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans75.ltrans.o:(.data.rel.ro+0x360): undefined reference to `Lucene::DefaultSimilarity::idf(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans75.ltrans.o:(.data.rel.ro+0x368): undefined reference to `Lucene::DefaultSimilarity::coord(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans78.ltrans.o:(.data.rel.ro+0x1d0): undefined reference to `Lucene::DefaultSimilarity::queryNorm(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans78.ltrans.o:(.data.rel.ro+0x1e0): undefined reference to `Lucene::DefaultSimilarity::sloppyFreq(int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans78.ltrans.o:(.data.rel.ro+0x208): undefined reference to `Lucene::DefaultSimilarity::coord(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans106.ltrans.o:(.data.rel.ro+0x758): undefined reference to `Lucene::DefaultSimilarity::idf(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans109.ltrans.o:(.data.rel.ro+0x4b8): undefined reference to `Lucene::DefaultSimilarity::lengthNorm(std::__cxx11::basic_string, std::allocator > const&, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans109.ltrans.o:(.data.rel.ro+0x4c0): undefined reference to `Lucene::DefaultSimilarity::queryNorm(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans109.ltrans.o:(.data.rel.ro+0x4d0): undefined reference to `Lucene::DefaultSimilarity::sloppyFreq(int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans109.ltrans.o:(.data.rel.ro+0x4d8): undefined reference to `Lucene::DefaultSimilarity::tf(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans109.ltrans.o:(.data.rel.ro+0x4f0): undefined reference to `Lucene::DefaultSimilarity::idf(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans109.ltrans.o:(.data.rel.ro+0x4f8): undefined reference to `Lucene::DefaultSimilarity::coord(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans114.ltrans.o:(.data.rel.ro+0x320): undefined reference to `Lucene::DefaultSimilarity::lengthNorm(std::__cxx11::basic_string, std::allocator > const&, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans114.ltrans.o:(.data.rel.ro+0x328): undefined reference to `Lucene::DefaultSimilarity::queryNorm(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans114.ltrans.o:(.data.rel.ro+0x340): undefined reference to `Lucene::DefaultSimilarity::tf(double)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans114.ltrans.o:(.data.rel.ro+0x358): undefined reference to `Lucene::DefaultSimilarity::idf(int, int)' +/usr/bin/ld: /tmp/ccUJivoA.ltrans114.ltrans.o:(.data.rel.ro+0x360): undefined reference to `Lucene::DefaultSimilarity::coord(int, int)' +collect2: error: ld returned 1 exit status +make[4]: *** [src/test/CMakeFiles/lucene++-tester.dir/build.make:3876: src/test/lucene++-tester] Error 1 +make[4]: Leaving directory '/<>/obj-x86_64-linux-gnu' +make[3]: *** [CMakeFiles/Makefile2:805: src/test/CMakeFiles/lucene++-tester.dir/all] Error 2 +make[3]: Leaving directory '/<>/obj-x86_64-linux-gnu' +make[2]: *** [Makefile:139: all] Error 2 +make[2]: Leaving directory '/<>/obj-x86_64-linux-gnu' +dh_auto_build: error: cd obj-x86_64-linux-gnu && make -j4 "INSTALL=install --strip-program=true" VERBOSE=1 returned exit code 2 +make[1]: *** [debian/rules:14: override_dh_auto_build-indep] Error 25 +--- + src/core/search/DefaultSimilarity.cpp | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/core/search/DefaultSimilarity.cpp b/src/core/search/DefaultSimilarity.cpp +index c98f2d95..da4c3db2 100644 +--- a/src/core/search/DefaultSimilarity.cpp ++++ b/src/core/search/DefaultSimilarity.cpp +@@ -27,35 +27,35 @@ double DefaultSimilarity::computeNorm(const String& fieldName, const FieldInvert + return (state->getBoost() * lengthNorm(fieldName, numTerms)); + } + +-inline double DefaultSimilarity::lengthNorm(const String& fieldName, int32_t numTokens) { ++double DefaultSimilarity::lengthNorm(const String& fieldName, int32_t numTokens) { + return (double)(1.0 / std::sqrt((double)numTokens)); + } + +-inline double DefaultSimilarity::queryNorm(double sumOfSquaredWeights) { ++double DefaultSimilarity::queryNorm(double sumOfSquaredWeights) { + return (double)(1.0 / std::sqrt(sumOfSquaredWeights)); + } + +-inline double DefaultSimilarity::tf(double freq) { ++double DefaultSimilarity::tf(double freq) { + return (double)std::sqrt(freq); + } + +-inline double DefaultSimilarity::sloppyFreq(int32_t distance) { ++double DefaultSimilarity::sloppyFreq(int32_t distance) { + return (1.0 / (double)(distance + 1)); + } + +-inline double DefaultSimilarity::idf(int32_t docFreq, int32_t numDocs) { ++double DefaultSimilarity::idf(int32_t docFreq, int32_t numDocs) { + return (double)(std::log((double)numDocs / (double)(docFreq + 1)) + 1.0); + } + +-inline double DefaultSimilarity::coord(int32_t overlap, int32_t maxOverlap) { ++double DefaultSimilarity::coord(int32_t overlap, int32_t maxOverlap) { + return (double)overlap / (double)maxOverlap; + } + +-inline void DefaultSimilarity::setDiscountOverlaps(bool v) { ++void DefaultSimilarity::setDiscountOverlaps(bool v) { + discountOverlaps = v; + } + +-inline bool DefaultSimilarity::getDiscountOverlaps() { ++bool DefaultSimilarity::getDiscountOverlaps() { + return discountOverlaps; + } + diff --git a/lucene++-3.0.9.tar.gz b/lucene++-3.0.9.tar.gz new file mode 100644 index 0000000..f4797c9 --- /dev/null +++ b/lucene++-3.0.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e69e29d5d79a976498ef71eab70c9c88c7014708be4450a9fda7780fe93584e +size 2458287 diff --git a/lucene++.changes b/lucene++.changes index ba04c19..410376f 100644 --- a/lucene++.changes +++ b/lucene++.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 8 20:39:19 UTC 2025 - Andreas Stieger + +- update to 3.0.9: + * fix race conditions whe initializing static variables + * build system fixes +- add patch lucene++-3.0.9-fix-linking-DefaultSimilarity.patch +- Drop patches merged upstream: + * lucene++-3.0.8-fix-contrib-soname.patch + * lucene++-3.0.8-fix-pc-libdir.patch + * lucene++-3.0.8-fix-missing-headers.patch + * lucene++-3.0.8-fix-cmake-issues.patch + ------------------------------------------------------------------- Tue Mar 18 08:51:27 UTC 2025 - Markéta Machová diff --git a/lucene++.spec b/lucene++.spec index a8c511a..34e03fb 100644 --- a/lucene++.spec +++ b/lucene++.spec @@ -17,26 +17,19 @@ Name: lucene++ -Version: 3.0.8 +Version: 3.0.9 Release: 0 Summary: A high-performance, full-featured text search engine written in C++ License: Apache-2.0 OR LGPL-3.0-or-later Group: Development/Libraries/C and C++ URL: https://github.com/luceneplusplus/LucenePlusPlus Source: https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_%{version}/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM lucene++-3.0.8-fix-contrib-soname.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/161 -Patch0: lucene++-3.0.8-fix-contrib-soname.patch -# PATCH-FIX-UPSTREAM lucene++-3.0.8-fix-pc-libdir.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/162 -Patch1: lucene++-3.0.8-fix-pc-libdir.patch -# PATCH-FIX-UPSTREAM lucene++-3.0.8-fix-cmake-issues.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/163 -Patch2: lucene++-3.0.8-fix-cmake-issues.patch -# PATCH-FIX-UPSTREAM lucene++-3.0.8-fix-missing-headers.patch -- hillwood@opensuse.org -# contrib headers should be installed -Patch3: lucene++-3.0.8-fix-missing-headers.patch # PATCH-FIX-UPSTREAM lucene++-3.0.9-fix-cmake-issues.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/203 Patch4: lucene++-3.0.9-fix-boost1.85.patch # PATCH-FIX-UPSTREAM lucene++-3.0.9-migrate-to-boost-asio-io_context.patch -- https://github.com/luceneplusplus/LucenePlusPlus/pull/210 Patch5: lucene++-3.0.9-migrate-to-boost-asio-io_context.patch +# PATCH-FIX-UPSTREAM https://github.com/luceneplusplus/LucenePlusPlus/pull/200 +Patch6: lucene++-3.0.9-fix-linking-DefaultSimilarity.patch BuildRequires: cmake >= 3.5 BuildRequires: gcc-c++ BuildRequires: libboost_atomic-devel @@ -78,16 +71,24 @@ Development files for lucene++, a high-performance, full-featured text search en %cmake_install %check -# Exclude known failing test on ix86 (https://github.com/luceneplusplus/LucenePlusPlus/issues/98) -%ifarch %{ix86} -%define test_filter -Boolean2Test.testRandomQueries +# Disable test failing with "config out of range" +export skip_tests_filter=-$(echo \ + SortTest.testEmptyFieldSort \ + SortTest.testParallelMultiSort \ + ParallelMultiSearcherTest.testEmptyIndex \ + ParallelMultiSearcherTest.testFieldSelector \ + ParallelMultiSearcherTest.testNormalization \ + ParallelMultiSearcherTest.testCustomSimilarity \ + ParallelMultiSearcherTest.testDocFreq \ +%ifarch %{ix86} # Exclude known failing test on ix86 (https://github.com/luceneplusplus/LucenePlusPlus/issues/98) + Boolean2Test.testRandomQueries \ %endif + %{nil} | tr ' ' ':') # Tweak path to allow lucene++-tester to find liblucene++ and libgtest export LD_LIBRARY_PATH="$PWD/build/src/core:$PWD/build/src/contrib:$PWD/build/lib" -build/src/test/lucene++-tester %{?test_filter:--gtest_filter=%{test_filter}} +build/src/test/lucene++-tester --gtest_filter="${skip_tests_filter}" -%post -n liblucene++0 -p /sbin/ldconfig -%postun -n liblucene++0 -p /sbin/ldconfig +%ldconfig_scriptlets -n liblucene++0 %files -n liblucene++0 %{_libdir}/liblucene++.so.*