Subject: [bug#46653] Make some changes to Profanity stuff (v3)

From: Raghav Gururajan <[email-masked]>
Date: Tue, 23 Feb 2021 12:48:10 -0500

Hi Leo!

I have re-order the patches.

Regards,
RG.
From 6f8dd272536d8e775c12ba4c712a1661990c3cb0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Fri, 19 Feb 2021 19:46:39 -0500
Subject: [PATCH 1/6] gnu: profanity: Add missing inputs.

* gnu/packages/messaging.scm (profanity) [inputs]: Add libgcrypt.
---
 gnu/packages/messaging.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1878c71c7d..a040c91283 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2099,10 +2099,12 @@ are both supported).")
        ("glib" ,glib)
        ("gpgme" ,gpgme)
        ("gtk+" ,gtk+-2)
+       ("libgcrypt" ,libgcrypt)
        ("libmesode" ,libmesode)
        ("libnotify" ,libnotify)
        ("libotr" ,libotr)
        ("libsignal-protocol-c" ,libsignal-protocol-c)
+       ;; ("libxss" ,libxss)
        ("ncurses" ,ncurses)
        ("openssl" ,openssl)
        ("python" ,python-wrapper)
-- 
2.30.1

From f1d581f0b1895399087c71dde8a9949d92522245 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Fri, 19 Feb 2021 20:28:57 -0500
Subject: [PATCH 2/6] gnu: profanity: Disable static libraries.

* gnu/packages/messaging.scm (profanity) [arguments]<#:configure-flag>: Add --disable-static.
---
 gnu/packages/messaging.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a040c91283..a9ecfc9a6b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2078,6 +2078,7 @@ are both supported).")
     (arguments
      `(#:configure-flags
        (list
+        "--disable-static"
         "--enable-notifications"
         "--enable-python-plugins"
         "--enable-c-plugins"
-- 
2.30.1

From 80888970e39c7d15eafa30bc37a100c6691771e4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Tue, 23 Feb 2021 09:39:22 -0500
Subject: [PATCH 3/6] gnu: libstrophe: Update to 0.10.1.

* gnu/packages/messaging.scm (libstrophe) [version]: Update to 0.10.1.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a9ecfc9a6b..86dc232372 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2034,7 +2034,7 @@ manual SSL certificate verification.")
 (define-public libstrophe
   (package
     (name "libstrophe")
-    (version "0.9.3")
+    (version "0.10.1")
     (source
      (origin
        (method git-fetch)
@@ -2043,7 +2043,7 @@ manual SSL certificate verification.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1g1l0w9z9hdy5ncdvd9097gi7k7783did6py5h9camlpb2fnk5mk"))))
+        (base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"))))
     (build-system gnu-build-system)
     (inputs
      `(("expat" ,expat)
-- 
2.30.1

From f150845dc2832e535b619d33b25d3a5797f8e041 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Tue, 23 Feb 2021 12:03:23 -0500
Subject: [PATCH 4/6] gnu: libstrophe: Disable static libraries.

* gnu/packages/messaging.scm (libstrope) [arguments]<#:tests?>: New argument.
<#:configure-flags>[--disable-static]: New flag.
---
 gnu/packages/messaging.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 86dc232372..5319ce116f 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2045,6 +2045,11 @@ manual SSL certificate verification.")
        (sha256
         (base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f         ; https://github.com/strophe/libstrophe/issues/175
+       #:configure-flags
+       (list
+        "--disable-static")))
     (inputs
      `(("expat" ,expat)
        ("openssl" ,openssl)))
-- 
2.30.1

From c78d83fdc8485f0b3c9cf61d8423ee49f9035de4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Fri, 19 Feb 2021 19:37:30 -0500
Subject: [PATCH 5/6] gnu: libmesode: Update source, home-page URIs.

* gnu/packages/messaging.scm (libmesode) [source]: Update to new
upstream URI.
[home-page]: Same.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 5319ce116f..1f741a9164 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2008,7 +2008,7 @@ is also scriptable and extensible via Guile.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/boothj5/libmesode")
+                    (url "https://github.com/profanity-im/libmesode")
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2027,7 +2027,7 @@ is also scriptable and extensible via Guile.")
     (description "Libmesode is a fork of libstrophe for use with Profanity
 XMPP Client.  In particular, libmesode provides extra TLS functionality such as
 manual SSL certificate verification.")
-    (home-page "https://github.com/boothj5/libmesode")
+    (home-page "https://github.com/profanity/libmesode")
     ;; Dual-licensed.
     (license (list license:gpl3+ license:x11))))
 
-- 
2.30.1

From 5732c28480d10881d7163493947032d659702020 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Fri, 19 Feb 2021 20:24:15 -0500
Subject: [PATCH 6/6] gnu: libmesode: Disable static libraries.

* gnu/packages/messaging.scm (libmesode) [arguments]<#:tests?>: New argument.
<#:configure-flags>[--disable-static]: New flag.
---
 gnu/packages/messaging.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1f741a9164..4bd5534fa6 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2015,6 +2015,11 @@ is also scriptable and extensible via Guile.")
                (base32
                 "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f         ; https://github.com/profanity-im/libmesode/issues/20
+       #:configure-flags
+       (list
+        "--disable-static")))
     (inputs
      `(("expat" ,expat)
        ("openssl" ,openssl)))
-- 
2.30.1