[PR PATCH] snowball: update to 2.2.0.

[PR PATCH] snowball: update to 2.2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1218 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages snowball-2.2.0
https://github.com/void-linux/void-packages/pull/34402

snowball: update to 2.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34402.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snowball-2.2.0-34402.patch --]
[-- Type: text/x-diff, Size: 3513 bytes --]

From b91b688e863848eb2f711a63936b37c9cd9a01cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 26 Nov 2021 00:26:34 +0100
Subject: [PATCH] snowball: update to 2.2.0.

---
 .../snowball/patches/libstemmer-library.patch | 22 +++++++++----------
 srcpkgs/snowball/template                     |  9 +++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
index 4dbb89061bee..6e62d55065de 100644
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -3,24 +3,24 @@ https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8
 
 --- a/GNUmakefile
 +++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
+@@ -175,7 +175,7 @@
  
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ INCLUDES=-Iinclude
  
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt
+ 	libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt
+@@ -225,6 +225,9 @@
+ libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
  	$(AR) -cru $@ $^
  
 +libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
 +	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
 +
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ examples/%.o: examples/%.c
+ 	$(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
  
 --- /dev/null
 +++ b/libstemmer/symbol.map
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
index 784d281e1453..4ae63201d435 100644
--- a/srcpkgs/snowball/template
+++ b/srcpkgs/snowball/template
@@ -1,6 +1,6 @@
 # Template file for 'snowball'
 pkgname=snowball
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=gnu-makefile
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="BSD-3-Clause"
 homepage="https://snowballstem.org/"
 distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+checksum=425cdb5fba13a01db59a1713780f0662e984204f402d3dae1525bda9e6d30f1a
 
 post_patch() {
 	if [ -n "$CROSS_BUILD" ]; then
@@ -25,14 +25,11 @@ do_install() {
 	vbin stemwords
 
 	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.a 644 usr/lib
 	vinstall libstemmer.so.$version 644 usr/lib
 	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
 	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
 
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
 	vlicense COPYING
 }
 

Re: [PR PATCH] [Merged]: snowball: update to 2.2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1060 bytes --]

There's a merged pull request on the void-packages repository

snowball: update to 2.2.0.
https://github.com/void-linux/void-packages/pull/34402

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->