[bug#64217] [PATCH 0/3] Add emacs-spamfilter-el and update emacs-wanderlust.

[bug#64217] [PATCH 0/3] Add emacs-spamfilter-el and update emacs-wanderlust.

[Hilton Chain via Guix-patches via]

This patchset:
* Adds emacs-spamfilter-el, an optional dependency for emacs-wanderlust.
Navi2ch is not packaged in Guix so @url{} is used in description.
* Updates emacs-wanderlust and its dependencies to the latest commit.

Hilton Chain (3):
  gnu: Add emacs-spamfilter-el.
  gnu: emacs-flim-lb: Update to 1.14.9-136.2cf5a78.
  gnu: emacs-wanderlust: Update to 2.15.9-789.3a827f7.

 gnu/packages/emacs-xyz.scm | 63 +++++++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 8 deletions(-)


base-commit: 8b6bc4b2aa579193306cdc7a28f788c9afb4e039
--
2.40.1

[bug#64217] [PATCH 1/3] gnu: Add emacs-spamfilter-el.

[Hilton Chain via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-spamfilter-el): New variable.
(emacs-wanderlust)[propagated-inputs]: Add emacs-spamfilter-el.
---
 gnu/packages/emacs-xyz.scm | 44 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 08d53be8a9..9d9dc26179 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35405,6 +35405,48 @@ (define-public emacs-spaceleader
 provides an easy way to bind keys under a configurable prefix key.")
       (license license:gpl3+))))
 
+(define-public emacs-spamfilter-el
+  (package
+    (name "emacs-spamfilter-el")
+    (version "1.13")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://web.archive.org/web/20190227001412/"
+                    "http://www.geocities.co.jp/SiliconValley-PaloAlto/7043/"
+                    "spamfilter-1.1.tar.gz"))
+              (sha256
+               (base32
+                "1rd7wfn24bqlqlrrhq0d87vfhhcq09pnmrkkr7jpcnsls081a2iv"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'convert-encoding
+                 (lambda _
+                   (for-each
+                    (lambda (name)
+                      (invoke "iconv" "-f" "EUC-JP" "-t" "UTF-8" name "-o" name))
+                    (find-files "." "\\.el")))))))
+    (home-page
+     (string-append
+      "https://web.archive.org/web/20190326203214/"
+      "http://www.geocities.co.jp/SiliconValley-PaloAlto/7043/index.html#spamfilter.el"))
+    (synopsis "Bayesian spam filter")
+    (description
+     "This package provides a spam filtering library for Emacs MUAs.  It
+supports Japanese and has the following features:
+
+@itemize
+@item Pure Emacs Lisp implementation.
+@item Interactive process within the MUA.
+@item Incremental corpus learning.
+@item Three different methods for Japanese word segmentation.
+@item Built-in support for @code{emacs-wanderlust} and @code{emacs-mew}.
+@item @url{https://github.com/naota/navi2ch, Navi2ch} integration.
+@end itemize\n")
+    (license license:gpl2+)))
+
 (define-public emacs-promise
   ;; XXX: Last stable release fails to build with "(wrong-number-of-arguments
   ;; (3 . 4) 2)" error.
@@ -37138,7 +37180,7 @@ (define-public emacs-wanderlust
                           (string-append m infodir))))
                      (invoke "make" "install")
                      (invoke "make" "install-info"))))))
-      (propagated-inputs (list emacs-semi-epg))
+      (propagated-inputs (list emacs-semi-epg emacs-spamfilter-el))
       (home-page "https://www.emacswiki.org/emacs/WanderLust")
       (synopsis "Yet Another Message Interface on Emacsen")
       (description
-- 
2.40.1

[bug#64217] [PATCH 2/3] gnu: emacs-flim-lb: Update to 1.14.9-136.2cf5a78.

[Hilton Chain via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-flim-lb): Update to 1.14.9-136.2cf5a78.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9d9dc26179..7899e25d49 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37060,8 +37060,8 @@ (define-public emacs-apel-lb
 (define-public emacs-flim-lb
   ;; No release since Nov 28, 2007.
   (let ((version "1.14.9")
-        (revision "134")
-        (commit "3a931b566494e7dc210a5109b60c8cbd5b655108"))
+        (revision "136")
+        (commit "2cf5a7891090faca8de725b1d3743dcedf233ea2"))
     (package
       (name "emacs-flim-lb")
       (version (git-version version revision commit))
@@ -37073,7 +37073,7 @@ (define-public emacs-flim-lb
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0hva2nm0k37ssx42s0h9d9y6nawmp1g4qz1s8bvmp3s1897pvssz"))))
+                  "1wsnipyl3blldcl8ynmpj1mxfvl7kjmxd8gapl83vqd3r0l9cr6q"))))
       (build-system emacs-build-system)
       (propagated-inputs (list emacs-apel-lb emacs-oauth2))
       (home-page "https://www.emacswiki.org/emacs/WanderLust")
-- 
2.40.1

[bug#64217] [PATCH 3/3] gnu: emacs-wanderlust: Update to 2.15.9-789.3a827f7.

[Hilton Chain via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-wanderlust): Update to 2.15.9-789.3a827f7.
[snippet]: Require missing feature for build script.
---
 gnu/packages/emacs-xyz.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7899e25d49..f32327eae7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37118,8 +37118,8 @@ (define-public emacs-wanderlust
   ;; macro-expansion failure at runtime, so don't rewrite emacs input of this
   ;; package.
   (let ((version "2.15.9")
-        (revision "779")
-        (commit "f5cb2f0cf5e2c893acf2e669fd549836828dfdfc"))
+        (revision "789")
+        (commit "3a827f7a1faf7853367902800fc4841636f657df"))
     (package
       (name "emacs-wanderlust")
       (version (git-version version revision commit))
@@ -37137,10 +37137,15 @@ (define-public emacs-wanderlust
                                            "(setq WL_PREFIX \"\")" "\n"
                                            "(setq ELMO_PREFIX \"\")" "\n")))
                          (substitute* "Makefile"
-                           (("package-user-dir") "NONE"))))
+                           (("package-user-dir") "NONE"))
+                         ;; error: (void-function install-file)
+                         ;; <https://github.com/wanderlust/wanderlust/pull/212>
+                         (substitute* "WL-MK"
+                           (("wl-texinfo-install \\(\\)" all)
+                            (string-append all "\n(require 'install)")))))
                 (sha256
                  (base32
-                  "1ijs57wv1vrh33vn311hgkp42vlmjyi998nc4qdrqi7yy9j8hl1h"))))
+                  "178rw2xvm74n71pamwznvnj4lbzvfkvji6rrsi6f8yd8bds10202"))))
       (build-system emacs-build-system)
       (arguments
        (list #:phases
-- 
2.40.1

[bug#64217] [PATCH v2 0/3] Add emacs-spamfilter-el and update emacs-wanderlust.

[Hilton Chain via Guix-patches via]

v1 -> v2:
* Put emacs-spamfilter-el from propagated-inputs to inputs of emacs-wanderlust.
* Update emacs-wanderlust to 2.15.9-791.8369b2d, fixes the install-info issue.

Hilton Chain (3):
  gnu: Add emacs-spamfilter-el.
  gnu: emacs-flim-lb: Update to 1.14.9-136.2cf5a78.
  gnu: emacs-wanderlust: Update to 2.15.9-791.8369b2d.

 gnu/packages/emacs-xyz.scm | 55 +++++++++++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 6 deletions(-)


base-commit: d6dc82e8cdb2d6114a12b06d449ce7f1150c7f70
--
2.40.1

Diff range from v1 to v2:
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f32327eae7..0b53800a85 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37118,8 +37118,8 @@ (define-public emacs-wanderlust
   ;; macro-expansion failure at runtime, so don't rewrite emacs input of this
   ;; package.
   (let ((version "2.15.9")
-        (revision "789")
-        (commit "3a827f7a1faf7853367902800fc4841636f657df"))
+        (revision "791")
+        (commit "8369b2d5170a174652294835dd9a18ed21a38cb2"))
     (package
       (name "emacs-wanderlust")
       (version (git-version version revision commit))
@@ -37137,15 +37137,10 @@ (define-public emacs-wanderlust
                                            "(setq WL_PREFIX \"\")" "\n"
                                            "(setq ELMO_PREFIX \"\")" "\n")))
                          (substitute* "Makefile"
-                           (("package-user-dir") "NONE"))
-                         ;; error: (void-function install-file)
-                         ;; <https://github.com/wanderlust/wanderlust/pull/212>
-                         (substitute* "WL-MK"
-                           (("wl-texinfo-install \\(\\)" all)
-                            (string-append all "\n(require 'install)")))))
+                           (("package-user-dir") "NONE"))))
                 (sha256
                  (base32
-                  "178rw2xvm74n71pamwznvnj4lbzvfkvji6rrsi6f8yd8bds10202"))))
+                  "0nqa9z61r308j61rgglacjsfddncbm185gp3rnzqkrpb5qsjzngk"))))
       (build-system emacs-build-system)
       (arguments
        (list #:phases
@@ -37185,7 +37180,8 @@ (define-public emacs-wanderlust
                           (string-append m infodir))))
                      (invoke "make" "install")
                      (invoke "make" "install-info"))))))
-      (propagated-inputs (list emacs-semi-epg emacs-spamfilter-el))
+      (propagated-inputs (list emacs-semi-epg))
+      (inputs (list emacs-spamfilter-el))
       (home-page "https://www.emacswiki.org/emacs/WanderLust")
       (synopsis "Yet Another Message Interface on Emacsen")
       (description

[bug#64217] [PATCH v2 1/3] gnu: Add emacs-spamfilter-el.

[Hilton Chain via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-spamfilter-el): New variable.
(emacs-wanderlust)[inputs]: Add emacs-spamfilter-el.
---
 gnu/packages/emacs-xyz.scm | 43 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 08d53be8a9..3d4e1fc045 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35405,6 +35405,48 @@ (define-public emacs-spaceleader
 provides an easy way to bind keys under a configurable prefix key.")
       (license license:gpl3+))))
 
+(define-public emacs-spamfilter-el
+  (package
+    (name "emacs-spamfilter-el")
+    (version "1.13")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://web.archive.org/web/20190227001412/"
+                    "http://www.geocities.co.jp/SiliconValley-PaloAlto/7043/"
+                    "spamfilter-1.1.tar.gz"))
+              (sha256
+               (base32
+                "1rd7wfn24bqlqlrrhq0d87vfhhcq09pnmrkkr7jpcnsls081a2iv"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'convert-encoding
+                 (lambda _
+                   (for-each
+                    (lambda (name)
+                      (invoke "iconv" "-f" "EUC-JP" "-t" "UTF-8" name "-o" name))
+                    (find-files "." "\\.el")))))))
+    (home-page
+     (string-append
+      "https://web.archive.org/web/20190326203214/"
+      "http://www.geocities.co.jp/SiliconValley-PaloAlto/7043/index.html#spamfilter.el"))
+    (synopsis "Bayesian spam filter")
+    (description
+     "This package provides a spam filtering library for Emacs MUAs.  It
+supports Japanese and has the following features:
+
+@itemize
+@item Pure Emacs Lisp implementation.
+@item Interactive process within the MUA.
+@item Incremental corpus learning.
+@item Three different methods for Japanese word segmentation.
+@item Built-in support for @code{emacs-wanderlust} and @code{emacs-mew}.
+@item @url{https://github.com/naota/navi2ch, Navi2ch} integration.
+@end itemize\n")
+    (license license:gpl2+)))
+
 (define-public emacs-promise
   ;; XXX: Last stable release fails to build with "(wrong-number-of-arguments
   ;; (3 . 4) 2)" error.
@@ -37139,6 +37181,7 @@ (define-public emacs-wanderlust
                      (invoke "make" "install")
                      (invoke "make" "install-info"))))))
       (propagated-inputs (list emacs-semi-epg))
+      (inputs (list emacs-spamfilter-el))
       (home-page "https://www.emacswiki.org/emacs/WanderLust")
       (synopsis "Yet Another Message Interface on Emacsen")
       (description
-- 
2.40.1

[bug#64217] [PATCH v2 2/3] gnu: emacs-flim-lb: Update to 1.14.9-136.2cf5a78.

[Hilton Chain via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-flim-lb): Update to 1.14.9-136.2cf5a78.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3d4e1fc045..0e3231e8f0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37060,8 +37060,8 @@ (define-public emacs-apel-lb
 (define-public emacs-flim-lb
   ;; No release since Nov 28, 2007.
   (let ((version "1.14.9")
-        (revision "134")
-        (commit "3a931b566494e7dc210a5109b60c8cbd5b655108"))
+        (revision "136")
+        (commit "2cf5a7891090faca8de725b1d3743dcedf233ea2"))
     (package
       (name "emacs-flim-lb")
       (version (git-version version revision commit))
@@ -37073,7 +37073,7 @@ (define-public emacs-flim-lb
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0hva2nm0k37ssx42s0h9d9y6nawmp1g4qz1s8bvmp3s1897pvssz"))))
+                  "1wsnipyl3blldcl8ynmpj1mxfvl7kjmxd8gapl83vqd3r0l9cr6q"))))
       (build-system emacs-build-system)
       (propagated-inputs (list emacs-apel-lb emacs-oauth2))
       (home-page "https://www.emacswiki.org/emacs/WanderLust")
-- 
2.40.1

[bug#64217] [PATCH v2 3/3] gnu: emacs-wanderlust: Update to 2.15.9-791.8369b2d.

[Hilton Chain via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-wanderlust): Update to 2.15.9-791.8369b2d.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0e3231e8f0..0b53800a85 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37118,8 +37118,8 @@ (define-public emacs-wanderlust
   ;; macro-expansion failure at runtime, so don't rewrite emacs input of this
   ;; package.
   (let ((version "2.15.9")
-        (revision "779")
-        (commit "f5cb2f0cf5e2c893acf2e669fd549836828dfdfc"))
+        (revision "791")
+        (commit "8369b2d5170a174652294835dd9a18ed21a38cb2"))
     (package
       (name "emacs-wanderlust")
       (version (git-version version revision commit))
@@ -37140,7 +37140,7 @@ (define-public emacs-wanderlust
                            (("package-user-dir") "NONE"))))
                 (sha256
                  (base32
-                  "1ijs57wv1vrh33vn311hgkp42vlmjyi998nc4qdrqi7yy9j8hl1h"))))
+                  "0nqa9z61r308j61rgglacjsfddncbm185gp3rnzqkrpb5qsjzngk"))))
       (build-system emacs-build-system)
       (arguments
        (list #:phases
-- 
2.40.1

bug#64217: [PATCH v2 0/3] Add emacs-spamfilter-el and update emacs-wanderlust.

[Andrew Tropin]

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

On 2023-06-24 20:24, Hilton Chain wrote:

> v1 -> v2:
> * Put emacs-spamfilter-el from propagated-inputs to inputs of emacs-wanderlust.
> * Update emacs-wanderlust to 2.15.9-791.8369b2d, fixes the install-info issue.
>
> Hilton Chain (3):
>   gnu: Add emacs-spamfilter-el.
>   gnu: emacs-flim-lb: Update to 1.14.9-136.2cf5a78.
>   gnu: emacs-wanderlust: Update to 2.15.9-791.8369b2d.
>
>  gnu/packages/emacs-xyz.scm | 55 +++++++++++++++++++++++++++++++++-----
>  1 file changed, 49 insertions(+), 6 deletions(-)
>
>
> base-commit: d6dc82e8cdb2d6114a12b06d449ce7f1150c7f70
> --
> 2.40.1
>
> Diff range from v1 to v2:
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index f32327eae7..0b53800a85 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -37118,8 +37118,8 @@ (define-public emacs-wanderlust
>    ;; macro-expansion failure at runtime, so don't rewrite emacs input of this
>    ;; package.
>    (let ((version "2.15.9")
> -        (revision "789")
> -        (commit "3a827f7a1faf7853367902800fc4841636f657df"))
> +        (revision "791")
> +        (commit "8369b2d5170a174652294835dd9a18ed21a38cb2"))
>      (package
>        (name "emacs-wanderlust")
>        (version (git-version version revision commit))
> @@ -37137,15 +37137,10 @@ (define-public emacs-wanderlust
>                                             "(setq WL_PREFIX \"\")" "\n"
>                                             "(setq ELMO_PREFIX \"\")" "\n")))
>                           (substitute* "Makefile"
> -                           (("package-user-dir") "NONE"))
> -                         ;; error: (void-function install-file)
> -                         ;; <https://github.com/wanderlust/wanderlust/pull/212>
> -                         (substitute* "WL-MK"
> -                           (("wl-texinfo-install \\(\\)" all)
> -                            (string-append all "\n(require 'install)")))))
> +                           (("package-user-dir") "NONE"))))
>                  (sha256
>                   (base32
> -                  "178rw2xvm74n71pamwznvnj4lbzvfkvji6rrsi6f8yd8bds10202"))))
> +                  "0nqa9z61r308j61rgglacjsfddncbm185gp3rnzqkrpb5qsjzngk"))))
>        (build-system emacs-build-system)
>        (arguments
>         (list #:phases
> @@ -37185,7 +37180,8 @@ (define-public emacs-wanderlust
>                            (string-append m infodir))))
>                       (invoke "make" "install")
>                       (invoke "make" "install-info"))))))
> -      (propagated-inputs (list emacs-semi-epg emacs-spamfilter-el))
> +      (propagated-inputs (list emacs-semi-epg))
> +      (inputs (list emacs-spamfilter-el))
>        (home-page "https://www.emacswiki.org/emacs/WanderLust")
>        (synopsis "Yet Another Message Interface on Emacsen")
>        (description
>
>

Hi Hilton!

Applied, slightly updated the code to fit 80 columns, pushed as
a98126e604.  BTW, you can bump revision by only 1, it just should be
greater than previous one if the version still the same.

Thank you for the patches and have a nice day!

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#64217] [PATCH v2 0/3] Add emacs-spamfilter-el and update emacs-wanderlust.

[Liliana Marie Prikler]

Am Mittwoch, dem 28.06.2023 um 07:51 +0400 schrieb Andrew Tropin:
> BTW, you can bump revision by only 1, it just should be
> greater than previous one if the version still the same.
There are some packages that do count the number of commits since the
last revision and I argue it's a good idea to keep that for packages
that already have it.

Cheers