[arch-commits] Commit in snowball/repos/extra-x86_64 (4 files)

Jan Steffens heftig at gemini.archlinux.org
Fri Aug 13 19:10:38 UTC 2021


    Date: Friday, August 13, 2021 @ 19:10:38
  Author: heftig
Revision: 422072

archrelease: copy trunk to extra-x86_64

Added:
  snowball/repos/extra-x86_64/PKGBUILD
    (from rev 422071, snowball/trunk/PKGBUILD)
  snowball/repos/extra-x86_64/dynamiclib.patch
    (from rev 422071, snowball/trunk/dynamiclib.patch)
Deleted:
  snowball/repos/extra-x86_64/PKGBUILD
  snowball/repos/extra-x86_64/dynamiclib.patch

------------------+
 PKGBUILD         |  117 +++++++++++++++++++++++++----------------------
 dynamiclib.patch |  131 +++++++++++++++++------------------------------------
 2 files changed, 106 insertions(+), 142 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-13 19:08:16 UTC (rev 422071)
+++ PKGBUILD	2021-08-13 19:10:38 UTC (rev 422072)
@@ -1,55 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgbase=snowball
-pkgname=(snowball libstemmer)
-pkgver=0+713
-pkgrel=2
-pkgdesc="String processing language for creating stemming algorithms"
-arch=(x86_64)
-url="https://snowballstem.org/"
-license=(BSD)
-depends=(glibc)
-makedepends=(git)
-_commit=8c73aa900e168a96e046ec9ed6f13739c3dfacb0  # master
-source=("git+https://github.com/snowballstem/snowball#commit=$_commit"
-        dynamiclib.patch)
-sha256sums=('SKIP'
-            'ea34c201bf619d14b0eb1207589641ca1f1cb8131efb4b422b3dd3501c49231e')
-
-pkgver() {
-  cd $pkgbase
-  echo "0+$(git rev-list --count HEAD)"
-}
-
-prepare() {
-  cd $pkgbase
-  patch -Np1 -i ../dynamiclib.patch
-}
-
-build() {
-  cd $pkgbase
-  make
-}
-
-check() {
-  cd $pkgbase
-  # Disabled - needs external test data
-  #make check
-}
-
-package_snowball() {
-  cd $pkgbase
-  install -d "$pkgdir/usr/bin"
-  install -t "$pkgdir/usr/bin" snowball stemwords
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/snowball/LICENSE"
-}
-
-package_libstemmer() {
-  pkgdesc="Stemming library supporting several languages"
-  cd $pkgbase
-  install -Dm644 {.,"$pkgdir"/usr}/include/libstemmer.h
-  install -D {.,"$pkgdir"/usr/lib}/libstemmer.so.0.0.0
-  ln -s libstemmer.so.0.0.0 "$pkgdir/usr/lib/libstemmer.so.0"
-  ln -s libstemmer.so.0 "$pkgdir/usr/lib/libstemmer.so"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/libstemmer/LICENSE"
-}

Copied: snowball/repos/extra-x86_64/PKGBUILD (from rev 422071, snowball/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-08-13 19:10:38 UTC (rev 422072)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgbase=snowball
+pkgname=(snowball libstemmer)
+pkgver=2.1.0
+pkgrel=1
+pkgdesc="String processing language for creating stemming algorithms"
+url="https://snowballstem.org/"
+arch=(x86_64)
+license=(BSD)
+depends=(glibc)
+makedepends=(git)
+_commit=4764395431c8f2a0b4fe18b816ab1fc966a45837  # tags/v2.1.0^0
+source=("git+https://github.com/snowballstem/snowball#commit=$_commit"
+        dynamiclib.patch)
+sha256sums=('SKIP'
+            'fb8069aa4d1b5194fb8be231f87269f7a8fefdb3de0c20e2f0537fb4c9260328')
+
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgbase
+  git apply -3 ../dynamiclib.patch
+}
+
+build() {
+  cd $pkgbase
+  make
+}
+
+check() {
+  cd $pkgbase
+
+  # Disabled - needs external test data
+  #make check
+}
+
+package_snowball() {
+  cd $pkgbase
+
+  install -Dt "$pkgdir/usr/bin" snowball stemwords
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
+}
+
+package_libstemmer() {
+  pkgdesc="Stemming library supporting several languages"
+  provides=(libstemmer.so)
+
+  cd $pkgbase
+
+  install -Dt "$pkgdir/usr/lib" libstemmer.so.0.0.0
+  ln -s libstemmer.so.0.0.0 "$pkgdir/usr/lib/libstemmer.so.0"
+  ln -s libstemmer.so.0 "$pkgdir/usr/lib/libstemmer.so"
+
+  install -Dt "$pkgdir/usr/include" -m644 include/libstemmer.h
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
+}

