Subject: bug#46411: closed (Re: [bug#46411] Update Gajim)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 11 Feb 2021 08:31:01 +0000

Your bug report

#46411: Update Gajim

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
46411: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=46411
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#46411] Update Gajim
From: 宋文武 <[email-masked]>
To: Raghav Gururajan <[email-masked]>
Cc: [email-masked]
Date: Thu, 11 Feb 2021 16:31:58 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Raghav Gururajan <[email-masked]> writes:

> Hello Guix!
>
> Please find the attached patch-set to update gajim stuff.
>

I simplified some commit messages, as we usually use 'Update to ...',
no need to mention the origin hash.

Pushed, thank you!

Subject: Update Gajim
From: Raghav Gururajan <[email-masked]>
To: [email-masked]
Date: Tue, 9 Feb 2021 17:54:32 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello Guix!

Please find the attached patch-set to update gajim stuff.

Thank you!

Regards,
RG.
From 8cb25ed6b8c5bfccf8308b842b697659ad1fdb47 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Mon, 8 Feb 2021 23:29:19 -0500
Subject: [PATCH 1/6] gnu: python-nbxmpp: Update to 2.0.1.

* gnu/packages/messaging.scm (python-nbxmpp) [version]: Update to 2.0.1.
[source]<origin>[sha256]: Modify base32.
---
 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 8ddf70540a..6e6bde31bc 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -931,14 +931,14 @@ simultaneously and therefore appear under the same nickname on IRC.")
 (define-public python-nbxmpp
   (package
     (name "python-nbxmpp")
-    (version "1.0.2")
+    (version "2.0.1")
     (source
      (origin
        (method url-fetch)
        (uri
         (pypi-uri "nbxmpp" version))
        (sha256
-        (base32 "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr"))))
+        (base32 "0184nklbpzriq081lghsfavw9m8jr5kc45qqy4v4rdnxn64j7njc"))))
     (build-system python-build-system)
     (native-inputs
      `(("glib:bin" ,glib "bin")))
-- 
2.30.0

From 4aab9b6e804e4adc9ee71136ce36e5be5a4fd9cf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Mon, 8 Feb 2021 23:32:47 -0500
Subject: [PATCH 2/6] gnu: python-nbxmpp: Support GSSAPI authentication.

* gnu/packages/messaging.scm (python-nbxmpp) [inputs]: Add python-gssapi.
---
 gnu/packages/messaging.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 6e6bde31bc..4147d56de6 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -946,6 +946,7 @@ simultaneously and therefore appear under the same nickname on IRC.")
      `(("glib" ,glib)
        ("glib-networking" ,glib-networking)
        ("libsoup" ,libsoup)
+       ("python-gssapi" ,python-gssapi)
        ("python-idna" ,python-idna)
        ("python-precis-i18n" ,python-precis-i18n)
        ("python-pygobject" ,python-pygobject)))
-- 
2.30.0

From 705583bd407eebeac884fdd701c8a92831110555 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Tue, 9 Feb 2021 17:01:35 -0500
Subject: [PATCH 3/6] gnu: gajim: Update to 1.3.0.

