Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package marisa for openSUSE:Factory checked in at 2026-02-14 21:38:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marisa (Old) and /work/SRC/openSUSE:Factory/.marisa.new.1977 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marisa" Sat Feb 14 21:38:21 2026 rev:12 rq:1333005 version:0.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/marisa/marisa.changes 2025-06-18 17:59:25.024225340 +0200 +++ /work/SRC/openSUSE:Factory/.marisa.new.1977/marisa.changes 2026-02-14 21:39:48.478806139 +0100 @@ -1,0 +2,8 @@ +Sun Feb 8 13:14:53 UTC 2026 - Marguerite Su <[email protected]> + +- update version 0.3.1 + * see git commits +- add marisa-trie-0.3.1-bindings-python3.patch + * fix MARISA_MEMORY_ERROR ErrorCode in MARISA_THROW_IF + +------------------------------------------------------------------- Old: ---- marisa-trie-0.2.6.tar.gz New: ---- marisa-trie-0.3.1-bindings-python3.patch marisa-trie-0.3.1.tar.gz ----------(New B)---------- New: * see git commits - add marisa-trie-0.3.1-bindings-python3.patch * fix MARISA_MEMORY_ERROR ErrorCode in MARISA_THROW_IF ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marisa.spec ++++++ --- /var/tmp/diff_new_pack.ZOVycL/_old 2026-02-14 21:39:50.690897321 +0100 +++ /var/tmp/diff_new_pack.ZOVycL/_new 2026-02-14 21:39:50.702897816 +0100 @@ -1,7 +1,7 @@ # # spec file for package marisa # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %bcond_with perl %bcond_with ruby Name: marisa -Version: 0.2.6 +Version: 0.3.1 Release: 0 Summary: Matching Algorithm with Recursively Implemented StorAge License: BSD-2-Clause OR LGPL-2.1-or-later @@ -28,8 +28,14 @@ URL: https://github.com/s-yata/marisa-trie/ Source: https://github.com/s-yata/marisa-trie/archive/v%{version}/%{name}-trie-%{version}.tar.gz Source99: baselibs.conf +Patch0: marisa-trie-%{version}-bindings-python3.patch +BuildRequires: chrpath +BuildRequires: cmake +%if 0%{?suse_version} < 1600 +BuildRequires: gcc15-c++ +%else BuildRequires: gcc-c++ -BuildRequires: libtool +%endif %if %{with perl} BuildRequires: perl %endif @@ -124,15 +130,23 @@ %prep %setup -q -n marisa-trie-%{version} +%autopatch -p1 %build -autoreconf -fiv -%configure +%if 0%{?suse_version} < 1600 +export CC=%{_bindir}/gcc-15 +export CXX=%{_bindir}/g++-15 +%cmake -DCMAKE_C_COMPILER=%{_bindir}/gcc-15 \ + -DCMAKE_CXX_COMPILER=%{_bindir}/g++-15 \ + -DENABLE_TOOLS=ON +%else +%cmake -DENABLE_TOOLS=ON +%endif make %{?_smp_mflags} # build ruby %if %{with ruby} -pushd bindings/ruby +pushd ../bindings/ruby ruby extconf.rb --with-opt-include=../../include --with-opt-lib=../../lib/marisa/.libs --vendor make %{?_smp_mflags} popd @@ -140,26 +154,39 @@ # build python %if %{with python} -pushd bindings/python -swig -Wall -c++ -python -py3 -outdir . ../marisa-swig.i -mv ../marisa-swig_wrap.cxx . -export CPPFLAGS="-I../../include -L../../lib/marisa/.libs" +pushd ../bindings/python3 +#swig -Wall -c++ -python -py3 -outdir . ../marisa-swig.i +#mv ../marisa-swig_wrap.cxx . +export CFLAGS="-I%{_builddir}/%{name}-trie-%{version}/include -L%{_builddir}/%{name}-trie-%{version}/build" +export CXXFLAGS="-I%{_builddir}/%{name}-trie-%{version}/include -L%{_builddir}/%{name}-trie-%{version}/build" %pyproject_wheel popd %endif # build perl %if %{with perl} -pushd bindings/perl +pushd ../bindings/perl %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" INC="-I../../include" LIBS="-L../../lib/marisa/.libs" make %{?_smp_mflags} popd %endif %install -make install DESTDIR=%{buildroot} +%cmake_install rm -rf %{buildroot}%{_libdir}/libmarisa.{la,a} +# install libs +mkdir -p %{buildroot}%{_libdir} +install -m 0755 build/libmarisa.so.0.3.1 %{buildroot}%{_libdir} +ln -sf %{_libdir}/libmarisa.so.0.3.1 %{buildroot}%{_libdir}/libmarisa.so +ln -sf %{_libdir}/libmarisa.so.0.3.1 %{buildroot}%{_libdir}/libmarisa.so.0 + +# install tools +mkdir -p %{buildroot}%{_bindir} +for i in benchmark build common-prefix-search dump lookup predictive-search reverse-lookup; do + chrpath -d build/marisa-$i; + install -m 0755 build/marisa-$i %{buildroot}%{_bindir}/marisa-$i; +done # install ruby %if %{with ruby} @@ -170,7 +197,7 @@ # install python %if %{with python} -pushd bindings/python +pushd bindings/python3 %pyproject_install popd %endif @@ -205,7 +232,7 @@ %files -n libmarisa0 %defattr(-,root,root) %{_libdir}/libmarisa.so.0 -%{_libdir}/libmarisa.so.0.0.0 +%{_libdir}/libmarisa.so.%{version} %if %{with ruby} %files -n ruby-marisa @@ -237,4 +264,5 @@ %{_includedir}/%{name}.h %{_libdir}/libmarisa.so %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/Marisa ++++++ marisa-trie-0.3.1-bindings-python3.patch ++++++ Index: marisa-trie-0.3.1/bindings/python3/marisa-swig-python3.cxx =================================================================== --- marisa-trie-0.3.1.orig/bindings/python3/marisa-swig-python3.cxx +++ marisa-trie-0.3.1/bindings/python3/marisa-swig-python3.cxx @@ -28,7 +28,7 @@ size_t Query::query_id() const { } Keyset::Keyset() : keyset_(new (std::nothrow) marisa::Keyset) { - MARISA_THROW_IF(keyset_ == NULL, ::MARISA_MEMORY_ERROR); + MARISA_THROW_IF(keyset_ == NULL, std::runtime_error); } Keyset::~Keyset() { @@ -83,7 +83,7 @@ void Keyset::clear() { Agent::Agent() : agent_(new (std::nothrow) marisa::Agent), buf_(NULL), buf_size_(0) { - MARISA_THROW_IF(agent_ == NULL, ::MARISA_MEMORY_ERROR); + MARISA_THROW_IF(agent_ == NULL, std::runtime_error); } Agent::~Agent() { @@ -102,7 +102,7 @@ void Agent::set_query(const char *ptr, s } } char *new_buf = new (std::nothrow) char[new_buf_size]; - MARISA_THROW_IF(new_buf == NULL, MARISA_MEMORY_ERROR); + MARISA_THROW_IF(new_buf == NULL, std::runtime_error); delete [] buf_; buf_ = new_buf; buf_size_ = new_buf_size; @@ -142,7 +142,7 @@ size_t Agent::query_id() const { } Trie::Trie() : trie_(new (std::nothrow) marisa::Trie) { - MARISA_THROW_IF(trie_ == NULL, ::MARISA_MEMORY_ERROR); + MARISA_THROW_IF(trie_ == NULL, std::runtime_error); } Trie::~Trie() { @@ -196,7 +196,7 @@ void Trie::reverse_lookup(size_t id, agent.set_query(id); trie_->reverse_lookup(agent); char * const buf = new (std::nothrow) char[agent.key().length()]; - MARISA_THROW_IF(buf == NULL, MARISA_MEMORY_ERROR); + MARISA_THROW_IF(buf == NULL, std::runtime_error); std::memcpy(buf, agent.key().ptr(), agent.key().length()); *ptr_out_to_be_deleted = buf; *length_out = agent.key().length(); ++++++ marisa-trie-0.2.6.tar.gz -> marisa-trie-0.3.1.tar.gz ++++++ ++++ 34766 lines of diff (skipped)
