[arch-commits] Commit in snowball/trunk (PKGBUILD dynamiclib.patch)

[Antonio Rojas]

    Date: Sunday, November 21, 2021 @ 16:55:37
  Author: arojas
Revision: 428759

Update to 2.2.0

Modified:
  snowball/trunk/PKGBUILD
  snowball/trunk/dynamiclib.patch

------------------+
 PKGBUILD         |    6 +++---
 dynamiclib.patch |   35 ++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-21 16:45:42 UTC (rev 428758)
+++ PKGBUILD	2021-11-21 16:55:37 UTC (rev 428759)
@@ -2,7 +2,7 @@
 
 pkgbase=snowball
 pkgname=(snowball libstemmer)
-pkgver=2.1.0
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="String processing language for creating stemming algorithms"
 url="https://snowballstem.org/"
@@ -10,11 +10,11 @@
 license=(BSD)
 depends=(glibc)
 makedepends=(git)
-_commit=4764395431c8f2a0b4fe18b816ab1fc966a45837  # tags/v2.1.0^0
+_commit=48a67a2831005f49c48ec29a5837640e23e54e6b
 source=("git+https://github.com/snowballstem/snowball#commit=$_commit"
         dynamiclib.patch)
 sha256sums=('SKIP'
-            'fb8069aa4d1b5194fb8be231f87269f7a8fefdb3de0c20e2f0537fb4c9260328')
+            '4620e8d90cdccfc89226e929bfee151bead14ee5f4a5778b873613b689b95416')
 
 pkgver() {
   cd $pkgbase

Modified: dynamiclib.patch
===================================================================
--- dynamiclib.patch	2021-11-21 16:45:42 UTC (rev 428758)
+++ dynamiclib.patch	2021-11-21 16:55:37 UTC (rev 428759)
@@ -1,36 +1,33 @@
- GNUmakefile           | 9 ++++++---
- libstemmer/symbol.map | 6 ++++++
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git c/GNUmakefile i/GNUmakefile
-index 5cb2179..e66176b 100644
---- c/GNUmakefile
-+++ i/GNUmakefile
-@@ -162,10 +162,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o)
+diff --git a/GNUmakefile b/GNUmakefile
+index 98eb1fa..40ebc38 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -170,12 +170,11 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o)
  JAVA_CLASSES = $(JAVA_SOURCES:.java=.class)
  JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class)
  
 -CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
--CPPFLAGS=-Iinclude
+-CPPFLAGS=
 +CFLAGS+=-fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations
-+CPPFLAGS+=-Iinclude
  
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ INCLUDES=-Iinclude
  
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_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
 @@ -212,6 +212,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS)
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 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,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^
 +
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ examples/%.o: examples/%.c
+ 	$(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
  
-diff --git c/libstemmer/symbol.map i/libstemmer/symbol.map
+diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map
 new file mode 100644
 index 0000000..7a3d423
 --- /dev/null