Deleted: dynamiclib.patch
===================================================================
--- dynamiclib.patch	2021-08-13 19:08:16 UTC (rev 422071)
+++ dynamiclib.patch	2021-08-13 19:10:38 UTC (rev 422072)
@@ -1,87 +0,0 @@
- GNUmakefile           | 13 ++++++++-----
- libstemmer/symbol.map |  6 ++++++
- 2 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git c/GNUmakefile i/GNUmakefile
-index d100917..d9eb543 100644
---- c/GNUmakefile
-+++ i/GNUmakefile
-@@ -144,58 +144,61 @@ 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
-+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)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
- 	      $(LIBSTEMMER_OBJECTS) $(LIBSTEMMER_UTF8_OBJECTS) $(STEMWORDS_OBJECTS) snowball \
- 	      libstemmer.o stemwords \
-               libstemmer/modules.h \
-               libstemmer/modules_utf8.h \
-               snowball.splint \
- 	      $(C_LIB_SOURCES) $(C_LIB_HEADERS) $(C_LIB_OBJECTS) \
- 	      $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) \
- 	      $(JAVA_SOURCES) $(JAVA_CLASSES) $(JAVA_RUNTIME_CLASSES) \
- 	      $(CSHARP_SOURCES) \
- 	      $(PASCAL_SOURCES) pascal/stemwords.dpr pascal/stemwords pascal/*.o pascal/*.ppu \
- 	      $(PYTHON_SOURCES) \
- 	      $(JS_SOURCES) \
- 	      $(RUST_SOURCES) \
-               libstemmer/mkinc.mak libstemmer/mkinc_utf8.mak \
-               libstemmer/libstemmer.c libstemmer/libstemmer_utf8.c \
- 	      algorithms.mk
- 	rm -rf dist
- 	rmdir $(c_src_dir) || true
- 	rmdir $(python_output_dir) || true
- 	rmdir $(js_output_dir) || true
- 
- snowball: $(COMPILER_OBJECTS)
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- $(COMPILER_OBJECTS): $(COMPILER_HEADERS)
- 
- libstemmer/libstemmer.c: libstemmer/libstemmer_c.in
- 	sed 's/@MODULES_H@/modules.h/' $^ >$@
- 
- libstemmer/libstemmer_utf8.c: libstemmer/libstemmer_c.in
- 	sed 's/@MODULES_H@/modules_utf8.h/' $^ >$@
- 
- libstemmer/modules.h libstemmer/mkinc.mak: libstemmer/mkmodules.pl libstemmer/modules.txt
- 	libstemmer/mkmodules.pl $@ $(c_src_dir) libstemmer/modules.txt libstemmer/mkinc.mak
- 
- libstemmer/modules_utf8.h libstemmer/mkinc_utf8.mak: libstemmer/mkmodules.pl libstemmer/modules.txt
- 	libstemmer/mkmodules.pl $@ $(c_src_dir) libstemmer/modules.txt libstemmer/mkinc_utf8.mak utf8
- 
- libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS)
- 
- libstemmer.o: 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) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
- 	$(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
-diff --git c/libstemmer/symbol.map i/libstemmer/symbol.map
-new file mode 100644
-index 0000000..7a3d423
---- /dev/null
-+++ i/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};

Copied: snowball/repos/extra-x86_64/dynamiclib.patch (from rev 422071, snowball/trunk/dynamiclib.patch)
===================================================================
--- dynamiclib.patch	                        (rev 0)
+++ dynamiclib.patch	2021-08-13 19:10:38 UTC (rev 422072)
@@ -0,0 +1,44 @@
+ 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)
+ JAVA_CLASSES = $(JAVA_SOURCES:.java=.class)
+ JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class)
+ 
+-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+-CPPFLAGS=-Iinclude
++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)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS)
+ libstemmer.o: 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 $@ $^
+ 
+diff --git c/libstemmer/symbol.map i/libstemmer/symbol.map
+new file mode 100644
+index 0000000..7a3d423
+--- /dev/null
++++ i/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};



More information about the arch-commits mailing list