[packages/lucene++] - up to 3.0.9

baggins baggins at pld-linux.org
Fri Dec 27 02:09:17 CET 2024


commit c0d79b1f4d11bb6e366f997ad0868db6fb2d77a8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Dec 27 01:14:57 2024 +0100

    - up to 3.0.9

 boost-1.85.patch        | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 config-install.patch    | 34 --------------------------
 contrib-soversion.patch | 11 ---------
 lucene++.spec           | 16 ++++---------
 pkgconfig.patch         | 35 ---------------------------
 stdc++.patch            | 13 ----------
 6 files changed, 69 insertions(+), 104 deletions(-)
---
diff --git a/lucene++.spec b/lucene++.spec
index 79d1e45..dff2347 100644
--- a/lucene++.spec
+++ b/lucene++.spec
@@ -1,15 +1,12 @@
 Summary:	A high-performance, full-featured text search engine written in C++
 Name:		lucene++
-Version:	3.0.8
-Release:	2
+Version:	3.0.9
+Release:	1
 License:	Apache v2.0 or LGPLv3+
 Group:		Libraries
 Source0:	https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	cb9b2e7cb37b7dd68c1e24a65c6eda9d
-Patch0:		stdc++.patch
-Patch1:		contrib-soversion.patch
-Patch2:		config-install.patch
-Patch3:		pkgconfig.patch
+# Source0-md5:	33da6751de47523e22e7a1beebd78c29
+Patch4:		boost-1.85.patch
 URL:		https://github.com/luceneplusplus/LucenePlusPlus
 BuildRequires:	boost-devel
 BuildRequires:	cmake >= 2.8.6
@@ -32,10 +29,7 @@ search engine written in C++
 
 %prep
 %setup -q -n LucenePlusPlus-rel_%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
 
 %build
 mkdir -p build
diff --git a/boost-1.85.patch b/boost-1.85.patch
new file mode 100644
index 0000000..05babf9
--- /dev/null
+++ b/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 at 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/config-install.patch b/config-install.patch
deleted file mode 100644
index 9e78982..0000000
--- a/config-install.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- LucenePlusPlus-rel_3.0.8/src/config/core/CMakeLists.txt~	2020-12-29 13:10:43.000000000 +0100
-+++ LucenePlusPlus-rel_3.0.8/src/config/core/CMakeLists.txt	2023-09-29 00:02:15.841206794 +0200
-@@ -9,7 +9,7 @@
-   install(
-     FILES
-       "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc"
--    DESTINATION "include/pkgconfig")
-+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- endif()
- 
- 
-@@ -30,4 +30,4 @@
-   FILES
-     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake"
-     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake"
--  DESTINATION "include/cmake")
-+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake")
---- LucenePlusPlus-rel_3.0.8/src/config/contrib/CMakeLists.txt~	2020-12-29 13:10:43.000000000 +0100
-+++ LucenePlusPlus-rel_3.0.8/src/config/contrib/CMakeLists.txt	2023-09-29 00:02:56.495779531 +0200
-@@ -9,7 +9,7 @@
-   install(
-     FILES
-       "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc"
--    DESTINATION "include/pkgconfig")
-+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- endif()
- 
- 
-@@ -30,4 +30,4 @@
-   FILES
-     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake"
-     "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake"
--  DESTINATION "include/cmake")
-+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake")
diff --git a/contrib-soversion.patch b/contrib-soversion.patch
deleted file mode 100644
index a936e45..0000000
--- a/contrib-soversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- LucenePlusPlus-rel_3.0.8/src/contrib/CMakeLists.txt~	2020-12-29 13:10:43.000000000 +0100
-+++ LucenePlusPlus-rel_3.0.8/src/contrib/CMakeLists.txt	2023-09-28 23:53:45.245144003 +0200
-@@ -77,7 +77,7 @@
- ####################################
- 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/pkgconfig.patch b/pkgconfig.patch
deleted file mode 100644
index 512974d..0000000
--- a/pkgconfig.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- LucenePlusPlus-rel_3.0.8/src/config/core/liblucene++.pc.in~	2020-12-29 13:10:43.000000000 +0100
-+++ LucenePlusPlus-rel_3.0.8/src/config/core/liblucene++.pc.in	2023-09-29 09:03:57.213964577 +0200
-@@ -1,12 +1,11 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}/bin
--libdir=@LIB_DESTINATION@
-+libdir=@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 at LIB_DESTINATION@ -l${lib}
-+Libs: -L${libdir} -l${lib}
- Cflags: -I${includedir}
--
---- LucenePlusPlus-rel_3.0.8/src/config/contrib/liblucene++-contrib.pc.in~	2020-12-29 13:10:43.000000000 +0100
-+++ LucenePlusPlus-rel_3.0.8/src/config/contrib/liblucene++-contrib.pc.in	2023-09-29 09:04:44.724865773 +0200
-@@ -1,13 +1,12 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}/bin
--libdir=@LIB_DESTINATION@
-+libdir=@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 at LIB_DESTINATION@ -l${lib}
-+Libs: -L${libdir} -l${lib}
- Cflags: -I${includedir}
- Requires: liblucene++ = @lucene++_VERSION@
--
diff --git a/stdc++.patch b/stdc++.patch
deleted file mode 100644
index 78ee6b7..0000000
--- a/stdc++.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- LucenePlusPlus-rel_3.0.8/CMakeLists.txt.orig	2020-12-29 13:10:43.000000000 +0100
-+++ LucenePlusPlus-rel_3.0.8/CMakeLists.txt	2023-09-28 23:39:19.228743152 +0200
-@@ -46,10 +46,6 @@
- # build docs
- include(Lucene++Docs)
- 
--# Enable C++11
--set(CMAKE_CXX_STANDARD 11)
--set(CMAKE_CXX_STANDARD_REQUIRED ON)
--
- ####################################
- # platform specific options
- ####################################
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lucene++.git/commitdiff/c0d79b1f4d11bb6e366f997ad0868db6fb2d77a8



More information about the pld-cvs-commit mailing list