CVS commit: pkgsrc/textproc/lucene++

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Oct 16 15:01:52 UTC 2025

Modified Files:
        pkgsrc/textproc/lucene++: Makefile distinfo
Added Files:
        pkgsrc/textproc/lucene++/patches: patch-cmake_dependencies.cmake
            patch-include_lucene++_Collection.h patch-include_lucene++_Set.h
            patch-src_contrib_CMakeLists.txt patch-src_core_CMakeLists.txt

Log Message:
lucene++: fix build with Clang and Boost


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/textproc/lucene++/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/lucene++/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/lucene++/patches/patch-cmake_dependencies.cmake \
    pkgsrc/textproc/lucene++/patches/patch-include_lucene++_Collection.h \
    pkgsrc/textproc/lucene++/patches/patch-include_lucene++_Set.h \
    pkgsrc/textproc/lucene++/patches/patch-src_contrib_CMakeLists.txt \
    pkgsrc/textproc/lucene++/patches/patch-src_core_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/lucene++/Makefile
diff -u pkgsrc/textproc/lucene++/Makefile:1.28 pkgsrc/textproc/lucene++/Makefile:1.29
--- pkgsrc/textproc/lucene++/Makefile:1.28      Sat Sep 27 09:57:37 2025
+++ pkgsrc/textproc/lucene++/Makefile   Thu Oct 16 15:01:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2025/09/27 09:57:37 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2025/10/16 15:01:51 adam Exp $
 
 DISTNAME=      lucene++-3.0.9
 PKGREVISION=   3
@@ -12,7 +12,8 @@ HOMEPAGE=     https://github.com/luceneplusp
 COMMENT=       C++ port of Lucene text search library
 LICENSE=       gnu-lgpl-v3 OR apache-2.0
 
-USE_LANGUAGES= c c++
+USE_CXX_FEATURES=      c++11
+USE_LANGUAGES=         c c++
 
 CMAKE_CONFIGURE_ARGS+= -DENABLE_DEMO=OFF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_TEST=OFF

Index: pkgsrc/textproc/lucene++/distinfo
diff -u pkgsrc/textproc/lucene++/distinfo:1.7 pkgsrc/textproc/lucene++/distinfo:1.8
--- pkgsrc/textproc/lucene++/distinfo:1.7       Thu Jan 23 20:56:32 2025
+++ pkgsrc/textproc/lucene++/distinfo   Thu Oct 16 15:01:51 2025
@@ -1,11 +1,16 @@
-$NetBSD: distinfo,v 1.7 2025/01/23 20:56:32 wiz Exp $
+$NetBSD: distinfo,v 1.8 2025/10/16 15:01:51 adam Exp $
 
 BLAKE2s (lucene++-3.0.9.tar.gz) = 3dcc3352e3c0e1f13c093be12f982f6ef9107a9250884c22288fc568d7205f69
 SHA512 (lucene++-3.0.9.tar.gz) = 220fe1b46518018d176ae16434f03b1453fc345d8d552a294d1af927ea4ab69a83ee4b03c82938e648edaa3e7064526ca047fc86e1c71743b0958b520d59e225
 Size (lucene++-3.0.9.tar.gz) = 2458287 bytes
 SHA1 (patch-CMakeLists.txt) = db25e72a4c4d5dc38b9c805b75bf7c4469f7029d
 SHA1 (patch-cmake_cotire.cmake) = a0a8416e54054ae9c4871ed987f8a2cb51848daa
+SHA1 (patch-cmake_dependencies.cmake) = 26275630ce9cd2766eb01be6fffc0673f12634c0
+SHA1 (patch-include_lucene++_Collection.h) = 1fbfbcc8128ed1379fcde791e60b94249dfdfbf2
+SHA1 (patch-include_lucene++_Set.h) = 5ef271985b1fe69515c515603b9386b161eb1c36
 SHA1 (patch-include_lucene++_ThreadPool.h) = f7038f90852b45ff4ffe9775cd2878150bb996a9
+SHA1 (patch-src_contrib_CMakeLists.txt) = 34ff1ed5c2b4c4b6a44c7f3a69029f1881c93747
+SHA1 (patch-src_core_CMakeLists.txt) = d06080834aaa77a8d14b5c5bcd094e3cdb6784b3
 SHA1 (patch-src_core_store_MMapDirectory.cpp) = b71a9f30cef213beb8f777f5bcbde721281e5f6c
 SHA1 (patch-src_core_util_FileUtils.cpp) = e77b05f575cdcc56d5e4b85fad8411b11b53be26
 SHA1 (patch-src_core_util_ThreadPool.cpp) = 6ce4b1f0333c420a83a69fe3f2d8e89acb51e3e2

