From patchwork Wed Mar 16 10:55:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 37853 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 09E6C27BBE9; Wed, 16 Mar 2022 10:56:17 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,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 4C00D27BBEA for ; Wed, 16 Mar 2022 10:56:16 +0000 (GMT) Received: from localhost ([::1]:50324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nURKB-0005xT-Dm for patchwork@mira.cbaines.net; Wed, 16 Mar 2022 06:56:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nURJy-0005x3-G3 for guix-patches@gnu.org; Wed, 16 Mar 2022 06:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nURJy-0000o1-6w for guix-patches@gnu.org; Wed, 16 Mar 2022 06:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nURJy-0005Br-4S for guix-patches@gnu.org; Wed, 16 Mar 2022 06:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54418] [PATCH] cairomm@1.14 propagates both libsigc++@2 and libsigc++@3 Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Mar 2022 10:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54418 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54418@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164742815119928 (code B ref -1); Wed, 16 Mar 2022 10:56:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Mar 2022 10:55:51 +0000 Received: from localhost ([127.0.0.1]:50329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nURJj-0005BJ-6f for submit@debbugs.gnu.org; Wed, 16 Mar 2022 06:55:51 -0400 Received: from lists.gnu.org ([209.51.188.17]:55858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nURJh-0005BB-Ua for submit@debbugs.gnu.org; Wed, 16 Mar 2022 06:55:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nURJh-0005uH-MQ for guix-patches@gnu.org; Wed, 16 Mar 2022 06:55:45 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:52730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nURJe-0000jg-4L for guix-patches@gnu.org; Wed, 16 Mar 2022 06:55:44 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4KJRyM3LSWzMqq9k for ; Wed, 16 Mar 2022 11:55:39 +0100 (CET) Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by xavier.telenet-ops.be with bizsmtp id 6yvb270014UW6Th01yvbe7; Wed, 16 Mar 2022 11:55:35 +0100 Message-ID: <44851072e063e7887148dfb44d2a7665c7f94607.camel@telenet.be> From: Maxime Devos Date: Wed, 16 Mar 2022 11:55:27 +0100 User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1647428135; bh=TtNJ6nfb4NXSVV5yaQxLYTqSCQaQ7dxUPeNMGGeR3EI=; h=Subject:From:To:Date; b=kkl171/EI7wSvjOHwznaGW/zpqfnKv4Ea0ORcocWWmQSyLLOBABPbiJHon2SxPkBc kR3Vpxw+3oVNqbXAkb1v3G8RRtRCe9Xkjw0OXX+FoAWco09yZriqMNsk0l9/CYP6JH RyKBR0vd5s5DRujrttbE2+Sjm4ZCGas67XyCTQxBqHLmGoa41YM16+ICXcgIjwocJn GYc7Pv3wGSV+gWnsPFlv1Ass5Qm1k4cYnEAQMOiEXqgrz+9yt5blUGGJX7ypjCRmOu 8R/5Ng3uLnrhe7J+PeRDHJwGuSyTPFWyloIlZj/SGAu459hNFhyHlqUaxeKv/Xtj5P QIJqcyWQX/pAQ== Received-SPF: pass client-ip=195.130.137.77; envelope-from=maximedevos@telenet.be; helo=leibniz.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, cairomm-1.14 is defined as: (define-public cairomm-1.14 (package (inherit cairomm) [...] (propagated-inputs (modify-inputs (package-propagated-inputs cairomm) (prepend libsigc++-2))))) Because cairomm already has a libsigc++ (@3), and 'prepend' is used instead of 'replace', this causes cairomm@1.14 to have both versions of libsigc++ as inputs. It appears to be introduced with commit 736c5df29ac380413ec45b496c63dcf80672712d. Unfortunately, according to "guix refresh -l", fixing this will cause 1980 rebuilds (staging branch?). The attached patch (currently targetting master) fixes it (cairomm builds).  I'll try to compile an application with the new cairomm and report if it works. Greetings, Maxime. From 3a6099ab347e76d030a23ab87dd588baaaae4987 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Wed, 16 Mar 2022 10:48:25 +0000 Subject: [PATCH] gnu: cairomm-1.14: Don't have multiple variants of libsigc++ as input. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This solves a propagation issue reported in . * gnu/packages/gtk.scm (cairomm-1.14)[propagated-inputs]: Replace the libsigc++ input instead of adding an additional libsigc++ input. Reported-By: Ludovic Courtès --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ced9d621aa..2fd6aa8cfc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021 Simon Streit -;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021, 2022 Maxime Devos ;;; Copyright © 2021 Wamm K. D. ;;; ;;; This file is part of GNU Guix. @@ -1598,7 +1598,7 @@ library.") (base32 "1qwdj9xw1w651kqwh82nipbryimm1ir5n3c6q34nphsx576bj9h1")))) (propagated-inputs (modify-inputs (package-propagated-inputs cairomm) - (prepend libsigc++-2))))) + (replace "libsigc++" libsigc++-2))))) (define-public pangomm (package base-commit: 29091731a0c6cb649cdfd72297575fe2bb2a9591 prerequisite-patch-id: 35140f4f2873d0b9f4fc8caca6ec2e013ecb830a prerequisite-patch-id: ed97d14afd166e7b6cac37e3aa87a85246f7e320 prerequisite-patch-id: 7b2139dc21a7c93817ce12320181270476340a09 prerequisite-patch-id: e8f735697c0535afe9335448b16e3e1f308de362 prerequisite-patch-id: eaf1f67c4c07482fb4da81525cbd5dcb1ea2194e prerequisite-patch-id: 9a15aa08fbbbf110ba76409dcc2a3ab5e0764806 prerequisite-patch-id: 675a3c516f47dfcbaf61d5ad41ca7f3babdd3f20 prerequisite-patch-id: ac188cb61957c9639d0ac125c941950afbdba9c7 prerequisite-patch-id: 557ba1c38241c1d62f464a97fa0575652a13aff9 prerequisite-patch-id: ece168a472eb532b1ebd12a5245a25ec1c6f4918 prerequisite-patch-id: 5eee450b2221d67fbda1e6581d16628394c912a7 prerequisite-patch-id: 623edc835c2c5dfd8c83dcf32e650cfebea42aa0 prerequisite-patch-id: 277ff341648002cb1739c42819684e67409b6645 prerequisite-patch-id: dcac72251d6ee4f34c3ebd64934063e1ee133045 prerequisite-patch-id: c9593e48965f7f033a855b639133147a62ddd0ad prerequisite-patch-id: 03ae6cfd97b0f89f92cdd244f35b4c4561c31e26 prerequisite-patch-id: ef8cc21f9671087a7bf93224e32852bbb520cd37 prerequisite-patch-id: 54eec153e523b58c3670c48afda9ef50ec44eb8e prerequisite-patch-id: bc5dfc06e9d67d10a37fbd7ba61939907d93ca7c prerequisite-patch-id: 0db9692e872bf73242cfec6f8aa390abe14d08f1 prerequisite-patch-id: 36431a656d29e90e8eb218730c64807e2477c9d7 prerequisite-patch-id: 9146aec4a40f7da60a4c64643a9aa0e405567b04 prerequisite-patch-id: ff2daf978d58ec12c25dcbce4e7ee010d337cd54 prerequisite-patch-id: d7dba04b19c96e1b438291c906bc9e6a1ba5477f -- 2.30.2