[PATCH] gnu: dbus-for-jami: Use Gexp.

  • Done
  • quality assurance status badge
Details
3 participants
  • Liliana Marie Prikler
  • Maxim Cournoyer
  • Zheng Junjie
Owner
unassigned
Submitted by
Zheng Junjie
Severity
normal

Debbugs page

Z
Z
Zheng Junjie wrote on 31 Mar 08:58 -0700
(address . guix-patches@gnu.org)
acfc5bcad4eb4ce0d14a42f4afbec88fc6aa0322.1711900722.git.zhengjunjie@iscas.ac.cn
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(-)

Toggle diff (35 lines)
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@telenet.be>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
+;;; Copyright © 2024 Zheng Junjie <873216071@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
L
L
Liliana Marie Prikler wrote on 31 Mar 09:04 -0700
59ead40d45509e063b5ff75b4a4e0d461fd71ada.camel@gmail.com
Am Sonntag, dem 31.03.2024 um 23:58 +0800 schrieb Zheng Junjie:
Toggle quote (3 lines)
> 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.
Toggle quote (36 lines)
>
> 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@telenet.be>
>  ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
>  ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
> +;;; Copyright © 2024 Zheng Junjie <873216071@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
Z
Z
Zheng Junjie wrote on 31 Mar 09:45 -0700
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87frw6ibw9.fsf@iscas.ac.cn
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
Toggle quote (44 lines)
> 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@telenet.be>
>>  ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
>>  ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
>> +;;; Copyright © 2024 Zheng Junjie <873216071@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
From 1eb91cba09027677969e622ff203393ebb55b71e Mon Sep 17 00:00:00 2001
Message-ID: <1eb91cba09027677969e622ff203393ebb55b71e.1711903743.git.zhengjunjie@iscas.ac.cn>
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Date: Sun, 31 Mar 2024 23:55:22 +0800
Subject: [PATCH] gnu: dbus-for-jami: Use G-Expression.

This is a follow-up to 26485fc5750d2e067c45d49ab2aa20f481e1979a.

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

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

Toggle diff (35 lines)
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@telenet.be>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
+;;; Copyright © 2024 Zheng Junjie <873216071@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
Toggle quote (2 lines)
>
> Cheers
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYJlEYACgkQO1qpk+Gi
3/DwLBAAudvZVZ6gXdxCh3MDqn4Rz8+5yEiyZvnOKrWKjLI3C917puHr1aQ30a4X
JxbnBpwIL2wMM68bGUXqv/FytkOim0s4DtAkDKCkIzlBswKaNilQ1/ZgPdqqaMAJ
z+4zRG6vL+h6kKaXH5awL+shKuwnAYZ7Pih5vvoTRa2qXcwhV7XYhgdlu3DmP39I
XRbTS84XDkvCqMUV2q2EZDE9wGyyTNC+9SjEfwo9u68d3F2xxlX3I9uSO37YODSh
JzaEBp7b0tsrhF340df5GtVvfTzd7TLYQaEDQQ+T7rCF06sfw9YrETEg/39bwkDy
Aa83iJ/PrB+cd1ZpCJRCGpKv7krI2bZYn1eWmTwyGJZBpQ350SIri9M/CE1Aa8Ye
sRUWCeYN6BJ25ozyPhEY4gQ2J5WkVRNwVyPk7tdQ+c+nPZ2kvIpFwwGdvez6dBSn
CvN/xjuO2MijL+5URjzsbhzl1tNTKf/9zplwFYHs0n8L0AlwyhC7frBFCek5UMbV
bxUCrrsBaeBcvB+Xvcjt8sYBQBy1NPyH09uceimQnXTPcuwj8VjkAcimVi92zilI
RH6Covwe3AhsI7N51EAmpT8yuXKwuipoQceZ5wfd2QRLn4smvoFVlw4U8ExGc7NP
JVBPPF6u9qwDR7lPzFxVXPwtS3tCl69DllJvj680Kzsu2WcZNHM=
=Y6ot
-----END PGP SIGNATURE-----

M
M
Maxim Cournoyer wrote on 31 Mar 10:56 -0700
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87h6gmxp2o.fsf@gmail.com
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
Toggle quote (44 lines)
> 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@telenet.be>
>>  ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
>>  ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
>> +;;; Copyright © 2024 Zheng Junjie <873216071@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
M
M
Maxim Cournoyer wrote on 1 Apr 09:42 -0700
control message for bug #70109
(address . control@debbugs.gnu.org)
87a5mdvxt8.fsf@gmail.com
close 70109
quit
?
Your comment

This issue is archived.

To comment on this conversation send an email to 70109@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70109
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