Added files:

Index: pkgsrc/textproc/lucene++/patches/patch-cmake_dependencies.cmake
diff -u /dev/null pkgsrc/textproc/lucene++/patches/patch-cmake_dependencies.cmake:1.1
--- /dev/null   Thu Oct 16 15:01:52 2025
+++ pkgsrc/textproc/lucene++/patches/patch-cmake_dependencies.cmake     Thu Oct 16 15:01:52 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-cmake_dependencies.cmake,v 1.1 2025/10/16 15:01:52 adam Exp $
+
+Don't look for boost_system library.
+
+--- cmake/dependencies.cmake.orig      2025-10-16 14:51:38.028310288 +0000
++++ cmake/dependencies.cmake
+@@ -7,7 +7,6 @@ find_package(Boost COMPONENTS
+   filesystem
+   iostreams
+   regex
+-  system
+   thread
+   REQUIRED
+ )
Index: pkgsrc/textproc/lucene++/patches/patch-include_lucene++_Collection.h
diff -u /dev/null pkgsrc/textproc/lucene++/patches/patch-include_lucene++_Collection.h:1.1
--- /dev/null   Thu Oct 16 15:01:52 2025
+++ pkgsrc/textproc/lucene++/patches/patch-include_lucene++_Collection.h        Thu Oct 16 15:01:52 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-include_lucene++_Collection.h,v 1.1 2025/10/16 15:01:52 adam Exp $
+
+Fix compilation with clang-17.
+https://github.com/luceneplusplus/LucenePlusPlus/pull/213
+
+--- include/lucene++/Collection.h.orig 2025-10-16 14:56:08.117208074 +0000
++++ include/lucene++/Collection.h
+@@ -167,7 +167,7 @@ public:
+     }
+ 
+     void swap(this_type& other) {
+-        container.swap(other->container);
++        container.swap(other.container);
+     }
+ 
+     TYPE& operator[] (int32_t pos) {
Index: pkgsrc/textproc/lucene++/patches/patch-include_lucene++_Set.h
diff -u /dev/null pkgsrc/textproc/lucene++/patches/patch-include_lucene++_Set.h:1.1
--- /dev/null   Thu Oct 16 15:01:52 2025
+++ pkgsrc/textproc/lucene++/patches/patch-include_lucene++_Set.h       Thu Oct 16 15:01:52 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-include_lucene++_Set.h,v 1.1 2025/10/16 15:01:52 adam Exp $
+
+Fix compilation with clang-17.
+https://github.com/luceneplusplus/LucenePlusPlus/pull/213
+
+--- include/lucene++/Set.h.orig        2025-10-16 14:57:03.550906159 +0000
++++ include/lucene++/Set.h
+@@ -108,7 +108,7 @@ public:
+     }
+ 
+     void swap(this_type& other) {
+-        setContainer.swap(other->setContainer);
++        setContainer.swap(other.setContainer);
+     }
+ 
+     operator bool() const {
Index: pkgsrc/textproc/lucene++/patches/patch-src_contrib_CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/lucene++/patches/patch-src_contrib_CMakeLists.txt:1.1
--- /dev/null   Thu Oct 16 15:01:52 2025
+++ pkgsrc/textproc/lucene++/patches/patch-src_contrib_CMakeLists.txt   Thu Oct 16 15:01:52 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_contrib_CMakeLists.txt,v 1.1 2025/10/16 15:01:52 adam Exp $
+
+Don't link against boost_system library.
+
+--- src/contrib/CMakeLists.txt.orig    2025-10-16 14:53:03.158606416 +0000
++++ 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++)
Index: pkgsrc/textproc/lucene++/patches/patch-src_core_CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/lucene++/patches/patch-src_core_CMakeLists.txt:1.1
--- /dev/null   Thu Oct 16 15:01:52 2025
+++ pkgsrc/textproc/lucene++/patches/patch-src_core_CMakeLists.txt      Thu Oct 16 15:01:52 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_core_CMakeLists.txt,v 1.1 2025/10/16 15:01:52 adam Exp $
+
+Don't link against boost_system library.
+
+--- src/core/CMakeLists.txt.orig       2025-10-16 14:50:59.049178904 +0000
++++ src/core/CMakeLists.txt
+@@ -57,7 +57,6 @@ target_link_libraries(lucene++
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+ )