[PATCH core-updates 0/4] Update enchant to 2.6.8; Add Nuspell support.

  • Done
  • quality assurance status badge
Details
2 participants
  • Nicolas Goaziou
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Nicolas Goaziou
Severity
normal

Debbugs page

N
N
Nicolas Goaziou wrote on 27 Mar 02:30 -0700
(address . guix-patches@gnu.org)(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)
cover.1711531771.git.mail@nicolasgoaziou.fr
This patch set updates enchant and add Nuspell support. I had to fix an issue with unittest-cpp along the way..

Regards,

Nicolas Goaziou (4):
gnu: unittest-cpp: Fix "Version" setting in ".pc" file.
gnu: enchant: Update to 2.6.8.
gnu: enchant: Improve package style.
gnu: enchant: Add Nuspell support.

gnu/packages/check.scm | 6 +++++-
gnu/packages/enchant.scm | 35 ++++++++++++++++++-----------------
2 files changed, 23 insertions(+), 18 deletions(-)


base-commit: 54219dc3a440aaf86ece4a65fec1a97c0952f6f2
--
2.41.0
N
N
Nicolas Goaziou wrote on 27 Mar 02:40 -0700
[PATCH core-updates 1/4] gnu: unittest-cpp: Fix "Version" setting in ".pc" file.
(address . 70024@debbugs.gnu.org)(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)
67173b48a61a732d05833e8c034517c7405acf58.1711531771.git.mail@nicolasgoaziou.fr
* gnu/packages/check.scm (unittest-cpp)[arguments]<#:configure-flags>: Add
Provide a "Version" value in ".pc" file for pkg-config checks.

Change-Id: I934ef3d83d50876be8ab157ba52d8812ed33ba2e
---
gnu/packages/check.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 721cdf8e68..a7d90a2d7d 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3273,7 +3273,11 @@ (define-public unittest-cpp
(sha256
(base32 "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"))))
(arguments
- `(#:tests? #f)) ; It's run after build automatically.
+ (list
+ #:tests? #f ; It's run after build automatically.
+ ;; Fix 'Version:' setting in .pc file. See:
+ ;; <https://github.com/unittest-cpp/unittest-cpp/pull/188>
+ #:configure-flags #~(list (string-append "-DPACKAGE_VERSION=" #$version))))
(build-system cmake-build-system)
(home-page "https://github.com/unittest-cpp/unittest-cpp")
(synopsis "Lightweight unit testing framework for C++")
--
2.41.0
N
N
Nicolas Goaziou wrote on 27 Mar 02:40 -0700
[PATCH core-updates 2/4] gnu: enchant: Update to 2.6.8.
(address . 70024@debbugs.gnu.org)(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)
675c57ccefec2c4f91a80fb324dd118c3ddc105c.1711531771.git.mail@nicolasgoaziou.fr
* gnu/packages/enchant.scm (enchant): Update to 2.6.8.
[native-inputs]: Add GROFF.

Change-Id: I8c7d7e2b9124a55401c6623fd76eacc0878ad6e6
---
gnu/packages/enchant.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

Toggle diff (40 lines)
diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm
index 015af0d096..ca44b7c24d 100644
--- a/gnu/packages/enchant.scm
+++ b/gnu/packages/enchant.scm
@@ -25,6 +25,7 @@ (define-module (gnu packages enchant)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages groff)
#:use-module (gnu packages hunspell)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages man)
@@ -79,7 +80,7 @@ (define-public nuspell
(define-public enchant
(package
(name "enchant")
- (version "2.2.15")
+ (version "2.6.8")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/AbiWord/enchant/releases"
@@ -87,7 +88,7 @@ (define-public enchant
version ".tar.gz"))
(sha256
(base32
- "00vcykbb7lxh51prvmsb62a06q18a6rlk9ba5a7g45c1awaj43rv"))))
+ "1bn7z8155czgzlnq2n4c915cl1vd3v95h1bghic3szy7c8q94rgm"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static"
@@ -100,6 +101,7 @@ (define-public enchant
(list glib))
(native-inputs
`(("glib:bin" ,glib "bin")
+ ("groff" ,groff)
("pkg-config" ,pkg-config)
("unittest-cpp" ,unittest-cpp)))
(synopsis "Multi-backend spell-checking library wrapper")
--
2.41.0
N
N
Nicolas Goaziou wrote on 27 Mar 02:40 -0700
[PATCH core-updates 3/4] gnu: enchant: Improve package style.
(address . 70024@debbugs.gnu.org)(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)
aae76331d8f87b500a3ba53ffed29246cc30440b.1711531771.git.mail@nicolasgoaziou.fr
* gnu/packages/enchant.scm (enchant)[arguments]: Use G-expressions.
[native-inputs]: Drop input labels.
[description]: Be more informative and less technical.

Change-Id: I908fbbfcdc9f21beb1d6e05eec2dbc154b429831
---
gnu/packages/enchant.scm | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)