* gnu/packages/messaging.scm (gajim) [version]: Modify.
[source]<origin>[sha256]: Modify base 32.
[arguments]<#:phases>['disable-failing-tests]: New phase.
---
 gnu/packages/messaging.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4147d56de6..1565fcfc8c 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -963,7 +963,7 @@ of xmpppy.")
 (define-public gajim
   (package
     (name "gajim")
-    (version "1.2.2")
+    (version "1.3.0")
     (source
      (origin
        (method url-fetch)
@@ -972,7 +972,7 @@ of xmpppy.")
                        (version-major+minor version)
                        "/gajim-" version ".tar.gz"))
        (sha256
-        (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))
+        (base32 "1v0cx8r1zr9aj17ik5apxxfpr9rv5w8p1i7hfys6wp9292gc7s25"))
        (patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
     (build-system python-build-system)
     (arguments
@@ -986,6 +986,11 @@ of xmpppy.")
         (guix build utils))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             ;; https://dev.gajim.org/gajim/gajim/-/issues/10427
+             (delete-file "test/unit/test_gui_interface.py")
+             #t))
          (replace 'check
            (lambda _
              ;; Tests require a running X server.
-- 
2.30.0

From 1c70f77443447378992006c5fd36daa7ee02bacf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Tue, 9 Feb 2021 17:03:56 -0500
Subject: [PATCH 4/6] gnu: gajim: Fix credentials management.

* gnu/packages/messaging.scm (gajim) [inputs]: Remove gnome-keyring.
Add libsecret.
---
 gnu/packages/messaging.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1565fcfc8c..6ae1e0659a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1052,7 +1052,6 @@ of xmpppy.")
        ("geoclue" ,geoclue)
        ("glib" ,glib)
        ("glib-networking" ,glib-networking)
-       ("gnome-keyring" ,gnome-keyring)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gsound",gsound)
        ("gspell" ,gspell)
@@ -1060,6 +1059,7 @@ of xmpppy.")
        ("gst-plugins-base" ,gst-plugins-base)
        ("gtk+" ,gtk+)
        ("gupnp-igd" ,gupnp-igd)
+       ("libsecret" ,libsecret)
        ("libsoup" ,libsoup)
        ("libxss" ,libxscrnsaver)
        ("network-manager" ,network-manager)
-- 
2.30.0

From 04edc6adf2204fc9b1d3ee758545742a6386b181 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Tue, 9 Feb 2021 17:29:25 -0500
Subject: [PATCH 5/6] gnu: gajim-omemo: Update to 2.7.13.

* gnu/packages/messaging.scm (gajim-omemo) [version]: Modify.
[source]<origin>[sha256]: Modify base32.
---
 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 6ae1e0659a..641ddb6ca1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1084,7 +1084,7 @@ and OpenPGP) and available in 29 languages.")
 (define-public gajim-omemo
   (package
     (name "gajim-omemo")
-    (version "2.6.80")
+    (version "2.7.13")
     (source
      (origin
        (method url-fetch/zipbomb)
@@ -1093,7 +1093,7 @@ and OpenPGP) and available in 29 languages.")
          "https://ftp.gajim.org/plugins_releases/omemo_"
          version ".zip"))
        (sha256
-        (base32 "179hgx091c12258335znn1540jhp4z3n3wv5ksrgqq7l3jgc93d7"))))
+        (base32 "1msr71rvik05wjpa2inpkadddad2rxaqbqcww5qrdrcz75pm8brn"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
-- 
2.30.0

From 5495256dd0bd65b648e6161d734a81e3ed40ada4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Tue, 9 Feb 2021 17:40:39 -0500
Subject: [PATCH 6/6] gnu: gajim-openpgp: Update to 1.3.9.

* gnu/packages/messaging.scm (gajim-openpgp) [version]: Modify.
[source]<origin>[sha256]: Modify base32.
[propagated-inputs]: Add python-gpg.
---
 gnu/packages/messaging.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 641ddb6ca1..1878c71c7d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1122,7 +1122,7 @@ multi-client end-to-end encryption.")
 (define-public gajim-openpgp
   (package
     (name "gajim-openpgp")
-    (version "1.2.14")
+    (version "1.3.9")
     (source
      (origin
        (method url-fetch/zipbomb)
@@ -1131,7 +1131,7 @@ multi-client end-to-end encryption.")
          "https://ftp.gajim.org/plugins_releases/openpgp_"
          version ".zip"))
        (sha256
-        (base32 "0wdjpf1i4pvl4ha4plfpywwi9aw5n2mhrpv8mmbidpawxqfbd94b"))))
+        (base32 "0fzvvrap1hmj4rbrcjs6cs5c9l9c0795bgw9vxxxk915n6j91m23"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -1146,7 +1146,8 @@ multi-client end-to-end encryption.")
            #t))))
     (propagated-inputs
      `(("python-cryptography" ,python-cryptography)
-       ("python-gnupg" ,python-gnupg)))
+       ("python-gnupg" ,python-gnupg)
+       ("python-gpg" ,python-gpg)))
     (synopsis "Gajim OpenPGP plugin")
     (description "Gajim-OpenPGP is a plugin that adds support for the OpenPGP
 Encryption to Gajim.")
-- 
2.30.0