From patchwork Thu Jan 18 21:14:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 59177 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 72BB627BBE9; Sat, 20 Jan 2024 09:48:26 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 255F027BBE2 for ; Sat, 20 Jan 2024 09:48:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rR7xP-0007Wb-P6; Sat, 20 Jan 2024 04:48: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 1rR7xI-0007WD-01 for guix-patches@gnu.org; Sat, 20 Jan 2024 04:48:00 -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 1rR7xH-000333-CF for guix-patches@gnu.org; Sat, 20 Jan 2024 04:47:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rR7xK-0004dy-36 for guix-patches@gnu.org; Sat, 20 Jan 2024 04:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68573] [PATCH gnome-team v2] gnu: sdbus-c++: Fix generated sdbus-c++.pc. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 09:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: liliana.prikler@gmail.com,68573@debbugs.gnu.org Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 68573-submit@debbugs.gnu.org id=B68573.170574402917263 (code B ref 68573); Sat, 20 Jan 2024 09:48:02 +0000 Received: (at 68573) by debbugs.gnu.org; 20 Jan 2024 09:47:09 +0000 Received: from localhost ([127.0.0.1]:60883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR7wS-0004U2-TN for submit@debbugs.gnu.org; Sat, 20 Jan 2024 04:47:09 -0500 Received: from planete-kraus.eu ([89.234.140.182]:53740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR7wQ-0004OC-Af for 68573@debbugs.gnu.org; Sat, 20 Jan 2024 04:47:07 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 678e8287; Sat, 20 Jan 2024 09:46:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=pbSPN2l7lMsZIavux/K0tVXNmvg=; b=i Vqc3txWuoXZrJ51qfggnYzXn1ADAz181EfQZfQSmimZI2BwZ/pdURPVsn7NNXshH l2A7WswRKhO0CQJ2+dirZdbtBC4SwxJkdM86/MRTk9k5LjPSWe97pdCvd2r8hiHW W4b1HC2G/CVJl9pji+JnosMVOs1eLZjtjB63yFbehrfTNyl5WaEqROPC/c8EWGX4 Jut95ba24JIOW2cWnFrKJn1GPP7B/P1heRzHcVGHFucWwpmRkI1KzUIFpcxVeWal y4G5XNZTMTSNmcPiYwwFbPqDWC9fpmXU1VbUMXZDxV96Sd1S8464U86v1Oz/CpWW 4IOBclEQUfM0ljyL1a5yg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 72197276 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 20 Jan 2024 09:46:56 +0000 (UTC) Message-ID: <001bf4e4b4088613ad1469abcc6acecef3ceea6d.1705743574.git.vivien@planete-kraus.eu> In-Reply-To: <47694e8e235223700dddb80b23a6d173e3097f3f.camel@gmail.com> References: <47694e8e235223700dddb80b23a6d173e3097f3f.camel@gmail.com> Date: Thu, 18 Jan 2024 22:14:09 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 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]: Add 'fix-elogind-requirement. Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7 Reviewed-by: Maxim Cournoyer --- Hello! Le samedi 20 janvier 2024 à 08:35 +0100, Liliana Marie Prikler a écrit : > + ;; 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"))))))) > Instead of patching the generated file, you could try patching the .in file > from which it is generated or the CMakeLists. As far as I understand, the CMakeLists do not have a variable that contain "libelogind", and we can’t change the LIBSYSTEMD variable content because it is used in other places (notably to find headers, where “libelogind” would not work). So we have to ignore the CMakeLists entirely and bypass the .in substitution. gnu/packages/glib.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) base-commit: 49897f2dde7f469c83c496fad2699d3a05f72701 diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 7b8cc3286d..eee5251d03 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-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"))))))) (native-inputs (list googletest pkg-config)) (inputs (list expat)) (propagated-inputs (list elogind)) ;required by sdbus-c++.pc