GNU bug report logs - #70109
[PATCH] gnu: dbus-for-jami: Use Gexp.

Previous Next

Package: guix-patches;

Reported by: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>

Date: Sun, 31 Mar 2024 16:00:02 UTC

Severity: normal

Tags: patch

Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 70109 in the body.
You can then email your comments to 70109 AT debbugs.gnu.org in the normal way.

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

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, vivien <at> planete-kraus.eu, guix-patches <at> gnu.org:
bug#70109; Package guix-patches. (Sun, 31 Mar 2024 16:00:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Zheng Junjie <zhengjunjie <at> iscas.ac.cn>:
New bug report received and forwarded. Copy sent to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, vivien <at> planete-kraus.eu, guix-patches <at> gnu.org. (Sun, 31 Mar 2024 16:00:02 GMT) Full text and rfc822 format available.

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

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: dbus-for-jami: Use Gexp.
Date: Sun, 31 Mar 2024 23:58:42 +0800

This is a follow-up to 26485fc5750d2e067c45d49ab2aa20f481e1979a.

* gnu/packages/glib.scm(dbus-for-jami): Use Gexp.

Change-Id: I56fd25502be65ba688519dea7462c401aeddba31
---
 gnu/packages/glib.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index cf066a8aa6..b11046f05d 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2021 Maxime Devos <maximedevos <at> telenet.be>
 ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
 ;;; Copyright © 2023 Saku Laesvuori <saku <at> laesvuori.fi>
+;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -202,12 +203,12 @@ (define-public dbus-for-jami
      (arguments
       (substitute-keyword-arguments (package-arguments dbus)
         ((#:phases phases)
-         `(modify-phases ,phases
-            (add-after 'unpack 'customize-config
-              (lambda _
-                (substitute* "bus/session.conf.in"
-                  (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-local.conf")
-                   "/var/run/jami/session-local.conf")))))))))))
+         #~(modify-phases #$phases
+             (add-after 'unpack 'customize-config
+               (lambda _
+                 (substitute* "bus/session.conf.in"
+                   (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-local.conf")
+                    "/var/run/jami/session-local.conf")))))))))))
 
 (define-public dbus-1.15.0
   ;; Dbus 1.15.2 has a breaking change.

base-commit: 4d79a9cd6b5f0d8c5afbab0c6b70ae42740d5470
-- 
2.41.0
Information forwarded to guix-patches <at> gnu.org:
bug#70109; Package guix-patches. (Sun, 31 Mar 2024 16:05:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>, 70109 <at> debbugs.gnu.org
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>,
 Vivien Kraus <vivien <at> planete-kraus.eu>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp.
Date: Sun, 31 Mar 2024 18:04:24 +0200

Am Sonntag, dem 31.03.2024 um 23:58 +0800 schrieb Zheng Junjie:
> This is a follow-up to 26485fc5750d2e067c45d49ab2aa20f481e1979a.
> 
> * gnu/packages/glib.scm(dbus-for-jami): Use Gexp.
There should be a space before the parenthesis and I personally prefer
to spell out G-Expression.
> 
> Change-Id: I56fd25502be65ba688519dea7462c401aeddba31
> ---
>  gnu/packages/glib.scm | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
> index cf066a8aa6..b11046f05d 100644
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -19,6 +19,7 @@
>  ;;; Copyright © 2021 Maxime Devos <maximedevos <at> telenet.be>
>  ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
>  ;;; Copyright © 2023 Saku Laesvuori <saku <at> laesvuori.fi>
> +;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -202,12 +203,12 @@ (define-public dbus-for-jami
>       (arguments
>        (substitute-keyword-arguments (package-arguments dbus)
>          ((#:phases phases)
> -         `(modify-phases ,phases
> -            (add-after 'unpack 'customize-config
> -              (lambda _
> -                (substitute* "bus/session.conf.in"
> -                  (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-
> local.conf")
> -                   "/var/run/jami/session-local.conf")))))))))))
> +         #~(modify-phases #$phases
> +             (add-after 'unpack 'customize-config
> +               (lambda _
> +                 (substitute* "bus/session.conf.in"
> +                   (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-
> local.conf")
> +                    "/var/run/jami/session-local.conf")))))))))))
Thanks for the patch, but is it critical at the moment?  As far as I
can see, jami builds without it.

Cheers
Information forwarded to guix-patches <at> gnu.org:
bug#70109; Package guix-patches. (Sun, 31 Mar 2024 16:51:02 GMT) Full text and rfc822 format available.

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

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 70109 <at> debbugs.gnu.org, Raghav Gururajan <rg <at> raghavgururajan.name>,
 Vivien Kraus <vivien <at> planete-kraus.eu>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp.
Date: Mon, 01 Apr 2024 00:45:19 +0800

