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

Jan Steffens heftig at gemini.archlinux.org
Fri Apr 1 19:56:13 UTC 2022


    Date: Friday, April 1, 2022 @ 19:56:12
  Author: heftig
Revision: 441201

archrelease: copy trunk to extra-x86_64

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

------------------+
 PKGBUILD         |  121 +++++++++++++++++++++++++----------------------------
 dynamiclib.diff  |   68 +++++++++++++++++++++++++++++
 dynamiclib.patch |   41 -----------------
 3 files changed, 127 insertions(+), 103 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-01 19:55:54 UTC (rev 441200)
+++ PKGBUILD	2022-04-01 19:56:12 UTC (rev 441201)
@@ -1,62 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-
-pkgbase=snowball
-pkgname=(snowball libstemmer)
-pkgver=2.2.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=48a67a2831005f49c48ec29a5837640e23e54e6b
-source=("git+https://github.com/snowballstem/snowball#commit=$_commit"
-        dynamiclib.patch)
-sha256sums=('SKIP'
-            '4620e8d90cdccfc89226e929bfee151bead14ee5f4a5778b873613b689b95416')
-
-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
-}

Copied: snowball/repos/extra-x86_64/PKGBUILD (from rev 441200, snowball/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-01 19:56:12 UTC (rev 441201)
@@ -0,0 +1,59 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgbase=snowball
+pkgname=(snowball libstemmer)
+pkgver=2.2.0
+pkgrel=2
+pkgdesc="String processing language for creating stemming algorithms"
+url="https://snowballstem.org/"
+arch=(x86_64)
+license=(BSD)
+makedepends=(git)
+options=(debug)
+_commit=48a67a2831005f49c48ec29a5837640e23e54e6b  # tags/v2.2.0^0
+source=("git+https://github.com/snowballstem/snowball#commit=$_commit"
+        dynamiclib.diff)
+sha256sums=('SKIP'
+            'c031da5a11bafa079df6c33b38b8795b65cf2c91cc6b452dcf2b10612288a3e6')
+
+pkgver() {
+  cd snowball
+  git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd snowball
+  git apply -3 ../dynamiclib.diff
+}
+
+build() {
+  cd snowball
+  make
+}
+
+# No check - needs external test data
+
+package_snowball() {
+  depends=(libstemmer)
+
+  cd snowball
+
+  install -Dt "$pkgdir/usr/bin" snowball stemwords
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
+}
+
+package_libstemmer() {
+  pkgdesc="Stemming library supporting several languages"
+  depends=(glibc)
+  provides=(libstemmer.so)
+
+  cd snowball
+
+  install -Dt "$pkgdir/usr/include" -m644 include/libstemmer.h
+  install -Dm644 libstemmer.so.0 "$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/share/licenses/$pkgname" -m644 COPYING
+}

Copied: snowball/repos/extra-x86_64/dynamiclib.diff (from rev 441200, snowball/trunk/dynamiclib.diff)
===================================================================
--- dynamiclib.diff	                        (rev 0)
+++ dynamiclib.diff	2022-04-01 19:56:12 UTC (rev 441201)
@@ -0,0 +1,68 @@
+ GNUmakefile           | 15 +++++++--------
+ libstemmer/symbol.map |  6 ++++++
+ 2 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git c/GNUmakefile i/GNUmakefile
+index 98eb1fa..86e4855 100644
+--- c/GNUmakefile
++++ i/GNUmakefile
+@@ -170,20 +170,19 @@ 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=
++CFLAGS+=-fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ 
+ INCLUDES=-Iinclude
+ 
+-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball$(EXEEXT) libstemmer.so.0 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
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+ 	      $(LIBSTEMMER_OBJECTS) $(LIBSTEMMER_UTF8_OBJECTS) $(STEMWORDS_OBJECTS) snowball$(EXEEXT) \
+-	      libstemmer.a stemwords$(EXEEXT) \
++	      libstemmer.so.0 stemwords$(EXEEXT) \
+               libstemmer/modules.h \
+               libstemmer/modules_utf8.h \
+ 	      $(C_LIB_SOURCES) $(C_LIB_HEADERS) $(C_LIB_OBJECTS) \
+@@ -222,19 +221,19 @@ libstemmer/modules_utf8.h libstemmer/mkinc_utf8.mak: libstemmer/mkmodules.pl lib
+ 
+ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS)
+ 
+-libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+-	$(AR) -cru $@ $^
++libstemmer.so.0: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@,-version-script,libstemmer/symbol.map -o $@ $^
+ 
+ examples/%.o: examples/%.c
+ 	$(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
+ 
+-stemwords$(EXEEXT): $(STEMWORDS_OBJECTS) libstemmer.a
++stemwords$(EXEEXT): $(STEMWORDS_OBJECTS) libstemmer.so.0
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ tests/%.o: tests/%.c
+ 	$(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
+ 
+-stemtest$(EXEEXT): $(STEMTEST_OBJECTS) libstemmer.a
++stemtest$(EXEEXT): $(STEMTEST_OBJECTS) libstemmer.so.0
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ csharp_stemwords$(EXEEXT): $(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:
++        *;
++};

Deleted: dynamiclib.patch
===================================================================
--- dynamiclib.patch	2022-04-01 19:55:54 UTC (rev 441200)
+++ dynamiclib.patch	2022-04-01 19:56:12 UTC (rev 441201)
@@ -1,41 +0,0 @@
-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=
-+CFLAGS+=-fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations
- 
- INCLUDES=-Iinclude
- 
--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.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 $^
-+
- examples/%.o: examples/%.c
- 	$(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
- 
-diff --git a/libstemmer/symbol.map b/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