[PATCH 0/4] gajim: Update to latest version

  • Open
  • quality assurance status badge
Details
3 participants
  • ???
  • jgart
  • Gisement
Owner
unassigned
Submitted by
Gisement
Severity
normal
G
G
Gisement wrote on 15 Jul 13:19 +0200
(address . guix-patches@gnu.org)(name . Gisement)(address . sisiutl@egregore.fun)
cover.1721040408.git.sisiutl@egregore.fun
Hello Guix!

This patch series simply bumps Gajim to the latest version, along with all the
necessary dependencies.

The most significant change is updating python-protobuf to the 5.27.2.

It also adds an implementation of OMEMO Double Ratchet in Python.

Gisement (4):
gnu: python-protobuf: Update to 5.27.2.
gnu: Add python-omemo-dr.
gnu: python-nbxmpp: Update to 5.0.1.
gnu: gajim: Update to 1.9.1.

gnu/packages/messaging.scm | 16 +++++++++++-----
gnu/packages/protobuf.scm | 14 +++++++-------
gnu/packages/python-crypto.scm | 19 +++++++++++++++++++
3 files changed, 37 insertions(+), 12 deletions(-)


base-commit: eb508e32d2d359c94d2cabebfe90dc32ca5dcf4f
--
2.45.2
G
G
Gisement wrote on 15 Jul 19:28 +0200
bug#72125 [PATCH 1/4] gnu: python-protobuf: Update to 5.27.2.
(address . guix-patches@gnu.org)(name . Gisement)(address . sisiutl@egregore.fun)
891a0c8b9709c11508a9b45a61dd0a46169a365d.1721040408.git.sisiutl@egregore.fun
Change-Id: Ibaf04dd3d66789ab0e2407e25e1a79e55f4d6e4d
---
gnu/packages/protobuf.scm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

