Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lucene++ for openSUSE:Factory checked in at 2025-10-09 15:06:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lucene++ (Old) and /work/SRC/openSUSE:Factory/.lucene++.new.11973 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lucene++" Thu Oct 9 15:06:55 2025 rev:13 rq:1309940 version:3.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/lucene++/lucene++.changes 2025-05-20 09:35:09.245854021 +0200 +++ /work/SRC/openSUSE:Factory/.lucene++.new.11973/lucene++.changes 2025-10-09 15:09:24.373972124 +0200 @@ -1,0 +2,9 @@ +Sun Oct 5 21:00:33 UTC 2025 - Arjen de Korte <[email protected]> + +- Add lucene++-3.0.9-fix-cmake.patch + * Bump minimum required cmake version to 3.10, for new cmake 4 + compatibility fix +- Add lucene++-3.0.9-fix-boost1.89.patch + * fix build with boost 1.89 + +------------------------------------------------------------------- New: ---- lucene++-3.0.9-fix-boost1.89.patch lucene++-3.0.9-fix-cmake.patch ----------(New B)---------- New: compatibility fix - Add lucene++-3.0.9-fix-boost1.89.patch * fix build with boost 1.89 New: - Add lucene++-3.0.9-fix-cmake.patch * Bump minimum required cmake version to 3.10, for new cmake 4 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lucene++.spec ++++++ --- /var/tmp/diff_new_pack.TCBtOr/_old 2025-10-09 15:09:25.126003866 +0200 +++ /var/tmp/diff_new_pack.TCBtOr/_new 2025-10-09 15:09:25.130004035 +0200 @@ -30,16 +30,23 @@ 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 +# PATCH-FIX-UPSTREAM https://github.com/luceneplusplus/LucenePlusPlus/pull/218 +Patch7: lucene++-3.0.9-fix-cmake.patch +# PATCH-FIX-UPSTREAM https://github.com/luceneplusplus/LucenePlusPlus/pull/219 +Patch8: lucene++-3.0.9-fix-boost1.89.patch +BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ BuildRequires: libboost_atomic-devel BuildRequires: libboost_filesystem-devel BuildRequires: libboost_iostreams-devel BuildRequires: libboost_regex-devel +%if 0%{?suse_version} < 1600 BuildRequires: libboost_system-devel +%endif BuildRequires: libboost_thread-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(gtest) BuildRequires: pkgconfig(zlib) %description @@ -61,7 +68,14 @@ Development files for lucene++, a high-performance, full-featured text search engine written in C++ %prep -%autosetup -p1 -n LucenePlusPlus-rel_%{version} +%autosetup -N -n LucenePlusPlus-rel_%{version} +%patch -p1 -P 4 +%patch -p1 -P 5 +%patch -p1 -P 6 +%patch -p1 -P 7 +%if 0%{?suse_version} >= 1600 +%patch -p1 -P 8 +%endif %build # Remove cmake4 error due to not setting ++++++ lucene++-3.0.9-fix-boost1.89.patch ++++++ >From 07d84267b8d741414601b1be529da5de3afd28af Mon Sep 17 00:00:00 2001 From: Arjen de Korte <[email protected]> Date: Sun, 28 Sep 2025 19:01:19 +0200 Subject: [PATCH 1/7] Boost.System has been header only since Boost 1.69.0 --- cmake/dependencies.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 74c3761b..3387e7c0 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -7,7 +7,6 @@ find_package(Boost COMPONENTS filesystem iostreams regex - system thread REQUIRED ) >From 8c9dca65bdf8f1bd3a2b0b791887d8b9b7da3fe6 Mon Sep 17 00:00:00 2001 From: Arjen de Korte <[email protected]> Date: Sun, 28 Sep 2025 19:08:36 +0200 Subject: [PATCH 2/7] Boost.System has been header only since Boost 1.69.0 --- src/core/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 690f3826..657de549 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -57,7 +57,6 @@ target_link_libraries(lucene++ Boost::filesystem Boost::iostreams Boost::regex - Boost::system Boost::thread ZLIB::ZLIB ) >From 32039e5f54e7dbc7a2c1e096bdd44c6297262522 Mon Sep 17 00:00:00 2001 From: Arjen de Korte <[email protected]> Date: Sun, 28 Sep 2025 19:13:16 +0200 Subject: [PATCH 3/7] Update CMakeLists.txt --- src/contrib/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/contrib/CMakeLists.txt b/src/contrib/CMakeLists.txt index 7af68045..7252b73a 100644 --- a/src/contrib/CMakeLists.txt +++ b/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++) >From 7425cb10d3aa5415e20b3074743fc450195e243a Mon Sep 17 00:00:00 2001 From: Arjen de Korte <[email protected]> Date: Sun, 28 Sep 2025 19:16:05 +0200 Subject: [PATCH 4/7] Update CMakeLists.txt --- src/demo/deletefiles/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/demo/deletefiles/CMakeLists.txt b/src/demo/deletefiles/CMakeLists.txt index b50d5bee..42131950 100644 --- a/src/demo/deletefiles/CMakeLists.txt +++ b/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++ >From 2adbf0d482dec43ac9fe73be8f49c8980bc38cb3 Mon Sep 17 00:00:00 2001 From: Arjen de Korte <[email protected]> Date: Sun, 28 Sep 2025 19:16:41 +0200 Subject: [PATCH 5/7] Update CMakeLists.txt --- src/demo/indexfiles/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/demo/indexfiles/CMakeLists.txt b/src/demo/indexfiles/CMakeLists.txt index a1dd582b..68ddced8 100644 --- a/src/demo/indexfiles/CMakeLists.txt +++ b/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++ >From 6af2547d620a49df603026433a3eb484bada7e60 Mon Sep 17 00:00:00 2001 From: Arjen de Korte <[email protected]> Date: Sun, 28 Sep 2025 19:17:28 +0200 Subject: [PATCH 6/7] Update CMakeLists.txt --- src/demo/searchfiles/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/demo/searchfiles/CMakeLists.txt b/src/demo/searchfiles/CMakeLists.txt index aaf559e4..dda95427 100644 --- a/src/demo/searchfiles/CMakeLists.txt +++ b/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++ >From 39a3d7c4cd53b1daa3718083527d3c97419c4937 Mon Sep 17 00:00:00 2001 From: Arjen de Korte <[email protected]> Date: Sun, 28 Sep 2025 19:18:17 +0200 Subject: [PATCH 7/7] Update CMakeLists.txt --- src/test/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index f0b9b7e6..69393c00 100644 --- a/src/test/CMakeLists.txt +++ b/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 ++++++ lucene++-3.0.9-fix-cmake.patch ++++++ >From 2857419531c45e542afdc52001a65733f4f9b128 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna <[email protected]> Date: Mon, 8 Sep 2025 15:05:10 +0200 Subject: [PATCH 1/3] Bump minimum required cmake version to 3.10, for new cmake 4 compatibility fix --- CMakeLists.txt | 2 +- cmake/cotire.cmake | 2 +- src/test/gtest/CMakeLists.txt | 2 +- src/test/gtest/googlemock/CMakeLists.txt | 2 +- src/test/gtest/googletest/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c0fc020..280d74a6 100644 --- 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++) diff --git a/cmake/cotire.cmake b/cmake/cotire.cmake index 9a4982d4..071d7b2c 100644 --- 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() diff --git a/src/test/gtest/CMakeLists.txt b/src/test/gtest/CMakeLists.txt index f11bbb52..41b50f64 100644 --- 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) diff --git a/src/test/gtest/googlemock/CMakeLists.txt b/src/test/gtest/googlemock/CMakeLists.txt index d32b70b5..838ee9b4 100644 --- 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() diff --git a/src/test/gtest/googletest/CMakeLists.txt b/src/test/gtest/googletest/CMakeLists.txt index db292946..8d6b0719 100644 --- 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) >From 6b6fc647393eb8f0ad5cc6b19511d51db89bc40d Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna <[email protected]> Date: Mon, 8 Sep 2025 15:05:34 +0200 Subject: [PATCH 2/3] Find and use system googletest if available --- src/test/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index f0b9b7e6..7909d871 100644 --- 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 >From 6e678a9588a5828172bac71c713f6eed6cb0570d Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna <[email protected]> Date: Mon, 8 Sep 2025 15:05:58 +0200 Subject: [PATCH 3/3] Bump minimum std-version to 17, fixing FTBFS with new gcc-15 and googletest --- CMakeLists.txt | 2 +- src/test/gtest/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 280d74a6..3677c6d5 100644 --- 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) #################################### diff --git a/src/test/gtest/CMakeLists.txt b/src/test/gtest/CMakeLists.txt index 41b50f64..a451d0b6 100644 --- 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)
