From 81a589a708b5d762bf2ee1a687d0a47f2c228ef7 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: snowball-2.1.0 --- common/shlibs | 1 + srcpkgs/libstemmer | 1 + srcpkgs/libstemmer-devel | 1 + .../snowball/patches/libstemmer-library.patch | 37 +++++++++++++ srcpkgs/snowball/template | 52 +++++++++++++++++++ 5 files changed, 92 insertions(+) create mode 120000 srcpkgs/libstemmer create mode 120000 srcpkgs/libstemmer-devel create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch create mode 100644 srcpkgs/snowball/template diff --git a/common/shlibs b/common/shlibs index 04eefcdcbdd1..a2e7af1cab1e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4027,3 +4027,4 @@ librnnoise.so.0 rnnoise-0.4.1_1 liblhasa.so.0 lhasa-0.3.1_2 libmt32emu.so.2 libmt32emu-2.5.1_1 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1 +libstemmer.so.2 libstemmer-2.1.0_1 diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer new file mode 120000 index 000000000000..80a797598ae2 --- /dev/null +++ b/srcpkgs/libstemmer @@ -0,0 +1 @@ +snowball \ No newline at end of file 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/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch new file mode 100644 index 000000000000..3e2536ad2d81 --- /dev/null +++ b/srcpkgs/snowball/patches/libstemmer-library.patch @@ -0,0 +1,37 @@ +based on alpine patches which are based on gentoo patches +https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -164,8 +164,9 @@ + + CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations + CPPFLAGS=-Iinclude ++MAJOR_VERSION := $(shell echo $(SNOWBALL_VERSION) | cut -d. -f1) + +-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) + + clean: + rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ +@@ -212,6 +213,11 @@ + libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(AR) -cru $@ $^ + ++libstemmer.so: libstemmer/libstemmer.o ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(MAJOR_VERSION),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^ ++ ln -s $@.$(SNOWBALL_VERSION) $@.$(MAJOR_VERSION) ++ ln -s $@.$(SNOWBALL_VERSION) $@ ++ + stemwords: $(STEMWORDS_OBJECTS) libstemmer.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + +--- /dev/null ++++ b/libstemmer/symbol.map +@@ -0,0 +1,6 @@ ++SB_STEMMER_0 { ++ global: ++ sb_stemmer_*; ++ local: ++ *; ++}; diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template new file mode 100644 index 000000000000..84609847ec4e --- /dev/null +++ b/srcpkgs/snowball/template @@ -0,0 +1,52 @@ +# Template file for 'snowball' +pkgname=snowball +version=2.1.0 +revision=1 +build_style=gnu-makefile +build_helper=qemu +make_check_target=check_stemtest # other checks are missing targets in the makefile +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 + +post_patch() { + if [ -n "$CROSS_BUILD" ]; then + vsed -i GNUmakefile \ + -e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|' + fi +} + +do_install() { + vbin snowball + vbin stemwords + vlicense COPYING +} + +# XXX: upstream doesn't generate a dynamic library for libstemmer +# each distribution patches this on their own: +# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk +# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball +# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer + +libstemmer_package() { + pkg_install() { + vinstall libstemmer.so.$version 644 usr/lib + vinstall libstemmer.so.${version%.*.*} 644 usr/lib + } +} + +libstemmer-devel_package() { + depends="libstemmer>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + # the static library has .o suffix + # https://github.com/snowballstem/snowball/pull/150 + vinstall libstemmer.o 644 usr/lib/libstemmer.a + vinstall include/libstemmer.h 644 usr/include + vinstall libstemmer.so 644 usr/lib + } +} From 8b47443170e3ea22cffbabed09cd3a137cbc4b07 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