Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] geary: update to 40.0.
@ 2021-05-04 22:24 paper42
  2021-05-05  2:16 ` [PR REVIEW] " ericonr
                   ` (26 more replies)
  0 siblings, 27 replies; 28+ messages in thread
From: paper42 @ 2021-05-04 22:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1585 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages geary-40
https://github.com/void-linux/void-packages/pull/30685

geary: update to 40.0.
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30685.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geary-40-30685.patch --]
[-- Type: text/x-diff, Size: 6536 bytes --]

From fb240495e650d77a0fcbb79ae79e0234a5b6b020 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
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                   | 31 ++++++++++
 4 files changed, 92 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 1b284ac33ef2..27e159a48770 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3929,3 +3929,4 @@ libgumbo.so.1 gumbo-parser-0.10.1_2
 libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_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 <clayton@craftyguy.net>
+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..56d312ebf4a1
--- /dev/null
+++ b/srcpkgs/libstemmer/template
@@ -0,0 +1,31 @@
+# Template file for 'libstemmer'
+pkgname=libstemmer
+version=2.1.0
+revision=1
+wrksrc="snowball-${version}"
+build_style=gnu-makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Paper <paper@tilde.institute>"
+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"
+
+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 95824d06ad5245b962e45db873bce9c4c3feb5fd Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Mon, 26 Apr 2021 12:04:43 +0200
Subject: [PATCH 2/2] geary: update to 40.0.

---
 srcpkgs/geary/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c7a2b531d40d 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,24 @@
 # 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"
+ gobject-introspection vala glib-devel gettext valadoc"
 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"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 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
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
@ 2021-05-05  2:16 ` ericonr
  2021-05-05 10:28 ` [PR PATCH] [Updated] " paper42
                   ` (25 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-05-05  2:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r626216439

Comment:
```suggestion
 libpeas-devel gsound-devel libstemmer-devel"
```

Right?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
  2021-05-05  2:16 ` [PR REVIEW] " ericonr
