From patchwork Thu Jan 18 21:14:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 59102 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 D991C27BBEA; Thu, 18 Jan 2024 21:19:18 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 16EF827BBE2 for ; Thu, 18 Jan 2024 21:19:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQZn0-00040N-FF; Thu, 18 Jan 2024 16:19:06 -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 1rQZmw-000401-Fc for guix-patches@gnu.org; Thu, 18 Jan 2024 16:19:03 -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 1rQZmw-0007x3-7f for guix-patches@gnu.org; Thu, 18 Jan 2024 16:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQZmw-000796-At; Thu, 18 Jan 2024 16:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68573] [PATCH gnome-team] gnu: sdbus-c++: Fix generated sdbus-c++.pc. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 21:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68573@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by submit@debbugs.gnu.org id=B.170561273327452 (code B ref -1); Thu, 18 Jan 2024 21:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jan 2024 21:18:53 +0000 Received: from localhost ([127.0.0.1]:56836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQZmn-00078h-5v for submit@debbugs.gnu.org; Thu, 18 Jan 2024 16:18:53 -0500 Received: from lists.gnu.org ([2001:470:142::17]:33168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQZml-00078L-91 for submit@debbugs.gnu.org; Thu, 18 Jan 2024 16:18:51 -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 1rQZmb-0003s5-3v for guix-patches@gnu.org; Thu, 18 Jan 2024 16:18:42 -0500 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rQZmZ-0007ua-E2 for guix-patches@gnu.org; Thu, 18 Jan 2024 16:18:40 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id db661709 for ; Thu, 18 Jan 2024 21:18:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=albinoniA; bh=KH n4O5zVRETR917FHB13P8WKLdg=; b=PiJysScvbrifhlHX+LQh5n1uzUA0b0bZZ+ Twzejh6RU5CuS6QaQZ7IZtZwUfohkCOUYt4mO4Klj8DIyG9OCJzWqLbY1KiYgCYB Uq3PX2ywFBCR0o204aNN/yEkxBOLYeWdkwhhntTioVkOGl29o82Hs+IDODnhMEFV iNYwSLjnu5eYhGBa4fUDeZv7PeAH4zYqZp3kM1QPXnJXDUioCXqo7mOLxyHwhHli zPTzmarj4//PxNrD5fRSUMkKZjtogogdpJqJR7VW7RI32VAGJsKz6/T7cEX3+fb7 yFWiamQRIPUBJInUaGZFpb4DkD5Yo+gKAWmX8mH7df9tr+fSjkLQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 7a461ba4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Thu, 18 Jan 2024 21:18:36 +0000 (UTC) Message-ID: Date: Thu, 18 Jan 2024 22:14:09 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 * gnu/packages/glib.scm (sdbus-c++) [#:phases 'fix-libelogind-requirement]: New phase. Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7 --- gnu/packages/glib.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) base-commit: 17c2e26068c5c36eb8ee1ec39a8695ef66f75c55 diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 7b8cc3286d..d84b848b62 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1289,11 +1289,20 @@ (define-public sdbus-c++ ;; Do not install tests. "-DTESTS_INSTALL_PATH=/tmp" "-DCMAKE_VERBOSE_MAKEFILE=ON") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'do-not-install-tests - (lambda _ - (substitute* "tests/CMakeLists.txt" - (("/etc/dbus-1/system.d") "/tmp"))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-install-tests + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("/etc/dbus-1/system.d") "/tmp")))) + (add-before 'install 'fix-libelogind-requirement + (lambda _ + ;; sdbus-c++.pc requires 'elogind', but it should + ;; require 'libelogind'. Fixed after 1.4.0 with + ;; fb9e4ae37152648a67814458d3ff673b1d3ca089 + (substitute* "pkgconfig/sdbus-c++.pc" + (("Requires: elogind") + "Requires: libelogind"))))))) (native-inputs (list googletest pkg-config)) (inputs (list expat)) (propagated-inputs (list elogind)) ;required by sdbus-c++.pc