All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [oe] [meta-gnome] [PATCH] libstemmer: upgrade 2.0.0 -> 2.1.0
@ 2021-05-27  6:45 zangrc
  2021-05-27 14:54 ` Khem Raj
  0 siblings, 1 reply; 2+ messages in thread
From: zangrc @ 2021-05-27  6:45 UTC (permalink / raw)
  To: openembedded-devel

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="y", Size: 3725 bytes --]

0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
Removed since this is included in 2.1.0

-License-Update: Add the following Copyright
Copyright (c) 2013, Yoshiki Shibukawa
Copyright (c) 2006,2007,2009,2010,2011,2014-2019, Olly Betts

Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
---
 ...ds-do-link-with-LDFLAGS-set-by-build.patch | 46 -------------------
 .../libstemmer/libstemmer_git.bb              |  7 ++-
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch

diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch b/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
deleted file mode 100644
index 69c1d670e7..0000000000
--- a/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 23eacfbcc10c777ce47283a5285455ec83c8aa41 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 6 Oct 2019 13:05:08 +0200
-Subject: [PATCH] snowball/stemwords: do link with LDFLAGS set by build
- environment
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some (cross-)build systems as OpeneEmbedded are picky (for certain reasons) if
-their LDFLAGS are ignored.
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/snowballstem/snowball/pull/120
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- GNUmakefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/GNUmakefile b/GNUmakefile
-index 76f6ae9..47c6077 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -179,7 +179,7 @@ clean:
- 	-rmdir $(js_output_dir)
-
- snowball: $(COMPILER_OBJECTS)
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-
- $(COMPILER_OBJECTS): $(COMPILER_HEADERS)
-
-@@ -204,7 +204,7 @@ 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) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-
- csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
- 	$(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
---
-2.21.0
-
diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb b/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb
index 96dd880b6a..c1a06c0d0d 100644
--- a/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb
+++ b/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb
@@ -1,18 +1,17 @@
 SUMMARY = "Snowball compiler and stemming algorithms"
 HOMEPAGE = "https://snowballstem.org/"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2750797da77c1d784e7626b3f7d7ff3e"
+LIC_FILES_CHKSUM = "file://COPYING;md5=19139aaf3c8c8fa1ca6edd59c072fb9f"

 DEPENDS_class-target = "${BPN}-native"

 SRC_URI = "\
     git://github.com/snowballstem/snowball.git \
     file://0001-Build-so-lib.patch \
-    file://0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch \
 "
-SRCREV = "c70ed64f9d41c1032fba4e962b054f8e9d489a74"
+SRCREV = "4764395431c8f2a0b4fe18b816ab1fc966a45837"
 S = "${WORKDIR}/git"
-PV = "2.0.0"
+PV = "2.1.0"
 LIBVER = "0.0.0"

 inherit lib_package
--
2.25.1


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

* Re: [PATCH] [oe] [meta-gnome] [PATCH] libstemmer: upgrade 2.0.0 -> 2.1.0
  2021-05-27  6:45 [PATCH] [oe] [meta-gnome] [PATCH] libstemmer: upgrade 2.0.0 -> 2.1.0 zangrc
@ 2021-05-27 14:54 ` Khem Raj
  0 siblings, 0 replies; 2+ messages in thread
From: Khem Raj @ 2021-05-27 14:54 UTC (permalink / raw)
  To: zangrc, openembedded-devel

This patch seems to be corrupted

error: cannot convert from y to UTF-8

Please regenerate it with git format-patch and send with git send-email


On 5/26/21 11:45 PM, zangrc wrote:
> 0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
> Removed since this is included in 2.1.0
> 
> -License-Update: Add the following Copyright
> Copyright (c) 2013, Yoshiki Shibukawa
> Copyright (c) 2006,2007,2009,2010,2011,2014-2019, Olly Betts
> 
> Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
> ---
>   ...ds-do-link-with-LDFLAGS-set-by-build.patch | 46 -------------------
>   .../libstemmer/libstemmer_git.bb              |  7 ++-
>   2 files changed, 3 insertions(+), 50 deletions(-)
>   delete mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
> 
> diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch b/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
> deleted file mode 100644
> index 69c1d670e7..0000000000
> --- a/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -From 23eacfbcc10c777ce47283a5285455ec83c8aa41 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> -Date: Sun, 6 Oct 2019 13:05:08 +0200
> -Subject: [PATCH] snowball/stemwords: do link with LDFLAGS set by build
> - environment
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Some (cross-)build systems as OpeneEmbedded are picky (for certain reasons) if
> -their LDFLAGS are ignored.
> -
> -Upstream-Status: Submitted [1]
> -
> -[1] https://github.com/snowballstem/snowball/pull/120
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ----
> - GNUmakefile | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/GNUmakefile b/GNUmakefile
> -index 76f6ae9..47c6077 100644
> ---- a/GNUmakefile
> -+++ b/GNUmakefile
> -@@ -179,7 +179,7 @@ clean:
> - 	-rmdir $(js_output_dir)
> -
> - snowball: $(COMPILER_OBJECTS)
> --	$(CC) $(CFLAGS) -o $@ $^
> -+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
> -
> - $(COMPILER_OBJECTS): $(COMPILER_HEADERS)
> -
> -@@ -204,7 +204,7 @@ 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) -o $@ $^
> -+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
> -
> - csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
> - 	$(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
> ---
> -2.21.0
> -
> diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb b/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb
> index 96dd880b6a..c1a06c0d0d 100644
> --- a/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb
> +++ b/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb
> @@ -1,18 +1,17 @@
>   SUMMARY = "Snowball compiler and stemming algorithms"
>   HOMEPAGE = "https://snowballstem.org/"
>   LICENSE = "BSD-3-Clause"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=2750797da77c1d784e7626b3f7d7ff3e"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=19139aaf3c8c8fa1ca6edd59c072fb9f"
>   
>   DEPENDS_class-target = "${BPN}-native"
>   
>   SRC_URI = "\
>       git://github.com/snowballstem/snowball.git \
>       file://0001-Build-so-lib.patch \
> -    file://0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch \
>   "
> -SRCREV = "c70ed64f9d41c1032fba4e962b054f8e9d489a74"
> +SRCREV = "4764395431c8f2a0b4fe18b816ab1fc966a45837"
>   S = "${WORKDIR}/git"
> -PV = "2.0.0"
> +PV = "2.1.0"
>   LIBVER = "0.0.0"
>   
>   inherit lib_package
> 
> 
> 
> 
> 

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

end of thread, other threads:[~2021-05-27 14:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-27  6:45 [PATCH] [oe] [meta-gnome] [PATCH] libstemmer: upgrade 2.0.0 -> 2.1.0 zangrc
2021-05-27 14:54 ` Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.