@ 2021-05-05 10:28 ` paper42
  2021-05-05 10:29 ` [PR REVIEW] " paper42
                   ` (24 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-05-05 10:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages geary-40
https://github.com/void-linux/void-packages/pull/30685

geary: update to 40.0.
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30685.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geary-40-30685.patch --]
[-- Type: text/x-diff, Size: 6661 bytes --]

From 58ae88bf4a500511922825fd81d28b8968b3ecee Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
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                   | 38 ++++++++++++
 4 files changed, 99 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 1b284ac33ef2..27e159a48770 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3929,3 +3929,4 @@ libgumbo.so.1 gumbo-parser-0.10.1_2
 libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_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 <clayton@craftyguy.net>
+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..837a4db7dcbb
--- /dev/null
+++ b/srcpkgs/libstemmer/template
@@ -0,0 +1,38 @@
+# 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="Paper <paper@tilde.institute>"
+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"
+
+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 d5672e400aaef4c181c43b1bb186a32defd823f5 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Mon, 26 Apr 2021 12:04:43 +0200
Subject: [PATCH 2/2] geary: update to 40.0.

---
 srcpkgs/geary/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..6a1da97d3abe 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,24 @@
 # 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 <cnemo@tutanota.com>"
 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
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
  2021-05-05  2:16 ` [PR REVIEW] " ericonr
  2021-05-05 10:28 ` [PR PATCH] [Updated] " paper42
@ 2021-05-05 10:29 ` paper42
  2021-05-05 14:30 ` ericonr
                   ` (23 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-05-05 10:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r626450397

Comment:
of course, sorry about that

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (2 preceding siblings ...)
  2021-05-05 10:29 ` [PR REVIEW] " paper42
@ 2021-05-05 14:30 ` ericonr
  2021-05-20  8:30 ` [PR PATCH] [Updated] " paper42
                   ` (22 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-05-05 14:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#issuecomment-832735615

Comment:
It kind of sucks that they started depending on a library that doesn't even exist, officially speaking :/

Also, could you look at the failing tests?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (3 preceding siblings ...)
  2021-05-05 14:30 ` ericonr
@ 2021-05-20  8:30 ` paper42
  2021-05-25  5:41 ` [PR REVIEW] " CameronNemo
                   ` (21 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-05-20  8:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages geary-40
https://github.com/void-linux/void-packages/pull/30685

geary: update to 40.0.
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30685.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geary-40-30685.patch --]
[-- Type: text/x-diff, Size: 6730 bytes --]

From 48d9c80dbdfacf5d00b0b2eb6d3f8004edb759d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <clayton@craftyguy.net>
+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 <michal@vasilek.cz>"
+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 <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
 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

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (4 preceding siblings ...)
  2021-05-20  8:30 ` [PR PATCH] [Updated] " paper42
@ 2021-05-25  5:41 ` CameronNemo
  2021-05-25  7:48 ` paper42
                   ` (20 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: CameronNemo @ 2021-05-25  5:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r638469176

Comment:
TBH I am not a fan of this. Can the library be statically linked? How are other distros handling this situation?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (5 preceding siblings ...)
  2021-05-25  5:41 ` [PR REVIEW] " CameronNemo
@ 2021-05-25  7:48 ` paper42
  2021-06-11 21:00 ` paper42
                   ` (19 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-05-25  7:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r638539863

Comment:
Other distributions are using the same approach. This package is actually often used, but void chose to disable its functionality where possible because it was not packaged. Geary is the only package in the repositories that depends on this package non-optionally.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (6 preceding siblings ...)
  2021-05-25  7:48 ` paper42
@ 2021-06-11 21:00 ` paper42
  2021-07-03 19:16 ` kkga
                   ` (18 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-06-11 21:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#issuecomment-859908303

Comment:
@Gottox could you look at this PR when you have time? Geary the last GNOME application which was not updated to 40 yet.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (7 preceding siblings ...)
  2021-06-11 21:00 ` paper42
@ 2021-07-03 19:16 ` kkga
  2021-07-28  4:54 ` [PR REVIEW] " ericonr
                   ` (17 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: kkga @ 2021-07-03 19:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New comment by kkga on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#issuecomment-873457301

Comment:
Any chance this could be merged? :)

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (8 preceding siblings ...)
  2021-07-03 19:16 ` kkga
@ 2021-07-28  4:54 ` ericonr
  2021-07-28  4:55 ` ericonr
                   ` (16 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-07-28  4:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r677971991

Comment:
@paper42, please document that other distros are doing this, so the library is being treated as shared by downstreams. I'd appreciate links in the commit to the packaging done by other distros too.

IMO this should have a big `# XXX` comment.

Why are you against statically linking it? Kinda sucks for size, but we won't be caught by any unexpected upstream breakage, at least.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (9 preceding siblings ...)
  2021-07-28  4:54 ` [PR REVIEW] " ericonr
@ 2021-07-28  4:55 ` ericonr
  2021-07-30 20:07 ` [PR PATCH] [Updated] " paper42
                   ` (15 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-07-28  4:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 221 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#issuecomment-888009453

Comment:
IMO in this or a follow up PR, it would be nice to have packages start using it.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (10 preceding siblings ...)
  2021-07-28  4:55 ` ericonr
@ 2021-07-30 20:07 ` paper42
  2021-07-30 20:10 ` paper42
                   ` (14 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-07-30 20:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages geary-40
https://github.com/void-linux/void-packages/pull/30685

geary: update to 40.0.
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30685.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geary-40-30685.patch --]
[-- Type: text/x-diff, Size: 6809 bytes --]

From f414d470fa514992cfd90b20db25798829027829 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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..02e05e17654a
--- /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
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+
+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 6caa58467abe351f1512b84801dc6b77396d3ca8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
 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

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (11 preceding siblings ...)
  2021-07-30 20:07 ` [PR PATCH] [Updated] " paper42
@ 2021-07-30 20:10 ` paper42
  2021-07-30 20:13 ` [PR REVIEW] " paper42
                   ` (13 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-07-30 20:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages geary-40
https://github.com/void-linux/void-packages/pull/30685

geary: update to 40.0.
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30685.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geary-40-30685.patch --]
[-- Type: text/x-diff, Size: 6809 bytes --]

From 81a589a708b5d762bf2ee1a687d0a47f2c228ef7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <michal@vasilek.cz>"
+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 <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
 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

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (12 preceding siblings ...)
  2021-07-30 20:10 ` paper42
@ 2021-07-30 20:13 ` paper42
  2021-07-30 20:16 ` paper42
                   ` (12 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-07-30 20:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r680194975

Comment:
> @paper42, please document that other distros are doing this, so the library is being treated as shared by downstreams. I'd appreciate links in the commit to the packaging done by other distros too.
> 
> IMO this should have a big `# XXX` comment.

done

> Why are you against statically linking it? Kinda sucks for size, but we won't be caught by any unexpected upstream breakage, at least.

If you think it would be a better idea, I can do it, but no other distribution I looked at does this and it would require extra care in each package that depends on libstemmer (I expect there will be more dependants than just geary and calibre in the future).

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (13 preceding siblings ...)
  2021-07-30 20:13 ` [PR REVIEW] " paper42
@ 2021-07-30 20:16 ` paper42
  2021-07-30 20:21 ` [PR PATCH] [Updated] " paper42
                   ` (11 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-07-30 20:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#issuecomment-890131196

Comment:
* libstemmer is a part of a bigger project called snowball, so I packaged it and made libstemmer a subpackage
* used major version as soname (like the alpine package)
* installed static library to libstemmer-devel

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (14 preceding siblings ...)
  2021-07-30 20:16 ` paper42
@ 2021-07-30 20:21 ` paper42
  2021-07-30 21:55 ` paper42
                   ` (10 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-07-30 20:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages geary-40
https://github.com/void-linux/void-packages/pull/30685

geary: update to 40.0.
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30685.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geary-40-30685.patch --]
[-- Type: text/x-diff, Size: 6807 bytes --]

From 2af2853a6a826a4b0388ef1ffbb626bfa62d49a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ 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 <michal@vasilek.cz>"
+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 28af904f34d444b3e22792446e4b4342ef6bc8e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
 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

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (15 preceding siblings ...)
  2021-07-30 20:21 ` [PR PATCH] [Updated] " paper42
@ 2021-07-30 21:55 ` paper42
  2021-08-03  2:50 ` [PR REVIEW] " ericonr
                   ` (9 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-07-30 21:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages geary-40
https://github.com/void-linux/void-packages/pull/30685

geary: update to 40.0.
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30685.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geary-40-30685.patch --]
[-- Type: text/x-diff, Size: 6948 bytes --]

From ad2c6bf6b55b06d45b3e8ac712119d748ff4e9fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 | 33 ++++++++++
 srcpkgs/snowball/template                     | 60 +++++++++++++++++++
 5 files changed, 96 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..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ 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..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+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
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -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.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ 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,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(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..6b8501274344
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# 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 <michal@vasilek.cz>"
+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
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	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() {
+		vmove usr/lib/libstemmer.so.$version
+		vmove usr/lib/libstemmer.so.${version%.*.*}
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include/libstemmer.h
+	}
+}

From 815974f66287afc37669ce8e490ae745cf4cc774 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
 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

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (16 preceding siblings ...)
  2021-07-30 21:55 ` paper42
@ 2021-08-03  2:50 ` ericonr
  2021-08-03  2:50 ` ericonr
                   ` (8 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-08-03  2:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r681393381

Comment:
```suggestion
		vmove "usr/lib/libstemmer.so.*"
```

Unless I'm missing something?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (17 preceding siblings ...)
  2021-08-03  2:50 ` [PR REVIEW] " ericonr
@ 2021-08-03  2:50 ` ericonr
  2021-08-03  2:50 ` ericonr
                   ` (7 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-08-03  2:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r681394370

Comment:
Are you sure this is necessary? We don't need symbol versioning, so the only reason for it would be if we accidentally get a bunch of name conflicts because of the non `sb_stemmer_*` symbols being global by default.

I can see it happening, just want to be sure.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (19 preceding siblings ...)
  2021-08-03  2:50 ` ericonr
@ 2021-08-03  2:50 ` ericonr
  2021-08-06 19:00 ` paper42
                   ` (5 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-08-03  2:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r681393327

Comment:
Missing short desc?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (18 preceding siblings ...)
  2021-08-03  2:50 ` ericonr
@ 2021-08-03  2:50 ` ericonr
  2021-08-03  2:50 ` ericonr
                   ` (6 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-08-03  2:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r681393673

Comment:
```suggestion
		vmove usr/include
```

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (20 preceding siblings ...)
  2021-08-03  2:50 ` ericonr
@ 2021-08-06 19:00 ` paper42
  2021-08-06 19:09 ` [PR PATCH] [Updated] " paper42
                   ` (4 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-08-06 19:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r684445799

Comment:
I am not sure, I based this patch on the alpine one, but all other distributions have it except for Gentoo which ships libstemmer from 2014.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (21 preceding siblings ...)
  2021-08-06 19:00 ` paper42
@ 2021-08-06 19:09 ` paper42
  2021-08-06 19:52 ` [PR REVIEW] " ericonr
                   ` (3 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-08-06 19:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages geary-40
https://github.com/void-linux/void-packages/pull/30685

geary: update to 40.0.
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30685.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geary-40-30685.patch --]
[-- Type: text/x-diff, Size: 6950 bytes --]

From 0afdcb2d6eff94265adb0d4db1311263bf75b09a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 | 33 ++++++++++
 srcpkgs/snowball/template                     | 60 +++++++++++++++++++
 5 files changed, 96 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 7e6b6fb0d1d6..b8fda590d5f3 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..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ 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..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+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
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -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.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ 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,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(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..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# 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 <michal@vasilek.cz>"
+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
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	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() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}

From 51f2c7f3ce604fe577959fb99f41ebdde2ca3a50 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
 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

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (22 preceding siblings ...)
  2021-08-06 19:09 ` [PR PATCH] [Updated] " paper42
@ 2021-08-06 19:52 ` ericonr
  2021-08-06 19:53 ` ericonr
                   ` (2 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-08-06 19:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#discussion_r684471219

Comment:
Ok, we can go with it.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (23 preceding siblings ...)
  2021-08-06 19:52 ` [PR REVIEW] " ericonr
@ 2021-08-06 19:53 ` ericonr
  2021-08-06 20:05 ` paper42
  2021-08-06 20:06 ` [PR PATCH] [Merged]: " paper42
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-08-06 19:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 145 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#issuecomment-894485342

Comment:
LGTM

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (24 preceding siblings ...)
  2021-08-06 19:53 ` ericonr
@ 2021-08-06 20:05 ` paper42
  2021-08-06 20:06 ` [PR PATCH] [Merged]: " paper42
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-08-06 20:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/30685#issuecomment-894491491

Comment:
> LGTM

Thank you for the reviews!

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Merged]: geary: update to 40.0.
  2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
                   ` (25 preceding siblings ...)
  2021-08-06 20:05 ` paper42
@ 2021-08-06 20:06 ` paper42
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2021-08-06 20:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1433 bytes --]

There's a merged pull request on the void-packages repository

geary: update to 40.0.
https://github.com/void-linux/void-packages/pull/30685

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2021-08-06 20:06 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-04 22:24 [PR PATCH] geary: update to 40.0 paper42
2021-05-05  2:16 ` [PR REVIEW] " ericonr
2021-05-05 10:28 ` [PR PATCH] [Updated] " paper42
2021-05-05 10:29 ` [PR REVIEW] " paper42
2021-05-05 14:30 ` ericonr
2021-05-20  8:30 ` [PR PATCH] [Updated] " paper42
2021-05-25  5:41 ` [PR REVIEW] " CameronNemo
2021-05-25  7:48 ` paper42
2021-06-11 21:00 ` paper42
2021-07-03 19:16 ` kkga
2021-07-28  4:54 ` [PR REVIEW] " ericonr
2021-07-28  4:55 ` ericonr
2021-07-30 20:07 ` [PR PATCH] [Updated] " paper42
2021-07-30 20:10 ` paper42
2021-07-30 20:13 ` [PR REVIEW] " paper42
2021-07-30 20:16 ` paper42
2021-07-30 20:21 ` [PR PATCH] [Updated] " paper42
2021-07-30 21:55 ` paper42
2021-08-03  2:50 ` [PR REVIEW] " ericonr
2021-08-03  2:50 ` ericonr
2021-08-03  2:50 ` ericonr
2021-08-03  2:50 ` ericonr
2021-08-06 19:00 ` paper42
2021-08-06 19:09 ` [PR PATCH] [Updated] " paper42
2021-08-06 19:52 ` [PR REVIEW] " ericonr
2021-08-06 19:53 ` ericonr
2021-08-06 20:05 ` paper42
2021-08-06 20:06 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).