GNU bug report logs - #77322
[PATCH] gnu: profanity: Update to 0.15.0.

Previous Next

To reply to this bug, email your comments to 77322 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: ashish.is <at> lostca.se
To: guix-patches <at> gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH] gnu: profanity: Update to 0.15.0.
Date: Thu, 27 Mar 2025 21:11:44 +0000

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/messaging.scm (profanity): Update to 0.15.0.

Change-Id: I4b703d3ac739fd677a7a9d89d1b61531348bcdf5
---
 gnu/packages/messaging.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index e8c25e7881..6b7e49c314 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2246,7 +2246,7 @@ (define-public libstrophe
 (define-public profanity
   (package
     (name "profanity")
-    (version "0.14.0")
+    (version "0.15.0")
     (source
      (origin
        (method url-fetch)
@@ -2255,7 +2255,7 @@ (define-public profanity
                        version ".tar.gz"))
        (sha256
         (base32
-         "0zygsxxwdxmpppr7vyzi2r7d854yjl6918w0lrs7k41iib9zy8zx"))))
+         "1yy7x9ycqg6c65k66z47p8mvj48qc0pa4as1lk1agj8ffn7mg7sa"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags
@@ -2268,7 +2268,14 @@ (define-public profanity
         "--enable-otr"
         "--enable-pgp"
         "--enable-omemo"
-        "--enable-icons-and-clipboard")))
+        "--enable-icons-and-clipboard")
+       #:phases
+       ,#~(modify-phases %standard-phases
+            (add-after 'unpack 'patch-python-plugins
+              (lambda _
+                (substitute* "src/plugins/python_plugins.c"
+                  (("Py_XDECREF")
+                   "Py_DecRef")))))))
     (native-inputs
      (list autoconf
            autoconf-archive

base-commit: 2eb22e3d0f8013e438813b1a2c5f8b1e020fcde2
-- 
2.49.0

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Z572 <z572 <at> z572.online>
To: "ashish.is--- via Guix-patches" via <guix-patches <at> gnu.org>
Cc: 77322 <at> debbugs.gnu.org, ashish.is <at> lostca.se
Subject: Re: [bug#77322] [PATCH] gnu: profanity: Update to 0.15.0.
Date: Fri, 28 Mar 2025 13:30:58 +0800

[Message part 1 (text/plain, inline)]

"ashish.is--- via Guix-patches" via <guix-patches <at> gnu.org> writes:

> From: Ashish SHUKLA <ashish.is <at> lostca.se>
>
> * gnu/packages/messaging.scm (profanity): Update to 0.15.0.

please add "[arguments]<#:phases>: Add patch-python-plugins phase."

>
> Change-Id: I4b703d3ac739fd677a7a9d89d1b61531348bcdf5
> ---
>  gnu/packages/messaging.scm | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index e8c25e7881..6b7e49c314 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -2246,7 +2246,7 @@ (define-public libstrophe
>  (define-public profanity
>    (package
>      (name "profanity")
> -    (version "0.14.0")
> +    (version "0.15.0")
>      (source
>       (origin
>         (method url-fetch)
> @@ -2255,7 +2255,7 @@ (define-public profanity
>                         version ".tar.gz"))
>         (sha256
>          (base32
> -         "0zygsxxwdxmpppr7vyzi2r7d854yjl6918w0lrs7k41iib9zy8zx"))))
> +         "1yy7x9ycqg6c65k66z47p8mvj48qc0pa4as1lk1agj8ffn7mg7sa"))))
>      (build-system glib-or-gtk-build-system)
>      (arguments
>       `(#:configure-flags
> @@ -2268,7 +2268,14 @@ (define-public profanity
>          "--enable-otr"
>          "--enable-pgp"
>          "--enable-omemo"
> -        "--enable-icons-and-clipboard")))
> +        "--enable-icons-and-clipboard")
> +       #:phases
> +       ,#~(modify-phases %standard-phases
> +            (add-after 'unpack 'patch-python-plugins
> +              (lambda _
> +                (substitute* "src/plugins/python_plugins.c"
> +                  (("Py_XDECREF")
> +                   "Py_DecRef")))))))

why need this? please add a commit.

>      (native-inputs
>       (list autoconf
>             autoconf-archive
>
> base-commit: 2eb22e3d0f8013e438813b1a2c5f8b1e020fcde2

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 77322 <at> debbugs.gnu.org (full text, mbox):

From: ashish.is <at> lostca.se
To: z572 <at> z572.online
Cc: 77322 <at> debbugs.gnu.org, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v2] gnu: profanity: Update to 0.15.0.
Date: Fri, 28 Mar 2025 11:48:58 +0000

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/messaging.scm (profanity): Update to 0.15.0.
[arguments]<#:phases>: Add patch-python-plugins phase.

Change-Id: I654a9648d973653fd44b19fcacd822bbb0570fd9
---
Hi,

Revising this patch with the definition of Py_XDECREF macro[0], as it's upstream.

[0] https://github.com/python/cpython/blob/3.10/Include/object.h#L571

Thanks!

 gnu/packages/messaging.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index e8c25e7881..98d7655c44 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2246,7 +2246,7 @@ (define-public libstrophe
 (define-public profanity
   (package
     (name "profanity")
-    (version "0.14.0")
+    (version "0.15.0")
     (source
      (origin
        (method url-fetch)
@@ -2255,7 +2255,7 @@ (define-public profanity
                        version ".tar.gz"))
        (sha256
         (base32
-         "0zygsxxwdxmpppr7vyzi2r7d854yjl6918w0lrs7k41iib9zy8zx"))))
+         "1yy7x9ycqg6c65k66z47p8mvj48qc0pa4as1lk1agj8ffn7mg7sa"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags
@@ -2268,7 +2268,15 @@ (define-public profanity
         "--enable-otr"
         "--enable-pgp"
         "--enable-omemo"
-        "--enable-icons-and-clipboard")))
+        "--enable-icons-and-clipboard")
+       #:phases
+       ,#~(modify-phases %standard-phases
+            (add-after 'unpack 'patch-python-plugins
+              (lambda _
+                ;; Py_XDECREF is a macro in Python 3.10
+                (substitute* "src/plugins/python_plugins.c"
+                  (("Py_XDECREF")
+                   "_Py_XDECREF")))))))
     (native-inputs
      (list autoconf
            autoconf-archive

base-commit: 2eb22e3d0f8013e438813b1a2c5f8b1e020fcde2
-- 
2.49.0

Message #17 received at 77322 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 77322 <at> debbugs.gnu.org
Cc: Andreas Enge <andreas <at> enge.fr>, z572 <at> z572.online, ashish.is <at> lostca.se
Subject: [PATCH] gnu: profanity: Update to 0.15.0.
Date: Wed,  2 Apr 2025 14:32:12 +0200

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/messaging.scm (profanity): Update to 0.15.0.
[arguments]<#:phases>: Add patch-python-plugins phase.

Change-Id: I654a9648d973653fd44b19fcacd822bbb0570fd9
Co-authored-by: Andreas Enge <andreas <at> enge.fr>
---
Hello,

here is an alternative version with more consistent use of gexps instead
of a mixture of traditional quoting and unquoting and gexps.

It builds on x86_64, with a bit of luck it will be picked up by QA soon.

Andreas


 gnu/packages/messaging.scm | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 6e6223d1b9..26db072b4a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2246,7 +2246,7 @@ (define-public libstrophe
 (define-public profanity
   (package
     (name "profanity")
-    (version "0.14.0")
+    (version "0.15.0")
     (source
      (origin
        (method url-fetch)
@@ -2255,20 +2255,28 @@ (define-public profanity
                        version ".tar.gz"))
        (sha256
         (base32
-         "0zygsxxwdxmpppr7vyzi2r7d854yjl6918w0lrs7k41iib9zy8zx"))))
+         "1yy7x9ycqg6c65k66z47p8mvj48qc0pa4as1lk1agj8ffn7mg7sa"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:configure-flags
-       (list
-        "--disable-static"
-        "--enable-notifications"
-        "--enable-python-plugins"
-        "--enable-c-plugins"
-        "--enable-plugins"
-        "--enable-otr"
-        "--enable-pgp"
-        "--enable-omemo"
-        "--enable-icons-and-clipboard")))
+     (list
+       #:configure-flags
+         #~(list
+           "--disable-static"
+           "--enable-notifications"
+           "--enable-python-plugins"
+           "--enable-c-plugins"
+           "--enable-plugins"
+           "--enable-otr"
+           "--enable-pgp"
+           "--enable-omemo"
+           "--enable-icons-and-clipboard")
+       #:phases
+       #~(modify-phases %standard-phases
+           (add-after 'unpack 'patch-python-plugins
+             (lambda _
+               ;; Py_XDECREF is a macro in Python 3.10
+               (substitute* "src/plugins/python_plugins.c"
+                 (("Py_XDECREF") "_Py_XDECREF")))))))
     (native-inputs
      (list autoconf
            autoconf-archive

base-commit: 407963a8489a319c4a88c2fdfdc9c61d33a1eb0d
-- 
2.49.0

Message #22 received at 77322-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 77322-done <at> debbugs.gnu.org
Cc: z572 <at> z572.online, ashish.is <at> lostca.se
Subject: Re: [PATCH] gnu: profanity: Update to 0.15.0.
Date: Wed, 2 Apr 2025 22:56:15 +0200

QA has picked it up, pushed!

Andreas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.