Toggle diff (35 lines)
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index d47b67fa61..ef91a1b838 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -429,21 +429,21 @@ (define-public python-nanopb
(define-public python-protobuf
(package
(name "python-protobuf")
- (version "3.20.2")
+ (version "5.27.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "protobuf" version))
(sha256
- (base32
- "0l0p2lczs5iahgkhzm3298pjl49bk9iiwngkglg7ll7fkqqwlbbi"))))
+ (base32 "0517bvr76daiwnz3jb099mckmklh5kzjg0pjfmh8bbxr4vrdxv7k"))))
(build-system python-build-system)
(inputs (list protobuf))
+ ;; The library moved to upb, a C implementation faster than C++ and
+ ;; native python. It requires no special installation.
(arguments
- `(;; Favor C++ implementation from protobuf over the native Python
- ;; implementation. The additional dependency yields significant
- ;; performance improvements for some workloads.
- #:configure-flags '("--cpp_implementation")))
+ ;; There are no tests.
+ (list
+ #:tests? #f))
(home-page "https://github.com/google/protobuf")
(synopsis "Protocol buffers is a data interchange format")
(description
--
2.45.2
J
J
jgart wrote on 15 Jul 23:27 +0200
Re: [PATCH 0/4] gajim: Update to latest version
(address . 72125@debbugs.gnu.org)
871q3ue47l.fsf@dismail.de
Hi,

I can't apply your patch with `mumi am`:

$ mumi current 72125
$ mumi am -- -s -S
Backtrace:
3 (primitive-load "/gnu/store/p3xfvin2a76618144l39i4nn17a…")
In mumi/client.scm:
701:26 2 (am-reroll-count #:reroll-count _ #:dry-run? _ # _)
In srfi/srfi-1.scm:
365:28 1 (take-right (#<<patch> subject: "[PATCH 0/4] gajim: U…>) …)
In unknown file:
0 (list-tail (#<<patch> subject: "[PATCH 0/4] gajim: Up…>) …)

ERROR: In procedure list-tail:
In procedure list-tail: Wrong type argument in position 1 (expecting
pair): ()

How was it that you sent it?

--
all the best,
jgart
G
G
Gisement wrote on 15 Jul 19:34 +0200
bug#72125: [PATCH 2/4] gnu: Add python-omemo-dr.
(address . guix-patches@gnu.org)(name . Gisement)(address . sisiutl@egregore.fun)
1e49a60fbb1f3895f27388a50b36bc0e32758bb6.1721040408.git.sisiutl@egregore.fun
Change-Id: Ia671207bc6160d23396c2fa7c23e652b11c5dee9
---
gnu/packages/python-crypto.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)

Toggle diff (32 lines)
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index d25059c86b..64e7f1b887 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -758,6 +758,25 @@ (define-public python-axolotl
asynchronous messaging environments.")
(license license:gpl3)))
+(define-public python-omemo-dr
+ (package
+ (name "python-omemo-dr")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "omemo-dr" version))
+ (sha256
+ (base32 "0qfk0b153cmc85icnlpfv8mjaqd2spa7hlipvndr8wqx4dvqr2ia"))))
+ (build-system python-build-system)
+ (home-page "https://pypi.org/project/omemo-dr/")
+ (synopsis "OMEMO Double Ratchet in Python")
+ (description
+ "Initial codebase was forked from
+ https://github.com/tgalal/python-axolotl but has since been heavily
+ rewritten.")
+ (license license:gpl3)
+ (native-inputs (list python-protobuf python-cryptography))))
(define-public python-pyaes
(package
--
2.45.2
G
G
Gisement wrote on 15 Jul 19:43 +0200
bug#72125 [PATCH 3/4] gnu: python-nbxmpp: Update to 5.0.1.
(address . guix-patches@gnu.org)(name . Gisement)(address . sisiutl@egregore.fun)
c1631a1571f08883217a8f57ba16e7dcd86c6897.1721040408.git.sisiutl@egregore.fun
Change-Id: I52bcc544a43544f682b705de6622982f539a787e
---
gnu/packages/messaging.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0278653faf..ebe5a90be9 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1141,13 +1141,13 @@ (define-public znc
(define-public python-nbxmpp
(package
(name "python-nbxmpp")
- (version "4.2.2")
+ (version "5.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "nbxmpp" version))
(sha256
- (base32 "095nyy6vjildhrqigxk6vsh49in6mx17bvb3z5zpjmzhv9b8ix46"))))
+ (base32 "06876pqs44apqflgv1ijqbd446j5dai1alq833miy900kr8wg9ba"))))
(build-system pyproject-build-system)
(arguments
(list
--
2.45.2
G
G
Gisement wrote on 15 Jul 19:43 +0200
bug#72125 [PATCH 4/4] gnu: gajim: Update to 1.9.1.
(address . guix-patches@gnu.org)(name . Gisement)(address . sisiutl@egregore.fun)
8bc4a2efb44c38d637e8ec2b7e62607748af2b98.1721040408.git.sisiutl@egregore.fun
Change-Id: I3abfc061d43645ec4a4c5432a63db96ccd6a1f94
---
gnu/packages/messaging.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

Toggle diff (50 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index ebe5a90be9..f02b905e9d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1176,7 +1176,7 @@ (define-public python-nbxmpp
(define-public gajim
(package
(name "gajim")
- (version "1.7.3")
+ (version "1.9.1")
(source
(origin
(method url-fetch)
@@ -1184,7 +1184,7 @@ (define-public gajim
(version-major+minor version)
"/gajim-" version ".tar.gz"))
(sha256
- (base32 "066kvkjw3qcdanr3nczy0wgcwihk9jc9zhzfr5bwlqvcyxcv7k5p"))
+ (base32 "1sssxahqvk6hpd1vc3b4lr35x0kf1sb3lmgn4w0djbh6iwdg7xan"))
(patches
(search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
(build-system python-build-system)
@@ -1297,18 +1297,24 @@ (define-public gajim
libsoup
libxscrnsaver
network-manager
+ python-cryptography
python-css-parser
python-dbus
+ python-emoji
python-gssapi
python-idna
python-keyring
python-nbxmpp
+ python-omemo-dr
python-packaging
python-pillow
python-precis-i18n
+ python-protobuf
python-pycairo
python-pygobject
- python-pyopenssl))
+ python-pyopenssl
+ python-qrcode
+ python-sqlalchemy-2))
(propagated-inputs
(list dconf))
(synopsis "Fully-featured XMPP client")
--
2.45.2
G
G
Gisement wrote on 16 Jul 01:09 +0200
bug#72125 Re: [PATCH 0/4] gajim: Update to latest version
(address . guix-patches@gnu.org)
87sewa9rsd.fsf@egregore.fun
jgart <jgart@dismail.de> writes:

Toggle quote (6 lines)
> Hi,
>
> I can't apply your patch with `mumi am`:
>
> How was it that you sent it?

Hi!

I sent them using git send-mail.

I think the problem comes from my end. The mail server apparently didn't
send the patches 2, 3 and 4 to debbugs, so I had to resend them using
the guix-patches address and putting the bug tag in the subject line.

I think it may work now. Thank you!

--
You will not survive.
?
?
??? wrote on 30 Jul 13:57 +0200
Re: [bug#72125] [PATCH 1/4] gnu: python-protobuf: Update to 5.27.2.
(name . Gisement)(address . sisiutl@egregore.fun)(address . 72125@debbugs.gnu.org)
87plqv9jnr.fsf@envs.net
Gisement <sisiutl@egregore.fun> writes:

Toggle quote (16 lines)
> Change-Id: Ibaf04dd3d66789ab0e2407e25e1a79e55f4d6e4d
> ---
> gnu/packages/protobuf.scm | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
> index d47b67fa61..ef91a1b838 100644
> --- a/gnu/packages/protobuf.scm
> +++ b/gnu/packages/protobuf.scm
> @@ -429,21 +429,21 @@ (define-public python-nanopb
> (define-public python-protobuf
> (package
> (name "python-protobuf")
> - (version "3.20.2")
> + (version "5.27.2")

Hello, this will broke packages (eg: onnx) which still depends on
protobuf < 4, the packages list can be get via:
guix refresh --list-dependent python-protobuf

I guess onnx is not the only one will fail.

Maybe introduce as a new 'python-protobuf-5' package?
?
?
??? wrote on 30 Jul 14:01 +0200
Re: [bug#72125] [PATCH 2/4] gnu: Add python-omemo-dr.
(name . Gisement)(address . sisiutl@egregore.fun)(address . 72125@debbugs.gnu.org)
87mslz9jib.fsf@envs.net
Gisement <sisiutl@egregore.fun> writes:

Toggle quote (20 lines)
> [...]
>
> +(define-public python-omemo-dr
> + (package
> + (name "python-omemo-dr")
> + (version "1.0.1")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (pypi-uri "omemo-dr" version))
> + (sha256
> + (base32 "0qfk0b153cmc85icnlpfv8mjaqd2spa7hlipvndr8wqx4dvqr2ia"))))
> + (build-system python-build-system)
> + (home-page "https://pypi.org/project/omemo-dr/")
> + (synopsis "OMEMO Double Ratchet in Python")
> + (description
> + "Initial codebase was forked from
> + https://github.com/tgalal/python-axolotl but has since been heavily
> + rewritten.")

Hello, It's not clear what this package does from synopsis and
description, could you give a more descriptive one? Thanks.
?
?
??? wrote on 30 Jul 14:06 +0200
Re: [bug#72125] [PATCH 4/4] gnu: gajim: Update to 1.9.1.
(name . Gisement)(address . sisiutl@egregore.fun)(address . 72125@debbugs.gnu.org)
87jzh39j8s.fsf@envs.net
Gisement <sisiutl@egregore.fun> writes:

Toggle quote (5 lines)
> Change-Id: I3abfc061d43645ec4a4c5432a63db96ccd6a1f94
> ---
> gnu/packages/messaging.scm | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)

Hello, the patch is missing commit message here, which should look like:

* gnu/packages/messaging.scm (gajim): Update to 1.9.1.
[inputs]: Add ......

Could you send an update patch series with commit messages?
Thank you!
?
?
??? wrote on 30 Jul 14:07 +0200
Re: [bug#72125] [PATCH 3/4] gnu: python-nbxmpp: Update to 5.0.1.
(name . Gisement)(address . sisiutl@egregore.fun)(address . 72125@debbugs.gnu.org)
87h6c79j81.fsf@envs.net
Gisement <sisiutl@egregore.fun> writes:

Toggle quote (16 lines)
> Change-Id: I52bcc544a43544f682b705de6622982f539a787e
> ---
> 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 0278653faf..ebe5a90be9 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -1141,13 +1141,13 @@ (define-public znc
> (define-public python-nbxmpp
> (package
> (name "python-nbxmpp")
> - (version "4.2.2")
> + (version "5.0.1")

5.0.3 is out, also missing commit message.
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 72125@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 72125
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch