From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 6BvACfT052LucQAAbAwnHQ (envelope-from ) for ; Mon, 01 Aug 2022 17:44:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id YEq1CfT052IZKAEA9RJhRA (envelope-from ) for ; Mon, 01 Aug 2022 17:44:52 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B78FC113DD for ; Mon, 1 Aug 2022 17:44:51 +0200 (CEST) Received: from localhost ([::1]:60870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIXb8-0004S1-Vr for larch@yhetil.org; Mon, 01 Aug 2022 11:44:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIXWV-00007b-4p for guix-patches@gnu.org; Mon, 01 Aug 2022 11:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIXWU-00073N-Pq for guix-patches@gnu.org; Mon, 01 Aug 2022 11:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIXWU-0003ZH-DH for guix-patches@gnu.org; Mon, 01 Aug 2022 11:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56771] [PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Aug 2022 15:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56771 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: Jack Hill , Lars-Dominik Braun , 56771@debbugs.gnu.org Received: via spool by 56771-submit@debbugs.gnu.org id=B56771.165936836513658 (code B ref 56771); Mon, 01 Aug 2022 15:40:02 +0000 Received: (at 56771) by debbugs.gnu.org; 1 Aug 2022 15:39:25 +0000 Received: from localhost ([127.0.0.1]:41428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIXVt-0003YD-74 for submit@debbugs.gnu.org; Mon, 01 Aug 2022 11:39:25 -0400 Received: from mail-qv1-f53.google.com ([209.85.219.53]:41745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIXVr-0003Xv-P0 for 56771@debbugs.gnu.org; Mon, 01 Aug 2022 11:39:24 -0400 Received: by mail-qv1-f53.google.com with SMTP id i7so8705359qvr.8 for <56771@debbugs.gnu.org>; Mon, 01 Aug 2022 08:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=fsHh39kAbSacpSWdXv+gHmfvMKa9oJRUw2VUsAZE8kg=; b=cxVKF0uY+NpZwVVVcR9egDLsDYAGNzDCCNKH6VhL/t7KmbOO9cN3og9nO2jCDWK+5U ZEp0gCBs8H7ptXn7yuZ41M2hfJPAekGqBa4Brtv9SIwOkb1FUXu6VSYXbEthHClkhL9j vUmmzNm5+SvZlVRZob8LGuREWxCIF1vLy4LFqwJIX7aDpw2mcCkQvR1S8B+naBDVFB2m e27adELXXFlB8EWAtCwIEMv1ASTlImbKCzTZ7iAqOkDt6VikJI+9BZSn4e8QwG44Q+bU QHS/YsZAHlL0Q8BVfekz0S/5OabsSzHYYfE3l7pTJts/Bp9bk15YWYhva3iUWYU7qZsr YhMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=fsHh39kAbSacpSWdXv+gHmfvMKa9oJRUw2VUsAZE8kg=; b=Ng1LhcEcFa4EQwPMtVYXHh3U8ZdRbK4tK9aTrlSC/eMbaG4QU9pe8Vl4/VhpS7qcTP gqrrhXL31IqloeCMXqmFGu+CSTAO//DhZbonipdS/WFgxTUEEVrAfcm/g+CV3EmuRHv0 2He5SZXs/MMCOEHBEGXk1+ETvy8ZT9nbaHtYLDq5em1HXqRk+Jp3JJqewvWtn4aTgep7 lSD76o3LUJWNm0nzY44J/F59p/fxQzgZQnC8Oaj+MJLV2iIYzO8jdEIo4ZPC3oSVEutW Nwqzxnlsn7vXuSLtjq5Sz0rELXxgDu916Dg4pmuqI3izE+PGDBZ6KK3IwylFuTSnubnr HD+w== X-Gm-Message-State: ACgBeo2oEwr8DsTVNqXOTlS9LBdaMFTnJe5t8Nb1F9kG2QfVCFWt5tly ndz013z2FByEHtfJyANN8LA= X-Google-Smtp-Source: AA6agR5VJxJKaxd4zNm2fryj/iO0Ed9JCeMWzbvE7AfskOkxbVZ5Jno69FE95I0usp0zQUV6MSAhNA== X-Received: by 2002:ad4:5bed:0:b0:476:7ca2:6f71 with SMTP id k13-20020ad45bed000000b004767ca26f71mr5833708qvc.101.1659368358276; Mon, 01 Aug 2022 08:39:18 -0700 (PDT) Received: from hurd (dsl-158-240.b2b2c.ca. [66.158.158.240]) by smtp.gmail.com with ESMTPSA id a26-20020a05620a125a00b006b57b63a8ddsm8383901qkl.122.2022.08.01.08.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Aug 2022 08:39:17 -0700 (PDT) From: Maxim Cournoyer References: <20220725211704.4977-1-maxim.cournoyer@gmail.com> Date: Mon, 01 Aug 2022 11:39:16 -0400 In-Reply-To: (Maxime Devos's message of "Mon, 1 Aug 2022 12:54:06 +0200") Message-ID: <87y1w82ct7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659368691; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=fsHh39kAbSacpSWdXv+gHmfvMKa9oJRUw2VUsAZE8kg=; b=JReoxazQXN0ji12ZfZyZPGBcrLr9yXK4xOaKzf5r/fmqGkj533WJFTRkw4fO7q4My9i2+w zPqN2OPq1kmKNnW8bb4BQdhfQSZsYzhUnPL2+cMp7fUkcYf2LRTX53Y3t0/n8jyujzqnV8 Gqd0hCq885rw/d2ITU+0we4sSfBEaGgTMUk8uMFfpn30+K0FhJ9mhkTSWKeVP/1YMG16fY Yc9/EDusuJUGYv9QAqgx/ZxKJm/daZI2ULYBDmBQZAqQNh0CRABycdL4NSCCFi+1I1ZqfT IRowJtE/q+/Iq+xZesOoXkgWEiNt+941SNtAmlULsKKaHz92eaqgS24c32mXLg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659368691; a=rsa-sha256; cv=none; b=RbGA9xVgq9h1aCCXJt3eBqLfdbWNRmWYojmmK4VJ3Vpr46FfM3hSbKowj3FSMF6hCU98c4 lpTvic3qdvQddFsi6a0IpUTidJvj92IpggaX16R7oaIY2+DZ3EiHcNaChIW3aJgukPeJy3 aIgPGv0yhkS7bxVjp0t90nK5d6hVn8BSB0BX7UxJxSBvUm5rJ14ZiWj6GYG9UeRFq53M2V IgpYOljrcG0YqcdlY40DtU7gaMeHEKzxomPLI1iaNugaRASnvks/LLFoyoVRXsOyroLB9Y ZJ49cWvzUYxwitpRj5pDdqaktIe1kT2Murfe/+DhZPJhUa8mskcoxoE4QIBH3Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=cxVKF0uY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.08 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=cxVKF0uY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B78FC113DD X-Spam-Score: 6.08 X-Migadu-Scanner: scn1.migadu.com X-TUID: j3/jtx7Jzues Hi Maxime, Maxime Devos writes: > On 25-07-2022 23:17, Maxim Cournoyer wrote: >> Hello Guix, >> >> This series add the base Qt 6 components required by Jami and updates Jami >> itself to its latest stable release (made today!). All the Qt components >> updated have their test suite enabled except for qtwebengine, for which it was >> already disabled. [...] > > This patch series appears to have caused some failures in other > packages: > , > could they be fixed? Thanks for the heads-up. It appears the qt-build-system change (introducing #:qtbase) broke all packages explicitly defining the build arguments, in which case #:qtbase is #f. The following change fixes it: --8<---------------cut here---------------start------------->8--- modified guix/build-system/qt.scm @@ -122,7 +122,7 @@ (define private-keywords (define* (qt-build name inputs #:key - qtbase + (qtbase (default-qtbase)) source (guile #f) (outputs '("out")) (configure-flags ''()) (search-paths '()) @@ -161,7 +161,7 @@ (define builder #:phases #$(if (pair? phases) (sexp->gexp phases) phases) - #:qtbase #$qtbase + #:qtbase #+qtbase #:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs #:qt-wrap-excluded-inputs #$qt-wrap-excluded-inputs #:configure-flags #$configure-flags @@ -193,7 +193,7 @@ (define* (qt-cross-build name #:key source target build-inputs target-inputs host-inputs - qtbase + (qtbase (default-qtbase)) (guile #f) (outputs '("out")) (configure-flags ''()) @@ -250,7 +250,7 @@ (define %outputs search-path-specification->sexp native-search-paths) #:phases #$phases - #:qtbase #$qtbase + #:qtbase #+qtbase #:configure-flags #$configure-flags #:make-flags #$make-flags #:out-of-source? #$out-of-source? --8<---------------cut here---------------end--------------->8--- We could also refrain from introducing this argument, instead finding the qtbase in use via search-input-file at the place where we need to know its store output to figure out the version used; that'd be simpler, but would remove the mechanism here that allows a user potentially mixing qt5 and qt6 (probably not a very useful use case) and being able to explicitly set the qtbase used for wrapping/building. What do you think? Thanks, Maxim