public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/snowball] rawhide: Version 3.1.1
@ 2026-06-08 17:04 Jerry James
0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-06-08 17:04 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/snowball
Branch : rawhide
Commit : 5ae7a8315788b3e8ec04b73ea96f65d76599ec5d
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-06-08T11:04:21-06:00
Stats : +11/-29 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/snowball/c/5ae7a8315788b3e8ec04b73ea96f65d76599ec5d?branch=rawhide
Log:
Version 3.1.1
- Drop upstreamed segfault patch
---
diff --git a/287.patch b/287.patch
deleted file mode 100644
index ab85220..0000000
--- a/287.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ed8dead327ae76d5215b60fc6b120c458b8d4f06 Mon Sep 17 00:00:00 2001
-From: Jerry James <loganjerry@gmail.com>
-Date: Fri, 22 May 2026 10:09:35 -0600
-Subject: [PATCH] Avoid a segfault in the analyser
-
-The errors/string-omitted test segfaults without this
----
- compiler/analyser.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/compiler/analyser.c b/compiler/analyser.c
-index dccf1ba2..281db339 100644
---- a/compiler/analyser.c
-+++ b/compiler/analyser.c
-@@ -1393,7 +1393,7 @@ static struct node * read_C(struct analyser * a) {
- struct node * n = new_string_command(a, token);
- if (n->name) {
- n->name->value_used = true;
-- } else if (SIZE(n->literalstring) == 0) {
-+ } else if (n->literalstring == NULL || SIZE(n->literalstring) == 0) {
- switch (token) {
- case c_insert:
- case c_attach:
diff --git a/snowball.spec b/snowball.spec
index af2e2d9..edca2be 100644
--- a/snowball.spec
+++ b/snowball.spec
@@ -12,7 +12,7 @@
%global giturl https://github.com/snowballstem/snowball
Name: snowball
-Version: 3.1.0
+Version: 3.1.1
Release: %autorelease
Summary: Snowball compiler and stemming algorithms
@@ -24,10 +24,8 @@ Source0: %{giturl}/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/snowballstem/snowball-data/archive/refs/heads/main.zip
# Build a shared library instead of a static library
Patch: %{name}-sharedlib.patch
-# Avoid a segfault in the analyzer
-Patch: %{giturl}/pull/287.patch
-BuildRequires: gcc
+BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: perl-interpreter
BuildRequires: %{py3_dist docutils}
@@ -163,6 +161,9 @@ sed -Ei 's@\$\(python\) -m build [^\)]*@cp -a * ../../python@' GNUmakefile
ln -s ../libstemmer/modules.txt python
ln -s . python/src
+# Use Fedora C++ build flags
+sed -i 's|^\(CXXFLAGS=\).*|\1%{build_cxxflags}|' GNUmakefile
+
%generate_buildrequires
%pyproject_buildrequires -d python
@@ -171,6 +172,9 @@ ln -s . python/src
sed -i 's|^\(EXECFLAGS=\).*|\1%{build_cflags}|' GNUmakefile
%make_build
+# Build the C++ algorithms
+%make_build cxx
+
%ifarch %{java_arches}
# Build the Java algorithms
%make_build dist_libstemmer_java
@@ -230,6 +234,7 @@ cd -
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
mv ../snowball-data-main ../snowball-data
make check
+make check_cxx
%ifarch %{java_arches}
make check_java
%endif
diff --git a/sources b/sources
index b4feb08..eaa4641 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (main.zip) = 4e87b6bf87f7e31155b45c101ca4d65149307d5cbb14c6dda8fc1f0a1f70fd13f93d4634e72513c195c2199eadb9fee62521c795fb58290c608a18933c8a9a14
-SHA512 (snowball-3.1.0.tar.gz) = 07ab68f726063a0655d8c8d98032281a3aef8e2bdbc2f30654ca770c21b7a650775912ebaeb641960653acf53bd4228074793e35aaa78550c614c238f3fe1d8c
+SHA512 (main.zip) = 1ca88959b6958133d97c07b9688781ff58cef5a4c5c9d30f9ab99e583579f955082c6428743fbb5dd3ee0c958a92f72a470ef28482f52af19ab476ebdd504b1d
+SHA512 (snowball-3.1.1.tar.gz) = 47a33f6319a728238b93b344a29c49b9aeb76bc8202b891da8134660be97d256e35980a25e557637c74fa6a8aff00b7e2d8e406d52b03233b71644989e4be9ac
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-08 17:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-08 17:04 [rpms/snowball] rawhide: Version 3.1.1 Jerry James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox