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

[Andrew Tropin]

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

signature.asc
Description: PGP signature