From patchwork Thu Jan 2 05:55:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 36369 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 B1D1627BBEA; Thu, 2 Jan 2025 05:57:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 90E3B27BBE9 for ; Thu, 2 Jan 2025 05:57:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTECh-0001Vc-OS; Thu, 02 Jan 2025 00:57:07 -0500 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 1tTECd-0001Ut-1i for guix-patches@gnu.org; Thu, 02 Jan 2025 00:57:04 -0500 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 1tTECc-0004HW-PK for guix-patches@gnu.org; Thu, 02 Jan 2025 00:57:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:In-Reply-To:References:Subject; bh=ob9eEaIkezqZfmE6rxzj29bIZpS41n1uYTbVyHotgTM=; b=XVKE1wI4gF5cNI4T1yu+DFtjcfifJLMcBvv2WQ+QTfiCpEa4HpospXCzNZmZf3vVlYPzhSIDqhUa2wP7SBRAzsOJ+zFzf5Q746XOo8Aff3afVXEoGjoDdGp6soVnG24g5OLZNtgR4XumQV2Eg3DSYTlKRrfvAFiLZbGktdfe562aBYkILqLZzgdZgLdU7BJwZq+tmwxT8lUcN9bKkicRDsiKd0ITBYOfd50hE+ZCX9EEyMqyzL288wXrNwAUDxRqg8SdMRSPf5nyGS5dGReJ+QPhi3faUFjXhHUvjBe1jI6cP/tpLvFN58psNFVizt1dlFqPJZJNo1bij3H69aLCMQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tTECc-0005L3-I9 for guix-patches@gnu.org; Thu, 02 Jan 2025 00:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74256] [PATCH V2 2/2] gnu: Add sdbus-c++-1.4.0. References: <20241108123050.23571-1-sisiutl@egregore.fun> In-Reply-To: <20241108123050.23571-1-sisiutl@egregore.fun> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Jan 2025 05:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74256 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: Sisiutl , 74256@debbugs.gnu.org Received: via spool by 74256-submit@debbugs.gnu.org id=B74256.173579736620440 (code B ref 74256); Thu, 02 Jan 2025 05:57:02 +0000 Received: (at 74256) by debbugs.gnu.org; 2 Jan 2025 05:56:06 +0000 Received: from localhost ([127.0.0.1]:42358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTEBh-0005Jb-GQ for submit@debbugs.gnu.org; Thu, 02 Jan 2025 00:56:05 -0500 Received: from mail-10629.protonmail.ch ([79.135.106.29]:45189) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tTEBf-0005Iu-7N for 74256@debbugs.gnu.org; Thu, 02 Jan 2025 00:56:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1735797356; x=1736056556; bh=ob9eEaIkezqZfmE6rxzj29bIZpS41n1uYTbVyHotgTM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=ZmeFgpLlI3VgPr6OosNi3HKMSSwIBl8KDdC5rvn0kXqfSymJ88JvFT0yTV3wtNdZV iqPlUxEN8rbvRn7kWkC9LiI+zOLvYCSF8WztXDDKjnRoYapvsKC2f7lxC8RaOhsjPw Qgox7bJp+Vpy/AIXm+HnZnzu3vIJ86mjJvpY2k64Ysg5CjcA70BmCB81OnCG4XOdet jmgdcOx1JFBEyen7yzpbSC6iDzsAj1g/sB9w6CjG5ah/1fkSqL9WG/bMTiljOr6kPk 72y+P1mV5hwbF69N7CmfOQlx5QsR9t6VG8DyHcZ2/LF7AWIcsYygqU+QzIXxNz5jhZ S6l4cp2J8+yuQ== Date: Thu, 02 Jan 2025 05:55:51 +0000 Message-ID: <87jzbdiwt7.fsf_-_@protonmail.com> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: ebfcaef371a1840356edee707464846d84a8749c MIME-Version: 1.0 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: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias 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 Followup patch to add older sdbus-c++ for libjami. Note: my first email with my v2 of the original patch bounced on trying to reach the original author: "Host found but no data record of requested type" error. Will still include in the CC here though. From e1a3c490d2f54779b6c48ff626b895f381c90cd0 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: <63e209d7f6d0faf41852a8c889d23d7bcc8459e7.1735797062.git.john.kehayias@protonmail.com> References: <63e209d7f6d0faf41852a8c889d23d7bcc8459e7.1735797062.git.john.kehayias@protonmail.com> From: John Kehayias Date: Wed, 1 Jan 2025 18:04:05 -0500 Subject: [PATCH 2/2] gnu: Add sdbus-c++-1.4.0. * gnu/packages/glib.scm (sdbus-c++-1.4.0): New variable. * gnu/packages/jami.scm (libjami)[inputs]: Replace sdbus-c++ with sdbus-c++-1.4.0. Change-Id: Idb189f80212351cef6b5c8722982880bf5b51fe9 --- gnu/packages/glib.scm | 34 ++++++++++++++++++++++++++++++++++ gnu/packages/jami.scm | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 71e1fde36d..e3ab6d7641 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1339,6 +1339,40 @@ (define-public sdbus-c++ of abstraction on top of @code{sd-bus}, the C D-Bus implementation by systemd.") (license license:lgpl2.1+))) +;; TODO: Remove once libjami can use newer sdbus-c++. +(define-public sdbus-c++-1.4.0 + (package + (inherit sdbus-c++) + (name "sdbus-c++") + (version "1.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kistler-Group/sdbus-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "111l2rl0pg9r5cdrhqpac4v22cnq41skxxfk3cng81l0n05v1sh0")))) + (arguments + (substitute-keyword-arguments (package-arguments sdbus-c++) + ((#:configure-flags flags ''()) + #~(list "-DBUILD_CODE_GEN=ON" + "-DBUILD_TESTS=ON" + ;; Do not install tests. + "-DTESTS_INSTALL_PATH=/tmp" + "-DCMAKE_VERBOSE_MAKEFILE=ON")) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'fix-elogind-requirement + (lambda _ + ;; sdbus-c++.pc requires 'elogind', but it should + ;; require 'libelogind'. Fixed after 1.4.0 with + ;; fb9e4ae37152648a67814458d3ff673b1d3ca089 + (substitute* "pkgconfig/sdbus-c++.pc.in" + (("@LIBSYSTEMD@") + "libelogind")))))))))) + (define-public appstream-glib (package (name "appstream-glib") diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 25510b9df5..db45c9973e 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -215,7 +215,7 @@ (define-public libjami openssl pjproject-jami pulseaudio - sdbus-c++ + sdbus-c++-1.4.0 speex speexdsp webrtc-audio-processing/jami -- 2.47.1