Toggle diff (57 lines)
diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm
index ca44b7c24d..417b5ce2e1 100644
--- a/gnu/packages/enchant.scm
+++ b/gnu/packages/enchant.scm
@@ -32,6 +32,7 @@ (define-module (gnu packages enchant)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages version-control)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix download)
@@ -91,29 +92,27 @@ (define-public enchant
"1bn7z8155czgzlnq2n4c915cl1vd3v95h1bghic3szy7c8q94rgm"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--disable-static"
- ;; Tests require a relocatable build.
- "--enable-relocatable")))
+ (list
+ #:configure-flags
+ #~(list"--disable-static"
+ ;; Tests require a relocatable build.
+ "--enable-relocatable")))
(inputs
(list aspell hunspell))
(propagated-inputs
;; Required by enchant.pc.
(list glib))
(native-inputs
- `(("glib:bin" ,glib "bin")
- ("groff" ,groff)
- ("pkg-config" ,pkg-config)
- ("unittest-cpp" ,unittest-cpp)))
+ (list `(,glib "bin") groff pkg-config unittest-cpp))
(synopsis "Multi-backend spell-checking library wrapper")
(description
- "On the surface, Enchant appears to be a generic spell checking library.
-Looking closer, you'll see the Enchant is more-or-less a fancy wrapper around
-the dlopen() system call.
-
-Enchant steps in to provide uniformity and conformity on top of these libraries,
-and implement certain features that may be lacking in any individual provider
-library. Everything should \"just work\" for any and every definition of \"just
-working\".")
+ "Enchant is a library---and command-line program---that wraps a number of
+different spelling libraries and programs with a consistent interface. By
+using Enchant, you can use a wide range of spelling libraries, including some
+specialized for particular languages, without needing to program to each
+library's interface. If it's not convenient to call a C library, you can
+access most of Enchant's functionality via the enchant program, which
+communicates over a pipe, like Ispell, and is indeed Ispell-compatible.")
(home-page "https://abiword.github.io/enchant/")
(license lgpl2.1+)))
--
2.41.0
N
N
Nicolas Goaziou wrote on 27 Mar 02:40 -0700
[PATCH core-updates 4/4] gnu: enchant: Add Nuspell support.
(address . 70024@debbugs.gnu.org)(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)
f9d37f694ef23b71a44684b8a46b03f8b6c73e77.1711531771.git.mail@nicolasgoaziou.fr
* gnu/packages/enchant.scm (enchant)[inputs]: Add NUSPELL.

Change-Id: I60d70e6b6e4952722559848f715fc68dcf3e11f4
---
gnu/packages/enchant.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm
index 417b5ce2e1..451be7a956 100644
--- a/gnu/packages/enchant.scm
+++ b/gnu/packages/enchant.scm
@@ -98,7 +98,7 @@ (define-public enchant
;; Tests require a relocatable build.
"--enable-relocatable")))
(inputs
- (list aspell hunspell))
+ (list aspell hunspell nuspell))
(propagated-inputs
;; Required by enchant.pc.
(list glib))
--
2.41.0
N
N
Nicolas Goaziou wrote on 13 Apr 06:57 -0700
Re: [bug#70024] [PATCH core-updates 0/4] Update enchant to 2.6.8; Add Nuspell support.
(name . Nicolas Goaziou via Guix-patches via)(address . guix-patches@gnu.org)
87cyqtmkkk.fsf@nicolasgoaziou.fr
Nicolas Goaziou via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (3 lines)
> This patch set updates enchant and add Nuspell support. I had to fix
> an issue with unittest-cpp along the way..

Friendly ping!

Or, to put it differently, may I commit this to core-updates?

Thanks.
M
M
Maxim Cournoyer wrote on 17 Apr 10:49 -0700
(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)(address . 70024@debbugs.gnu.org)
87frvjop5e.fsf@gmail.com
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

Toggle quote (12 lines)
> This patch set updates enchant and add Nuspell support. I had to fix an issue with unittest-cpp along the way..
>
> Regards,
>
> Nicolas Goaziou (4):
> gnu: unittest-cpp: Fix "Version" setting in ".pc" file.
> gnu: enchant: Update to 2.6.8.
> gnu: enchant: Improve package style.
> gnu: enchant: Add Nuspell support.
>
> gnu/packages/check.scm | 6 +++++-

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

--
Thanks,
Maxim
N
N
Nicolas Goaziou wrote on 18 Apr 04:50 -0700
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 70024-done@debbugs.gnu.org)
878r1ahotc.fsf@nicolasgoaziou.fr
Hello,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

Toggle quote (16 lines)
> Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
>
>> This patch set updates enchant and add Nuspell support. I had to fix an issue with unittest-cpp along the way..
>>
>> Regards,
>>
>> Nicolas Goaziou (4):
>> gnu: unittest-cpp: Fix "Version" setting in ".pc" file.
>> gnu: enchant: Update to 2.6.8.
>> gnu: enchant: Improve package style.
>> gnu: enchant: Add Nuspell support.
>>
>> gnu/packages/check.scm | 6 +++++-
>
> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

Thank you. I applied the patch set to core-updates.

I also bumped enchant to 2.6.9, assuming nothing had been pre-built
during the QA process. If my assumption is wrong, and this change delays
core-update merge too much, it can be reverted.

Regards,
--
Nicolas Goaziou
Closed
M
M
Maxim Cournoyer wrote on 19 Apr 08:27 -0700
(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)(address . 70024-done@debbugs.gnu.org)
87a5lpl6eu.fsf@gmail.com
Hi,

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

Toggle quote (26 lines)
> Hello,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
>> Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
>>
>>> This patch set updates enchant and add Nuspell support. I had to fix an issue with unittest-cpp along the way..
>>>
>>> Regards,
>>>
>>> Nicolas Goaziou (4):
>>> gnu: unittest-cpp: Fix "Version" setting in ".pc" file.
>>> gnu: enchant: Update to 2.6.8.
>>> gnu: enchant: Improve package style.
>>> gnu: enchant: Add Nuspell support.
>>>
>>> gnu/packages/check.scm | 6 +++++-
>>
>> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
>
> Thank you. I applied the patch set to core-updates.
>
> I also bumped enchant to 2.6.9, assuming nothing had been pre-built
> during the QA process. If my assumption is wrong, and this change delays
> core-update merge too much, it can be reverted.

Only the core set of packages is currently being built by the CI for
core-updates, so this impacts core-updates hacker more that anything
else. I think we should setup a branch for core-updates-frozen and have
that fully built anyway.

--
Thanks,
Maxim
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 70024@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70024
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch