gnu: emacs-jabber: Update to 0.10.3.

* gnu/packages/emacs-xyz.scm (emacs-jabber): Update to 0.10.3.
[source]: Switch url.
[arguments]<#:test-command>: Update.
<#:include>: Add.
<#:phases>: Delete 'make-info; add 'unpack-picomemo,
'build-native-module, 'fix-test-runner and 'disable-failing-tests.
[native-inputs]: Add pkg-config and inline picomemo origin.
Remove emacs-ert-runner and texinfo.
[inputs]: Add mbedtls.
[propagated-inputs]: Remove emacs-srv and gnutls.
[home-page]: Update to new URL.
[description]: Mention OMEMO support.
[license]: Update to gpl3+; add isc.

Merges guix/guix!7636

Change-Id: I80c724dea54f87d830354094ecb75f7125b639f9
Signed-off-by: Cayetano Santos <csantosb@inventati.org>

1 files changed, 67 insertions, 12 deletions

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b82d6af3a6..de3479e635 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -24978,36 +24978,91 @@ with Eglot.")
 (define-public emacs-jabber
   (package
     (name "emacs-jabber")
-    (version "0.9.0")
+    (version "0.10.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://codeberg.org/emacs-jabber/emacs-jabber")
-                    (commit (string-append "v" version))))
+                    (url "https://git.thanosapollo.org/emacs-jabber")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0ain52p79sxll0bnsb4llfp1h4pqcqx3l6im4ibia06lg2aiqhpv"))))
+                "1v1a09h6ndqhkwyn44cnx1b0l4p155a09mfjrfmg62li50hvw1zm"))))
     (build-system emacs-build-system)
     (arguments
      (list
       #:lisp-directory "lisp"
+      #:include #~(cons "^[^/]*\\.so$"
+                        %default-include)
       #:emacs emacs                   ;requires gnutls
-      #:test-command #~(list "ert-runner" "../tests")
+      #:test-command #~(list "make" "-C" ".." "test")
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'make-info
+          (add-after 'unpack 'build-native-module
             (lambda _
-              (invoke "makeinfo" "../jabber.texi"))))))
-    (native-inputs (list emacs-ert-runner texinfo))
-    (propagated-inputs (list emacs-fsm emacs-srv gnutls))
-    (home-page "https://codeberg.org/emacs-jabber/emacs-jabber")
+              (invoke "make" "-C" "../src")))
+          (add-before 'build-native-module 'unpack-picomemo
+            (lambda _
+              (copy-recursively
+               #$(this-package-native-input
+                  "emacs-jabber-picomemo")
+               "../src/picomemo")
+              (invoke "chmod" "--recursive" "u+w"
+                      "../src/picomemo")))
+          (add-after 'unpack 'fix-test-runner
+            (lambda _
+              ;; Replace grep -oP (Perl regex) with a
+              ;; POSIX-compatible alternative so the test
+              ;; runner counts results correctly.
+              (substitute* "../Makefile"
+                (("grep -oP '\\^Ran \\\\K\\[0-9\\]\\+'")
+                 (string-append
+                  "grep -o 'Ran [0-9]*'"
+                  " | grep -o '[0-9]*'")))))
+          (add-after 'unpack 'disable-failing-tests
+            (lambda _
+              ;; These 4 tests pass outside the build
+              ;; environment but fail inside it.
+              (define skip "\n  (skip-unless nil)")
+              (substitute*
+                  "../tests/jabber-disco-tests.el"
+                ((".*query-if-needed-cache-miss \\(\\)"
+                  all)
+                 (string-append all skip))
+                ((".*process-caps-modern.*queries \\(\\)"
+                  all)
+                 (string-append all skip)))
+              (substitute*
+                  (string-append
+                   "../tests/"
+                   "jabber-message-correct-tests.el")
+                ((".*correct-last-uses-original-id \\(\\)"
+                  all)
+                 (string-append all skip))
+                ((".*mam-syncing-skipped.*dispatch \\(\\)"
+                  all)
+                 (string-append all skip))))))))
+    (native-inputs
+     (list pkg-config
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                    (url "https://github.com/mierenhoop/picomemo")
+                    (commit "1.1.0")))
+             (file-name "emacs-jabber-picomemo")
+             (sha256
+              (base32
+               "044xd1gn9lpd5yrb3c1lmvqsc1chbkhd3vnh7800hxn23a0hxbzj")))))
+    (inputs (list mbedtls))
+    (propagated-inputs (list emacs-fsm))
+    (home-page "https://thanosapollo.org/projects/jabber/")
     (synopsis "XMPP (Jabber) client for Emacs")
     (description
      "@code{jabber.el} is an XMPP client for Emacs.  XMPP (also known as
 \"Jabber\") is an instant messaging system; see @url{https://xmpp.org} for
-more information.")
-    (license license:gpl2+)))
+more information.  It supports OMEMO end-to-end encryption via picomemo.")
+    (license (list license:gpl3+    ;gpl2+ elisp, gpl3+ C
+                   license:isc))))  ;picomemo
 
 (define-public emacs-jarchive
   (package