CVS commit: pkgsrc/textproc/lucene++

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/lucene++
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 21 Apr 2024 17:28:32 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Apr 21 17:28:32 UTC 2024

Modified Files:
        pkgsrc/textproc/lucene++: Makefile PLIST distinfo
        pkgsrc/textproc/lucene++/patches: patch-cmake_cotire.cmake
Added Files:
        pkgsrc/textproc/lucene++/patches:
            patch-src_core_store_MMapDirectory.cpp
            patch-src_core_util_FileUtils.cpp
Removed Files:
        pkgsrc/textproc/lucene++/patches: patch-include_VariantUtils.h
            patch-liblucene++-contrib.pc.cmake patch-liblucene++.pc.cmake

Log Message:
lucene++: updated to 3.0.9

3.0.9
Unknown changes


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/textproc/lucene++/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/lucene++/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/lucene++/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/lucene++/patches/patch-cmake_cotire.cmake
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/textproc/lucene++/patches/patch-include_VariantUtils.h \
    pkgsrc/textproc/lucene++/patches/patch-liblucene++-contrib.pc.cmake \
    pkgsrc/textproc/lucene++/patches/patch-liblucene++.pc.cmake
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/lucene++/patches/patch-src_core_store_MMapDirectory.cpp \
    pkgsrc/textproc/lucene++/patches/patch-src_core_util_FileUtils.cpp

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.22 pkgsrc/textproc/lucene++/Makefile:1.23
--- pkgsrc/textproc/lucene++/Makefile:1.22      Fri Dec 29 18:24:59 2023
+++ pkgsrc/textproc/lucene++/Makefile   Sun Apr 21 17:28:32 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2023/12/29 18:24:59 adam Exp $
+# $NetBSD: Makefile,v 1.23 2024/04/21 17:28:32 adam Exp $
 
-DISTNAME=      LucenePlusPlus-rel_3.0.7
-PKGNAME=       ${DISTNAME:S/LucenePlusPlus-rel_/lucene++-/}
-PKGREVISION=   20
+DISTNAME=      lucene++-3.0.9
 CATEGORIES=    textproc
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=luceneplusplus/LucenePlusPlus/archive/rel_${PKGVERSION_NOREV}/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=luceneplusplus/}
+GITHUB_PROJECT=        LucenePlusPlus
+GITHUB_TAG=    rel_${PKGVERSION_NOREV}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/luceneplusplus/LucenePlusPlus/
@@ -12,10 +12,11 @@ COMMENT=    C++ port of Lucene text search 
 LICENSE=       gnu-lgpl-v3 OR apache-2.0
 
 USE_LANGUAGES= c c++
-USE_CMAKE=     yes
 
-CMAKE_ARGS+=   -DENABLE_DEMO=no
+CMAKE_ARGS+=   -DENABLE_DEMO=OFF
+CMAKE_ARGS+=   -DENABLE_TEST=OFF
 
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/lucene++/PLIST
diff -u pkgsrc/textproc/lucene++/PLIST:1.1 pkgsrc/textproc/lucene++/PLIST:1.2
--- pkgsrc/textproc/lucene++/PLIST:1.1  Sat Oct 17 03:02:47 2015
+++ pkgsrc/textproc/lucene++/PLIST      Sun Apr 21 17:28:32 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/10/17 03:02:47 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/04/21 17:28:32 adam Exp $
 include/lucene++/ASCIIFoldingFilter.h
 include/lucene++/AbstractAllTermDocs.h
 include/lucene++/AbstractField.h
@@ -453,11 +453,15 @@ include/lucene++/WildcardQuery.h
 include/lucene++/WildcardTermEnum.h
 include/lucene++/WordlistLoader.h
 include/lucene++/targetver.h
+lib/cmake/liblucene++-contrib/liblucene++-contribConfig.cmake
+lib/cmake/liblucene++-contrib/liblucene++-contribConfigVersion.cmake
+lib/cmake/liblucene++/liblucene++Config.cmake
+lib/cmake/liblucene++/liblucene++ConfigVersion.cmake
 lib/liblucene++-contrib.so
-lib/liblucene++-contrib.so.0
 lib/liblucene++-contrib.so.${PKGVERSION}
+lib/liblucene++-contrib.so.0
 lib/liblucene++.so
-lib/liblucene++.so.0
 lib/liblucene++.so.${PKGVERSION}
+lib/liblucene++.so.0
 lib/pkgconfig/liblucene++-contrib.pc
 lib/pkgconfig/liblucene++.pc

Index: pkgsrc/textproc/lucene++/distinfo
diff -u pkgsrc/textproc/lucene++/distinfo:1.5 pkgsrc/textproc/lucene++/distinfo:1.6
--- pkgsrc/textproc/lucene++/distinfo:1.5       Tue Oct 26 11:22:20 2021
+++ pkgsrc/textproc/lucene++/distinfo   Sun Apr 21 17:28:32 2024
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:22:20 nia Exp $
+$NetBSD: distinfo,v 1.6 2024/04/21 17:28:32 adam Exp $
 
-BLAKE2s (LucenePlusPlus-rel_3.0.7.tar.gz) = 031277c325d00d26a17271832465d59c7eb52573af699acefdf9597a6d84563e
-SHA512 (LucenePlusPlus-rel_3.0.7.tar.gz) = 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220
-Size (LucenePlusPlus-rel_3.0.7.tar.gz) = 2013570 bytes
+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) = 16371f38024a1e629c3efc30dcf8955bc9606be1
-SHA1 (patch-include_VariantUtils.h) = 4c71eaee81b18fe7019ca3006804713f3117cac9
-SHA1 (patch-liblucene++-contrib.pc.cmake) = 6317251e9d8f569f08b8505edc58d2b628117c5f
-SHA1 (patch-liblucene++.pc.cmake) = 2d8efacfda33adbe4564402458744dd259f24ac7
+SHA1 (patch-cmake_cotire.cmake) = a0a8416e54054ae9c4871ed987f8a2cb51848daa
+SHA1 (patch-src_core_store_MMapDirectory.cpp) = b71a9f30cef213beb8f777f5bcbde721281e5f6c
+SHA1 (patch-src_core_util_FileUtils.cpp) = e77b05f575cdcc56d5e4b85fad8411b11b53be26

Index: pkgsrc/textproc/lucene++/patches/patch-cmake_cotire.cmake
diff -u pkgsrc/textproc/lucene++/patches/patch-cmake_cotire.cmake:1.1 pkgsrc/textproc/lucene++/patches/patch-cmake_cotire.cmake:1.2
--- pkgsrc/textproc/lucene++/patches/patch-cmake_cotire.cmake:1.1       Tue Mar 15 00:24:29 2016
+++ pkgsrc/textproc/lucene++/patches/patch-cmake_cotire.cmake   Sun Apr 21 17:28:32 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-cmake_cotire.cmake,v 1.1 2016/03/15 00:24:29 tnn Exp $
+$NetBSD: patch-cmake_cotire.cmake,v 1.2 2024/04/21 17:28:32 adam Exp $
 
 Disable precompiled headers. Makes GCC segfault on NetBSD-7.0-i386.
 
---- cmake/cotire.cmake.orig    2015-01-30 16:14:22.000000000 +0000
+--- cmake/cotire.cmake.orig    2024-02-18 18:18:26.000000000 +0000
 +++ cmake/cotire.cmake
-@@ -2956,6 +2956,9 @@ function (cotire_setup_clean_all_target)
+@@ -3557,6 +3557,9 @@ function (cotire_setup_clean_all_target)
  endfunction()
  
  function (cotire)
@@ -12,9 +12,9 @@ Disable precompiled headers. Makes GCC s
 +# nothing, disable use of precompiled headers
 +else()
        set(_options "")
-       set(_oneValueArgs SOURCE_DIR BINARY_DIR)
+       set(_oneValueArgs "")
        set(_multiValueArgs LANGUAGES CONFIGURATIONS)
-@@ -2980,6 +2983,7 @@ function (cotire)
+@@ -3574,6 +3577,7 @@ function (cotire)
                        cotire_target_link_libraries(${_target})
                endif()
        endforeach()

Added files:

Index: pkgsrc/textproc/lucene++/patches/patch-src_core_store_MMapDirectory.cpp
diff -u /dev/null pkgsrc/textproc/lucene++/patches/patch-src_core_store_MMapDirectory.cpp:1.1
--- /dev/null   Sun Apr 21 17:28:32 2024
+++ pkgsrc/textproc/lucene++/patches/patch-src_core_store_MMapDirectory.cpp     Sun Apr 21 17:28:32 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_store_MMapDirectory.cpp,v 1.1 2024/04/21 17:28:32 adam Exp $
+
+Fix build with newer boost.
+
+--- src/core/store/MMapDirectory.cpp.orig      2024-04-21 17:18:00.396087158 +0000
++++ src/core/store/MMapDirectory.cpp
+@@ -36,7 +36,7 @@ MMapIndexInput::MMapIndexInput(const Str
+     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));
+         }
Index: pkgsrc/textproc/lucene++/patches/patch-src_core_util_FileUtils.cpp
diff -u /dev/null pkgsrc/textproc/lucene++/patches/patch-src_core_util_FileUtils.cpp:1.1
--- /dev/null   Sun Apr 21 17:28:32 2024
+++ pkgsrc/textproc/lucene++/patches/patch-src_core_util_FileUtils.cpp  Sun Apr 21 17:28:32 2024
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_core_util_FileUtils.cpp,v 1.1 2024/04/21 17:28:32 adam Exp $
+
+Fix build with newer boost.
+
+--- src/core/util/FileUtils.cpp.orig   2024-04-21 17:22:39.775305801 +0000
++++ src/core/util/FileUtils.cpp
+@@ -5,7 +5,7 @@
+ /////////////////////////////////////////////////////////////////////////////
+ 
+ #include "LuceneInc.h"
+-#include <boost/filesystem/convenience.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include "LuceneThread.h"
+@@ -128,12 +128,12 @@ String joinPath(const String& path, cons
+ }
+ 
+ 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();
+ }
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/textproc/yq
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/textproc/yq
Indexes:

Home | Main Index | Thread Index | Old Index