From unknown Mon Sep 08 01:50:53 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#68573 <68573@debbugs.gnu.org> To: bug#68573 <68573@debbugs.gnu.org> Subject: Status: [PATCH gnome-team] gnu: sdbus-c++: Fix generated sdbus-c++.pc. Reply-To: bug#68573 <68573@debbugs.gnu.org> Date: Mon, 08 Sep 2025 08:50:53 +0000 retitle 68573 [PATCH gnome-team] gnu: sdbus-c++: Fix generated sdbus-c++.pc. reassign 68573 guix-patches submitter 68573 Vivien Kraus severity 68573 normal tag 68573 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 18 16:18:53 2024 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: From: Vivien Kraus Date: Thu, 18 Jan 2024 22:14:09 +0100 Subject: [PATCH gnome-team] gnu: sdbus-c++: Fix generated sdbus-c++.pc. To: guix-patches@gnu.org X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu 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-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * 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(-) 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 base-commit: 17c2e26068c5c36eb8ee1ec39a8695ef66f75c55 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 20 02:35:16 2024 Received: (at 68573) by debbugs.gnu.org; 20 Jan 2024 07:35:16 +0000 Received: from localhost ([127.0.0.1]:60767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR5sp-00020Z-Sq for submit@debbugs.gnu.org; Sat, 20 Jan 2024 02:35:16 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:47484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR5sm-00020H-Vx for 68573@debbugs.gnu.org; Sat, 20 Jan 2024 02:35:14 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a2dd05e02ffso146044966b.3 for <68573@debbugs.gnu.org>; Fri, 19 Jan 2024 23:35:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705736104; x=1706340904; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=6Tcr394FTfmi3SzD4gtYHx2Q5LM7qYoV7iuKQM0XR2E=; b=lVenze2/2EX7u+ohLYhR5Ps5IMbRmPUkqjrDP7QRtxZtK7PqT2bbYgr2lDMj0OrF6K Gxufp35iwrTwabPZR6bsoT7dXSXXf+AcPbhzmkXANWPqr9+BqmQI+d15K27m/BuwUEYa nqgyWmp+frAt0faW83ntN+ESOCpR9e1Yxal073m+76YXXqWsuTaknFJna60byfWRtMND byfDOyCz3AA7V0mC27OpHJQHrDXNcMREBlfxwOV9w5VHlFudUZKWWt4A0sKnlkDyxLFO yNQJqPCrTsxpqxhs+ykcsimMK0CxsDYHWtNp6oyQA/aoKwGlY2TO9gG2aIHQ5eHmB3Yb C5zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705736104; x=1706340904; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=6Tcr394FTfmi3SzD4gtYHx2Q5LM7qYoV7iuKQM0XR2E=; b=n/8JM1bW6dlE9OCB+lVQsI99aCXTZyTg6pcL5Fxn4+TuHLciCbxXqVBDqtgVg7Npnc x3OqkD+vpmbDN1QSyrWgQ+AGhffx0tnWT0SA/fsvnRdpaz0shc/8VZUdgua28tgtwP7m I2Y227b8HvlpiAHD7YG7t5lPaI7Dg3ces3yC/mtSo+GciZx05dRivGhOxtePy/dlRt7L HZK+mzZ1iCDch3HQrcKETHCpo14HGhUxWHJEUai2+o5t+uiGc07rIWW1WIBVgusSLqum PVW6sS3GJWwfPzm9rsJ15oJ0RmLZZiw9U2U00R2bFRhkAPyaBi0OT9Nn7h8Yq6HzS558 hNUQ== X-Gm-Message-State: AOJu0Yw7UlhHuVeZSUKwVMdILzrBhL9jualX79Qgv8daJVHkqpLByNtN 1jXoK5YZKa+c8Yz7sE146/Ws6ZhAcXdqt+rBDFoH8aCVXBd9exEt X-Google-Smtp-Source: AGHT+IE2zX5jsBbVX5C58fyhCg08/XTN8JGC0C7kIu5+OahX2ZEK2EZQbrIZGKgYyGt9sb/tXn41Jw== X-Received: by 2002:a17:906:fa16:b0:a2f:6063:2989 with SMTP id lo22-20020a170906fa1600b00a2f60632989mr347268ejb.106.1705736104216; Fri, 19 Jan 2024 23:35:04 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g16-20020a17090670d000b00a28f51adc39sm11083668ejk.61.2024.01.19.23.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 23:35:03 -0800 (PST) Message-ID: <47694e8e235223700dddb80b23a6d173e3097f3f.camel@gmail.com> Subject: Re: [bug#68573] [PATCH gnome-team] gnu: sdbus-c++: Fix generated sdbus-c++.pc. From: Liliana Marie Prikler To: Vivien Kraus , 68573@debbugs.gnu.org Date: Sat, 20 Jan 2024 08:35:02 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68573 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gRG9ubmVyc3RhZywgZGVtIDE4LjAxLjIwMjQgdW0gMjI6MTQgKzAxMDAgc2NocmllYiBWaXZp ZW4gS3JhdXM6Cj4gKiBnbnUvcGFja2FnZXMvZ2xpYi5zY20gKHNkYnVzLWMrKykgWyM6cGhhc2Vz ICdmaXgtbGliZWxvZ2luZC0KPiByZXF1aXJlbWVudF06Cj4gTmV3IHBoYXNlLgpSYXRoZXIgdXNl IFsjOnBoYXNlc106IEFkZCDigJhmaXgtbGliZWxvZ2luZC1yZXF1aXJlbWVudOKAmSAob3IgcmVu YW1lIHRoZQpwaGFzZSB0byDigJhmaXgtZWxvZ2luZC1yZXF1aXJlbWVudOKAmSBhbmQgdXNlIHRo YXQpLgoKPiAKPiBDaGFuZ2UtSWQ6IElkMjkzNjkxNzhmMTY0ZmM2MGU2ODgyYWE2NjQ1NTY5MjRj ZjRiZmE3Cj4gLS0tCj4gwqBnbnUvcGFja2FnZXMvZ2xpYi5zY20gfCAxOSArKysrKysrKysrKysr Ky0tLS0tCj4gwqAxIGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMo LSkKPiAKPiBkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2dsaWIuc2NtIGIvZ251L3BhY2thZ2Vz L2dsaWIuc2NtCj4gaW5kZXggN2I4Y2MzMjg2ZC4uZDg0Yjg0OGI2MiAxMDA2NDQKPiAtLS0gYS9n bnUvcGFja2FnZXMvZ2xpYi5zY20KPiArKysgYi9nbnUvcGFja2FnZXMvZ2xpYi5zY20KPiBAQCAt MTI4OSwxMSArMTI4OSwyMCBAQCAoZGVmaW5lLXB1YmxpYyBzZGJ1cy1jKysKPiDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7 IERvIG5vdCBpbnN0YWxsIHRlc3RzLgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIi1EVEVTVFNfSU5TVEFMTF9QQVRIPS90 bXAiCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAiLURDTUFLRV9WRVJCT1NFX01BS0VGSUxFPU9OIikKPiAtwqDCoMKgwqDC oCAjOnBoYXNlcyAjfihtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKPiAtwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYWZ0ZXIgJ3VucGFjayAnZG8tbm90LWlu c3RhbGwtdGVzdHMKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo bGFtYmRhIF8KPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KHN1YnN0aXR1dGUqICJ0ZXN0cy9DTWFrZUxpc3RzLnR4dCIKPiAtwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoIi9ldGMvZGJ1cy0xL3N5c3RlbS5kIikg Ii90bXAiKSkpKSkpKQo+ICvCoMKgwqDCoMKgICM6cGhhc2VzCj4gK8KgwqDCoMKgwqAgI34obW9k aWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWFm dGVyICd1bnBhY2sgJ2RvLW5vdC1pbnN0YWxsLXRlc3RzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKGxhbWJkYSBfCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRlKiAi dGVzdHMvQ01ha2VMaXN0cy50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo KCIvZXRjL2RidXMtMS9zeXN0ZW0uZCIpICIvdG1wIikpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKg IChhZGQtYmVmb3JlICdpbnN0YWxsICdmaXgtbGliZWxvZ2luZC1yZXF1aXJlbWVudAo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgXwo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCA7OyBzZGJ1cy1jKysucGMgcmVxdWlyZXMgJ2Vsb2dpbmQnLCBidXQgaXQgc2hvdWxkCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHJlcXVpcmUgJ2xpYmVsb2dpbmQnLiBGaXhlZCBh ZnRlciAxLjQuMCB3aXRoCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGZiOWU0YWUz NzE1MjY0OGE2NzgxNDQ1OGQzZmY2NzNiMWQzY2EwODkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKHN1YnN0aXR1dGUqICJwa2djb25maWcvc2RidXMtYysrLnBjIgo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiUmVxdWlyZXM6IGVsb2dpbmQiKQo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiUmVxdWlyZXM6IGxpYmVsb2dpbmQiKSkpKSkpKQpJbnN0 ZWFkIG9mIHBhdGNoaW5nIHRoZSBnZW5lcmF0ZWQgZmlsZSwgeW91IGNvdWxkIHRyeSBwYXRjaGlu ZyB0aGUgLmluCmZpbGUgZnJvbSB3aGljaCBpdCBpcyBnZW5lcmF0ZWQgb3IgdGhlIENNYWtlTGlz dHMuCgpDaGVlcnMK From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 20 04:47:09 2024 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> From: Vivien Kraus Date: Thu, 18 Jan 2024 22:14:09 +0100 Subject: [PATCH gnome-team v2] gnu: sdbus-c++: Fix generated sdbus-c++.pc. To: liliana.prikler@gmail.com,68573@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 68573 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * gnu/packages/glib.scm (sdbus-c++) [#:phases]: Add 'fix-elogind-requirement. Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7 --- 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(-) 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 base-commit: 49897f2dde7f469c83c496fad2699d3a05f72701 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 20 13:31:01 2024 Received: (at 68573) by debbugs.gnu.org; 20 Jan 2024 18:31:01 +0000 Received: from localhost ([127.0.0.1]:35721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRG7R-0000eo-IC for submit@debbugs.gnu.org; Sat, 20 Jan 2024 13:31:01 -0500 Received: from mail-qt1-x829.google.com ([2607:f8b0:4864:20::829]:46574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRG7O-0000eX-Ka for 68573@debbugs.gnu.org; Sat, 20 Jan 2024 13:30:59 -0500 Received: by mail-qt1-x829.google.com with SMTP id d75a77b69052e-42a35c721e0so2135471cf.1 for <68573@debbugs.gnu.org>; Sat, 20 Jan 2024 10:30:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705775450; x=1706380250; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=qRnxzfh/hi8iJMi7DUxG6SFNIFDyHUK57zMkxN0+uP4=; b=IVXKFWc0ZA5Mzt7a/Sbb9SraSPndWHfUMdmZp4p170CVP0w+Hqkp/cwOW0U5xOxXQk O4jP5H8IpCV4esvHwEkJRSG1vGVUd13EB3tPZ6hrWlZEj6lcNQqn3Ern9aJAOFnZMn7O ImoOECYxdAuK7/W62WsV6MVNkwFHyUx0u6Z9FD69zs1Gmso7aeeH2x8zL4v3dmAT92X0 8OE3HRby6GfljoBzvBZpp5zyKvCZ0P6nGOSR+8HwzHOUkn9Cb7iJ/n4WWSauBm6IFIig MtMHYJiIt8+cHvrnizs4Lmpbs0plFdJtbigHLAY57McTneSn802jgOWpdTR8V/s+UoKF dTwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705775450; x=1706380250; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qRnxzfh/hi8iJMi7DUxG6SFNIFDyHUK57zMkxN0+uP4=; b=KxlEwe9YT/1gsh8ZHsHFRxHWEuSCTyaXJlGtDDnk/83FoT28+AU0sJfJwwfndFABfh o4Y9Njd6cqFvM6QRx5IaT5nrSYvwOSPZInM8QfjpnxUmXbmSqib6wwdYG2Gpykkv7MYz RtQYbhsephj4DQxPMwbYyyseF3wB+moPeMc1G5OkiQXo2vBEacVdAIJdhE2HHNTz84+W ToKJQA/jG4gwPZJqB6we6F6CXGaZLhwsDYEd/xwhDDrnVdFVV+7dYGvMmV2cHSJ2ch5A Zl2GqPK9WXzSpn36T3hHgBTL9++rB/KVfoSoJpN5Yqhbt5BtMCtCaGJyJ/KYajKY1555 Y18A== X-Gm-Message-State: AOJu0Yzv4LNzn1NQhZCeTUQmZaDUKqitRM5Kt+uuZryjG8bk13vm5gW6 8htkDNhT4uf5icJzU0PKyRmCelCdwDc5EEcN1HLEnfD020caj0ZTyX+vjUyC X-Google-Smtp-Source: AGHT+IE5sGx9BorsVawcyl0jfyXWp0SKzisDPlkex/KUm2Hy/rCHpS2AlBxgq3MsoB/7PlU502Q4PA== X-Received: by 2002:a05:622a:d2:b0:42a:1f07:a4f4 with SMTP id p18-20020a05622a00d200b0042a1f07a4f4mr2681704qtw.14.1705775449756; Sat, 20 Jan 2024 10:30:49 -0800 (PST) Received: from hurd (dsl-10-128-232.b2b2c.ca. [72.10.128.232]) by smtp.gmail.com with ESMTPSA id cf12-20020a05622a400c00b00427f375c329sm871348qtb.26.2024.01.20.10.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 10:30:49 -0800 (PST) From: Maxim Cournoyer To: Vivien Kraus Subject: Re: [PATCH gnome-team v2] gnu: sdbus-c++: Fix generated sdbus-c++.pc. In-Reply-To: <001bf4e4b4088613ad1469abcc6acecef3ceea6d.1705743574.git.vivien@planete-kraus.eu> (Vivien Kraus's message of "Thu, 18 Jan 2024 22:14:09 +0100") References: <47694e8e235223700dddb80b23a6d173e3097f3f.camel@gmail.com> <001bf4e4b4088613ad1469abcc6acecef3ceea6d.1705743574.git.vivien@planete-kraus.eu> Date: Sat, 20 Jan 2024 13:30:47 -0500 Message-ID: <87a5ozhn6w.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68573 Cc: rg@raghavgururajan.name, liliana.prikler@gmail.com, 68573@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vivien Kraus writes: > * gnu/packages/glib.scm (sdbus-c++) [#:phases]: Add 'fix-elogind-requirement. > > Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7 Thanks for the explanation, it makes sense. Reviewed-by: Maxim Cournoyer -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 25 10:33:51 2024 Received: (at 68573-done) by debbugs.gnu.org; 25 Jan 2024 15:33:51 +0000 Received: from localhost ([127.0.0.1]:48900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT1jj-0006Ek-7O for submit@debbugs.gnu.org; Thu, 25 Jan 2024 10:33:51 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:48333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT1jh-0006EW-22 for 68573-done@debbugs.gnu.org; Thu, 25 Jan 2024 10:33:49 -0500 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-55a349cf29cso8058501a12.0 for <68573-done@debbugs.gnu.org>; Thu, 25 Jan 2024 07:33:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706196817; x=1706801617; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=oXFdrfCDv5OaAXsK4FUBQhMn/H7Se4EyYrHrDdBQYAs=; b=ApV9PcQDyVwdgfuGsYzz3rhkc/6uURu7RTMLUO8m2oWJNxOg79RLiwenNeC0X8Wx8U +SqayvQby6t+GJCDhYe7RZwFPXhhl3Y3gMHmeqJKhSJdVwks2epbkwI4DDcpi8wssPrC +4dmUziMHw06jT/RPtq6JEOX/mid6sp894Z/pVo8z1YABWVX2mY/EKwzEpg+K3IBNuyh QQzFyio16FQndoiEEPRhtTaGPCbTufHgHCD2ih9R7mb0lRGScRC/NavpiAoBnZmy22dC vWY1x2zwmps8+pBVG+3psSTUVBl/b1jjiGmjRMNwVqfnAdQw3yK8oCdjfmr3zFdQwoEK CNqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706196817; x=1706801617; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=oXFdrfCDv5OaAXsK4FUBQhMn/H7Se4EyYrHrDdBQYAs=; b=cqDZBD+t/L9Pt/XDQEE2YawnD5d3A9jeR2ifGWrs/PK9eY9itBcf4ei/cG2IV5tfMm YqQtoAPGcvPwJTiet1XGbq0Nq3vtRVnPJbi73fcgKHdONZQrspBCxKbXjBwRjr7nc54z EE89+9I21GOa0+CBa8ARzgduigawnKDxteQOAL6K7ch8eFRXsvLbBw45pgkYmrlXX06G ZhiJfjCMPETGIZaRViIXoNRCcDP4CV8WrTUE0PKI2JvM9RtlZ3wkVx9sKMMu6IO17f4T U+jNQz7YknThSw4f2SZZF6j6pi49fLvDDiquM/BEtKGTDm49Xg1fWs/9nSFwB+c5XLub GHXA== X-Gm-Message-State: AOJu0YxgNvm70O3f1jzzTp7F0nrxaBC2zE5scYSjjujNcmOLq946mYI4 U2N0xOmQuXBzZBUT7/oaZX+xQmG5DrR/UzW22Mf84HC9H5JCza9m X-Google-Smtp-Source: AGHT+IG6037HsSwsqY4SIUaac+usMOfxSJlhBaErM+IkWZOKkNtd6KTT7amle1qIWsGLmL77VRczEA== X-Received: by 2002:a50:ab52:0:b0:55c:6283:3a95 with SMTP id t18-20020a50ab52000000b0055c62833a95mr813358edc.64.1706196816898; Thu, 25 Jan 2024 07:33:36 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a5-20020a50ff05000000b0055bff4843casm5779937edu.49.2024.01.25.07.33.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 07:33:36 -0800 (PST) Message-ID: <1061cfe557e27279ba0d3f9d32ebef45177feafb.camel@gmail.com> Subject: Re: [PATCH gnome-team v2] gnu: sdbus-c++: Fix generated sdbus-c++.pc. From: Liliana Marie Prikler To: Vivien Kraus , 68573-done@debbugs.gnu.org Date: Thu, 25 Jan 2024 16:33:32 +0100 In-Reply-To: <001bf4e4b4088613ad1469abcc6acecef3ceea6d.1705743574.git.vivien@planete-kraus.eu> References: <47694e8e235223700dddb80b23a6d173e3097f3f.camel@gmail.com> <001bf4e4b4088613ad1469abcc6acecef3ceea6d.1705743574.git.vivien@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68573-done Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 18.01.2024 um 22:14 +0100 schrieb Vivien Kraus: > * gnu/packages/glib.scm (sdbus-c++) [#:phases]: Add 'fix-elogind- > requirement. >=20 > Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7 Pushed. Thanks From unknown Mon Sep 08 01:50:53 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 23 Feb 2024 12:24:14 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator