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

From: Raghav Gururajan <[email-masked]>
Date: Tue, 23 Feb 2021 15:01:35 -0500

Hi Leo!

> Great, now re-order them again so that no patch causes a rebuild of a
> formerly patched package.

Done in v4.

>> That would be 3 tests.
> 3 of how many?  And how many on the other package?
Tests are now fixed in v4, with the help of Tobias.

Regards,
RG.
From 2e1a5f04edba75795aa260697e704b189f4ec41d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Fri, 19 Feb 2021 19:37:30 -0500
Subject: [PATCH 1/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 1878c71c7d..a20a322725 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 8d062edc31ca954c4896b3421128687037758bc4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Fri, 19 Feb 2021 20:24:15 -0500
Subject: [PATCH 2/6] gnu: libmesode: Disable static libraries.

* gnu/packages/messaging.scm (libmesode) [arguments]<#:phases>['patch-make]: New phase.
<#:configure-flags>[--disable-static]: New flag.
---
 gnu/packages/messaging.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a20a322725..53515abe8b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2015,6 +2015,17 @@ is also scriptable and extensible via Guile.")
                (base32
                 "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list
+        "--disable-static")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-make
+           (lambda _
+             (substitute* "Makefile.am"
+               (("'\\^xmpp_'") "'.'"))
+             #t)))))
     (inputs
      `(("expat" ,expat)
        ("openssl" ,openssl)))
-- 
2.30.1

From bb38ac368dfd1cd8c1cae4783f1fd9b5368a2c52 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 53515abe8b..14d4a0052a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2045,7 +2045,7 @@ manual SSL certificate verification.")
 (define-public libstrophe
   (package
     (name "libstrophe")
-    (version "0.9.3")
+    (version "0.10.1")
     (source
      (origin
        (method git-fetch)
@@ -2054,7 +2054,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 9a5e084babd6ad1bef077e63257f2e5c7c230167 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]<#:phases>['patch-make]: New phase.
<#:configure-flags>[--disable-static]: New flag.
---
 gnu/packages/messaging.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 14d4a0052a..5f2df4c6fc 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2056,6 +2056,17 @@ manual SSL certificate verification.")
        (sha256
         (base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list
+        "--disable-static")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-make
+           (lambda _
+             (substitute* "Makefile.am"
+               (("'\\^xmpp_'") "'.'"))
+             #t)))))
     (inputs
      `(("expat" ,expat)
        ("openssl" ,openssl)))
-- 
2.30.1

From 06dfa7fb50fcb29faa2ae4f465612cb0daa51368 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Fri, 19 Feb 2021 19:46:39 -0500
Subject: [PATCH 5/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 5f2df4c6fc..1f4c7aae4d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2121,10 +2121,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 90d6f7db7fdfadfb5ebc546702fe0c1a468bc92e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Fri, 19 Feb 2021 20:28:57 -0500
Subject: [PATCH 6/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 1f4c7aae4d..d6e160d5dc 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2100,6 +2100,7 @@ are both supported).")
     (arguments
      `(#:configure-flags
        (list
+        "--disable-static"
         "--enable-notifications"
         "--enable-python-plugins"
         "--enable-c-plugins"
-- 
2.30.1