unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp.
@ 2024-03-31 15:58 Zheng Junjie
  2024-03-31 16:04 ` Liliana Marie Prikler
  0 siblings, 1 reply; 4+ messages in thread
From: Zheng Junjie @ 2024-03-31 15:58 UTC (permalink / raw)
  To: 70109
  Cc: Liliana Marie Prikler, Maxim Cournoyer, Raghav Gururajan,
	Vivien Kraus

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1633 bytes --]

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@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





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp.
  2024-03-31 15:58 [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp Zheng Junjie
@ 2024-03-31 16:04 ` Liliana Marie Prikler
  2024-03-31 16:45   ` Zheng Junjie
  2024-03-31 17:56   ` Maxim Cournoyer
  0 siblings, 2 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2024-03-31 16:04 UTC (permalink / raw)
  To: Zheng Junjie, 70109; +Cc: Raghav Gururajan, Vivien Kraus, Maxim Cournoyer

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.

Cheers

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp.
  2024-03-31 16:04 ` Liliana Marie Prikler
@ 2024-03-31 16:45   ` Zheng Junjie
  2024-03-31 17:56   ` Maxim Cournoyer
  1 sibling, 0 replies; 4+ messages in thread
From: Zheng Junjie @ 2024-03-31 16:45 UTC (permalink / raw)
  To: Liliana Marie Prikler
  Cc: 70109, Raghav Gururajan, Vivien Kraus, Maxim Cournoyer


[-- Attachment #1.1: Type: text/plain, Size: 2364 bytes --]


Liliana Marie Prikler <liliana.prikler@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@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
https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/services/telephony.scm?h=master#n231


[-- Attachment #1.2: 0001-gnu-dbus-for-jami-Use-G-Expression.patch --]
[-- Type: text/x-patch, Size: 1994 bytes --]

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(-)

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


[-- Attachment #1.3: Type: text/plain, Size: 14 bytes --]



>
> Cheers


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp.
  2024-03-31 16:04 ` Liliana Marie Prikler
  2024-03-31 16:45   ` Zheng Junjie
@ 2024-03-31 17:56   ` Maxim Cournoyer
  1 sibling, 0 replies; 4+ messages in thread
From: Maxim Cournoyer @ 2024-03-31 17:56 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: 70109, Raghav Gururajan, Vivien Kraus, Zheng Junjie

Hi,

Liliana Marie Prikler <liliana.prikler@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@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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-03-31 17:57 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-31 15:58 [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp Zheng Junjie
2024-03-31 16:04 ` Liliana Marie Prikler
2024-03-31 16:45   ` Zheng Junjie
2024-03-31 17:56   ` Maxim Cournoyer

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).