From 48d9c80dbdfacf5d00b0b2eb6d3f8004edb759d1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 26 Apr 2021 09:53:55 +0200 Subject: [PATCH 1/2] New package: libstemmer-2.1.0 --- common/shlibs | 1 + srcpkgs/libstemmer-devel | 1 + .../patches/compile-dynamic-lib.patch | 59 +++++++++++++++++++ srcpkgs/libstemmer/template | 39 ++++++++++++ 4 files changed, 100 insertions(+) create mode 120000 srcpkgs/libstemmer-devel create mode 100644 srcpkgs/libstemmer/patches/compile-dynamic-lib.patch create mode 100644 srcpkgs/libstemmer/template diff --git a/common/shlibs b/common/shlibs index ef3ff475a4d9..0c4f73cf506b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3991,3 +3991,4 @@ libbasu.so.0 basu-0.2.0_1 libXcomp.so.3 nx-libs-3.5.99.24_1 libXcompshad.so.3 nx-libs-3.5.99.24_1 libNX_X11.so.6 nx-libs-3.5.99.24_1 +libstemmer.so.0 libstemmer-2.1.0_1 diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel new file mode 120000 index 000000000000..ba77cabf9bd7 --- /dev/null +++ b/srcpkgs/libstemmer-devel @@ -0,0 +1 @@ +libstemmer \ No newline at end of file diff --git a/srcpkgs/libstemmer/patches/compile-dynamic-lib.patch b/srcpkgs/libstemmer/patches/compile-dynamic-lib.patch new file mode 100644 index 000000000000..594d528eae5b --- /dev/null +++ b/srcpkgs/libstemmer/patches/compile-dynamic-lib.patch @@ -0,0 +1,59 @@ +source: https://gitlab.alpinelinux.org/alpine/aports/-/commit/84609ae7ea3b5381e7d672a77fc692dce6500c07 + +From e75b51ea8d57db8b8752a2e2676e914d369889a6 Mon Sep 17 00:00:00 2001 +From: Clayton Craft +Date: Mon, 26 Oct 2020 05:57:42 +0000 +Subject: [PATCH] Compile dynamic lib + +enabling dynamic lib is an upstream issue: +https://github.com/snowballstem/snowball/issues/34 + +--- + GNUmakefile | 9 ++++++--- + libstemmer/symbol.map | 6 ++++++ + 2 files changed, 12 insertions(+), 3 deletions(-) + create mode 100644 libstemmer/symbol.map + +diff --git a/GNUmakefile b/GNUmakefile +index 1487001..053067d 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -150,10 +150,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) \ +@@ -199,6 +199,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 a/libstemmer/symbol.map b/libstemmer/symbol.map +new file mode 100644 +index 0000000..7a3d423 +--- /dev/null ++++ b/libstemmer/symbol.map +@@ -0,0 +1,6 @@ ++SB_STEMMER_0 { ++ global: ++ sb_stemmer_*; ++ local: ++ *; ++}; +-- +2.29.0 + diff --git a/srcpkgs/libstemmer/template b/srcpkgs/libstemmer/template new file mode 100644 index 000000000000..b8c4a3f1ce49 --- /dev/null +++ b/srcpkgs/libstemmer/template @@ -0,0 +1,39 @@ +# Template file for 'libstemmer' +pkgname=libstemmer +version=2.1.0 +revision=1 +wrksrc="snowball-${version}" +build_style=gnu-makefile +build_helper=qemu +hostmakedepends="perl" +short_desc="Small string processing language for creating stemming algorithms" +maintainer="Michal Vasilek " +license="BSD-3-Clause" +homepage="https://snowballstem.org/" +distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz" +checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa +patch_args="-Np1" +make_check=no # tests fail + +post_patch() { + if [ -n "$CROSS_BUILD" ]; then + vsed -i GNUmakefile -e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|' + fi +} + +do_install() { + vinstall include/libstemmer.h 644 usr/include + vinstall libstemmer.so.0.0.0 644 usr/lib + ln -s libstemmer.so.0.0.0 ${DESTDIR}/usr/lib/libstemmer.so + ln -s libstemmer.so ${DESTDIR}/usr/lib/libstemmer.so.0 + vlicense COPYING +} + +libstemmer-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From c5b22c7422b65d666d51bedc4aa012cb2f75a867 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 26 Apr 2021 12:04:43 +0200 Subject: [PATCH 2/2] geary: update to 40.0. --- srcpkgs/geary/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template index a74b1ff16cd2..3891e7190112 100644 --- a/srcpkgs/geary/template +++ b/srcpkgs/geary/template @@ -1,25 +1,25 @@ # Template file for 'geary' pkgname=geary -version=3.38.1 -revision=2 +version=40.0 +revision=1 build_helper="gir" build_style=meson -configure_args="-Dcontractor=true" +configure_args="-Dprofile=release -Dcontractor=enabled" hostmakedepends="desktop-file-utils iso-codes pkg-config itstool gobject-introspection vala glib-devel gettext" makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel - libpeas-devel gsound-devel" + libpeas-devel gsound-devel libstemmer-devel" depends="gir-freedesktop gnome-keyring" short_desc="Lightweight email program for the GNOME desktop" maintainer="Cameron Nemo " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Geary" -_series=${version%.${version#*.*.}} -distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz" -checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz" +checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0 +make_check=no # tests fail with a webkit process crash post_patch() { case "$XBPS_TARGET_MACHINE" in