From patchwork Sun Mar 31 16:45:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 62387 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8704927BBE9; Sun, 31 Mar 2024 17:51:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 40F6427BBE2 for ; Sun, 31 Mar 2024 17:51:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqyOd-0001Ou-Bu; Sun, 31 Mar 2024 12:51:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqyOa-0001Oe-9H for guix-patches@gnu.org; Sun, 31 Mar 2024 12:51:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqyOa-0007SZ-1D for guix-patches@gnu.org; Sun, 31 Mar 2024 12:51:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqyOc-0004NT-BW for guix-patches@gnu.org; Sun, 31 Mar 2024 12:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70109] [PATCH] gnu: dbus-for-jami: Use Gexp. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 16:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70109 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 70109@debbugs.gnu.org, Raghav Gururajan , Vivien Kraus , Maxim Cournoyer Received: via spool by 70109-submit@debbugs.gnu.org id=B70109.171190384116765 (code B ref 70109); Sun, 31 Mar 2024 16:51:02 +0000 Received: (at 70109) by debbugs.gnu.org; 31 Mar 2024 16:50:41 +0000 Received: from localhost ([127.0.0.1]:48319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqyOG-0004MK-FH for submit@debbugs.gnu.org; Sun, 31 Mar 2024 12:50:40 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:37944 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqyOC-0004LI-IE for 70109@debbugs.gnu.org; Sun, 31 Mar 2024 12:50:39 -0400 Received: from m (unknown [183.247.5.22]) by APP-03 (Coremail) with SMTP id rQCowAC32ixHlAlm0Q5wAA--.31256S2; Mon, 01 Apr 2024 00:50:16 +0800 (CST) References: <59ead40d45509e063b5ff75b4a4e0d461fd71ada.camel@gmail.com> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Zheng Junjie Date: Mon, 01 Apr 2024 00:45:19 +0800 In-reply-to: <59ead40d45509e063b5ff75b4a4e0d461fd71ada.camel@gmail.com> Message-ID: <87frw6ibw9.fsf@iscas.ac.cn> MIME-Version: 1.0 X-CM-TRANSID: rQCowAC32ixHlAlm0Q5wAA--.31256S2 X-Coremail-Antispam: 1UD129KBjvJXoW7ZrWDCFyfZFWxKrW7tw1DKFg_yoW5JFyxpF 1rGFWUAry8Gr18JrsrJFyUXryUXr1UJw1UJr1xZF1Utr47Cr1jqrWUWrn0grnrJr48Jw45 Jr1UJw1DZr15JrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Yb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVWUJVW8JwA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21le4C267I2x7xF 54xIwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I 8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41lFcxC0VAY jxAxZF0Ew4CEw7xC0wCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s 026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_ JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20x vEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE 14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_Gr1l6VACY4xI67k04243AbIYCT nIWIevJa73UjIFyTuYvjxUcHqcUUUUU X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Liliana Marie Prikler 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 >>  ;;; Copyright © 2022 Petr Hodina >>  ;;; Copyright © 2023 Saku Laesvuori >> +;;; 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 > > Cheers From 1eb91cba09027677969e622ff203393ebb55b71e Mon Sep 17 00:00:00 2001 Message-ID: <1eb91cba09027677969e622ff203393ebb55b71e.1711903743.git.zhengjunjie@iscas.ac.cn> From: Zheng Junjie 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 ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Saku Laesvuori +;;; 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