[Message part 1 (text/plain, inline)]
Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> Am Sonntag, dem 31.03.2024 um 23:58 +0800 schrieb Zheng Junjie:
>> This is a follow-up to 26485fc5750d2e067c45d49ab2aa20f481e1979a.
>> 
>> * gnu/packages/glib.scm(dbus-for-jami): Use Gexp.
> There should be a space before the parenthesis and I personally prefer
> to spell out G-Expression.
>> 
>> Change-Id: I56fd25502be65ba688519dea7462c401aeddba31
>> ---
>>  gnu/packages/glib.scm | 13 +++++++------
>>  1 file changed, 7 insertions(+), 6 deletions(-)
>> 
>> diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
>> index cf066a8aa6..b11046f05d 100644
>> --- a/gnu/packages/glib.scm
>> +++ b/gnu/packages/glib.scm
>> @@ -19,6 +19,7 @@
>>  ;;; Copyright © 2021 Maxime Devos <maximedevos <at> telenet.be>
>>  ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
>>  ;;; Copyright © 2023 Saku Laesvuori <saku <at> laesvuori.fi>
>> +;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -202,12 +203,12 @@ (define-public dbus-for-jami
>>       (arguments
>>        (substitute-keyword-arguments (package-arguments dbus)
>>          ((#:phases phases)
>> -         `(modify-phases ,phases
>> -            (add-after 'unpack 'customize-config
>> -              (lambda _
>> -                (substitute* "bus/session.conf.in"
>> -                  (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-
>> local.conf")
>> -                   "/var/run/jami/session-local.conf")))))))))))
>> +         #~(modify-phases #$phases
>> +             (add-after 'unpack 'customize-config
>> +               (lambda _
>> +                 (substitute* "bus/session.conf.in"
>> +                   (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-
>> local.conf")
>> +                    "/var/run/jami/session-local.conf")))))))))))
> Thanks for the patch, but is it critical at the moment?  As far as I
> can see, jami builds without it.

i just see it build fail. and it use by jami-service-type, not jami package, see
https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/services/telephony.scm?h=master#n231


[0001-gnu-dbus-for-jami-Use-G-Expression.patch (text/x-patch, attachment)]
[Message part 3 (text/plain, inline)]

>
> Cheers


[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#70109; Package guix-patches. (Sun, 31 Mar 2024 17:57:02 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 70109 <at> debbugs.gnu.org, Raghav Gururajan <rg <at> raghavgururajan.name>,
 Vivien Kraus <vivien <at> planete-kraus.eu>, Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Subject: Re: [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp.
Date: Sun, 31 Mar 2024 13:56:31 -0400

Hi,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> Am Sonntag, dem 31.03.2024 um 23:58 +0800 schrieb Zheng Junjie:
>> This is a follow-up to 26485fc5750d2e067c45d49ab2aa20f481e1979a.
>> 
>> * gnu/packages/glib.scm(dbus-for-jami): Use Gexp.
> There should be a space before the parenthesis and I personally prefer
> to spell out G-Expression.
>> 
>> Change-Id: I56fd25502be65ba688519dea7462c401aeddba31
>> ---
>>  gnu/packages/glib.scm | 13 +++++++------
>>  1 file changed, 7 insertions(+), 6 deletions(-)
>> 
>> diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
>> index cf066a8aa6..b11046f05d 100644
>> --- a/gnu/packages/glib.scm
>> +++ b/gnu/packages/glib.scm
>> @@ -19,6 +19,7 @@
>>  ;;; Copyright © 2021 Maxime Devos <maximedevos <at> telenet.be>
>>  ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
>>  ;;; Copyright © 2023 Saku Laesvuori <saku <at> laesvuori.fi>
>> +;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -202,12 +203,12 @@ (define-public dbus-for-jami
>>       (arguments
>>        (substitute-keyword-arguments (package-arguments dbus)
>>          ((#:phases phases)
>> -         `(modify-phases ,phases
>> -            (add-after 'unpack 'customize-config
>> -              (lambda _
>> -                (substitute* "bus/session.conf.in"
>> -                  (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-
>> local.conf")
>> -                   "/var/run/jami/session-local.conf")))))))))))
>> +         #~(modify-phases #$phases
>> +             (add-after 'unpack 'customize-config
>> +               (lambda _
>> +                 (substitute* "bus/session.conf.in"
>> +                   (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-
>> local.conf")
>> +                    "/var/run/jami/session-local.conf")))))))))))
> Thanks for the patch, but is it critical at the moment?  As far as I
> can see, jami builds without it.

The jami-service-type is broken I believe (it requires it).  I'll push
it shortly.

-- 
Thanks,
Maxim
bug closed, send any further explanations to 70109 <at> debbugs.gnu.org and Zheng Junjie <zhengjunjie <at> iscas.ac.cn> Request was from Maxim Cournoyer <maxim.cournoyer <at> gmail.com> to control <at> debbugs.gnu.org. (Mon, 01 Apr 2024 16:44:01 GMT) Full text and rfc822 format available.
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 30 Apr 2024 11:24:05 GMT) Full text and rfc822 format available.
This bug report was last modified 4 days ago.

Previous Next

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