Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package clucene-core for openSUSE:Factory checked in at 2024-07-24 15:32:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clucene-core (Old) and /work/SRC/openSUSE:Factory/.clucene-core.new.1869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clucene-core" Wed Jul 24 15:32:58 2024 rev:32 rq:1188998 version:2.3.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/clucene-core/clucene-core.changes 2022-07-05 12:27:28.565870595 +0200 +++ /work/SRC/openSUSE:Factory/.clucene-core.new.1869/clucene-core.changes 2024-07-25 11:47:16.441634681 +0200 @@ -1,0 +2,7 @@ +Thu Jul 18 13:32:01 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com> + +- Add clucene-reprobuild.patch to allow libreoffice + reproducible builds (boo#1047218) + => New Provides for libclucene2(setStartVersion) + +------------------------------------------------------------------- New: ---- clucene-reprobuild.patch BETA DEBUG BEGIN: New: - Add clucene-reprobuild.patch to allow libreoffice reproducible builds (boo#1047218) BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clucene-core.spec ++++++ --- /var/tmp/diff_new_pack.52Yccv/_old 2024-07-25 11:47:17.421673376 +0200 +++ /var/tmp/diff_new_pack.52Yccv/_new 2024-07-25 11:47:17.425673533 +0200 @@ -33,6 +33,8 @@ Patch2: clucene-kill-ext-includes.diff Patch3: clucene-new-gcc.patch Patch4: gcc12-header-files.patch +# PATCH-FIX-UPSTREAM https://gerrit.libreoffice.org/c/core/+/158845 +Patch5: clucene-reprobuild.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -56,6 +58,7 @@ Group: System/Libraries Obsoletes: libclucene2 < %{version}-%{release} Provides: libclucene2 = %{version}-%{release} +Provides: libclucene2(setStartVersion) %description -n libclucene-core1 CLucene is a C++ port of Lucene. It is a high-performance, full-featured text ++++++ clucene-reprobuild.patch ++++++ from https://gerrit.libreoffice.org/c/core/+/158845 diff -ur clucene.org/src/core/CLucene/index/IndexWriter.cpp clucene/src/core/CLucene/index/IndexWriter.cpp --- clucene.org/src/core/CLucene/index/IndexWriter.cpp 2023-11-02 17:31:00.110168174 +0100 +++ clucene/src/core/CLucene/index/IndexWriter.cpp 2023-11-02 17:33:22.507665912 +0100 @@ -366,6 +366,10 @@ } } +void IndexWriter::setSegmentInfoStartVersion(int64_t startVersion) { + this->segmentInfos->setStartVersion(startVersion); +} + int32_t IndexWriter::getMaxBufferedDocs() { ensureOpen(); return docWriter->getMaxBufferedDocs(); diff -ur clucene.org/src/core/CLucene/index/IndexWriter.h clucene/src/core/CLucene/index/IndexWriter.h --- clucene.org/src/core/CLucene/index/IndexWriter.h 2023-11-02 17:31:00.113501525 +0100 +++ clucene/src/core/CLucene/index/IndexWriter.h 2023-11-02 17:33:43.547787510 +0100 @@ -336,6 +336,12 @@ int64_t getWriteLockTimeout(); /** + * Sets the 0th segmentinfo version. Default is current system time + * in milliseconds + */ + void setSegmentInfoStartVersion(int64_t startVersion); + + /** * Sets the maximum time to wait for a commit lock (in milliseconds). */ void setCommitLockTimeout(int64_t commitLockTimeout); diff -ur clucene.org/src/core/CLucene/index/SegmentInfos.cpp clucene/src/core/CLucene/index/SegmentInfos.cpp --- clucene.org/src/core/CLucene/index/SegmentInfos.cpp 2023-11-02 17:31:00.110168174 +0100 +++ clucene/src/core/CLucene/index/SegmentInfos.cpp 2023-11-02 18:04:43.855243418 +0100 @@ -662,6 +662,10 @@ return IndexFileNames::fileNameFromGeneration( IndexFileNames::SEGMENTS, "", nextGeneration ); } + void SegmentInfos::setStartVersion(int64_t version) { + this->version = version; + } + void SegmentInfos::clearto(size_t from, size_t end){ size_t range = end - from; if ( (infos.size() - from) >= range) { // Make sure we actually need to remove diff -ur clucene.org/src/core/CLucene/index/_SegmentInfos.h clucene/src/core/CLucene/index/_SegmentInfos.h --- clucene.org/src/core/CLucene/index/_SegmentInfos.h 2023-11-02 17:31:00.106834824 +0100 +++ clucene/src/core/CLucene/index/_SegmentInfos.h 2023-11-02 18:04:51.178598463 +0100 @@ -347,6 +347,13 @@ */ std::string getNextSegmentFileName(); + /** + * Set version value to start from + + Defaults to current time in milliseconds + */ + void setStartVersion(int64_t version); + /* public vector-like operations */ //delete and clears objects 'from' from to 'to' void clearto(size_t to, size_t end);