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

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).