From patchwork Sun Oct 6 17:00:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 68645 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 9B3A127BBE9; Sun, 6 Oct 2024 18:02:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS 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 CADB327BBE2 for ; Sun, 6 Oct 2024 18:02:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUdr-0000fi-73; Sun, 06 Oct 2024 13:01:59 -0400 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 1sxUdp-0000fQ-7W for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:57 -0400 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 1sxUdo-0000z9-Vv for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ocdGJT2e+DWGT6xanKT3ncwSGz/lUtVwG1nZzLFtwYA=; b=RFO6a0Ae2/WAgEB8MKFOn4XcUcfBfaO5oO/8pgO1Q/ig+ITwHWy/Xva8j2XLrXFeT8CKXUSLbGEynCkg9fgAS2wtL0WjZecLo0KZEa+6Drar2k9z61AGBkcKY2ws2T2uX8ixiTi+vMzzZe8jbBS+GOtXL4THxUQD3DOzldaIVKs+3jun4ICG8nIFNlUTlcz/rn8SkbyrX6yrRe5FwxBt/HTkP/qRyJ7CxYbrvFV6ekXahP2R2tuTrpKVmMDs6za+g1OFftHDv1Xgb+YtPcs0xl3h/Eiwo2Eb19R+gaoYxt/0gRxpPBgp9m7ooQRHx9tA3wu48Y1HX/yLSkDTAoo2lQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdv-0004dY-03 for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 3/8] gnu: libreoffice: Actually use glib-or-gtk-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.172823408017684 (code B ref 68150); Sun, 06 Oct 2024 17:02:02 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:20 +0000 Received: from localhost ([127.0.0.1]:42192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdD-0004b3-S1 for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:20 -0400 Received: from wolfsden.cz ([37.205.8.62]:53424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdA-0004aN-Bf for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:17 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 987A8320D6A; Sun, 6 Oct 2024 17:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234069; bh=Rbmu5DDHRtiM7xI8m/s0uaYnXW/XXoA4KYy+ji8Rogo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RykUM7lEOnF1trTq3Iy5IULCM1vY/0U+RDT26AAmRcfC7Jqewe9fSMnPCBxpaMcu2 k9zw6lC5jz1LK/1jsVLg2c9UG6ivoj1IdGuC9vUMY83VKOGxdiTgP1OdywkSSaiy6t wjep/rzWSVtoImpq5j97mbBimXE3t/wYaqFCvKcZk099JKvQpqzNSX5t4m96AzQWog m5FB9a4iZLLFbM7fleq2JIb3QoA7JQ1odjw4IbWEVLvzFJ7eDA8SyKOQXJyfOIq4iC 6aKeAUYeDk1Khd2ozqN6Q+9SlrP6ymm/tVDf+OeBCkBq1zXLFkX6+HXzIKHaz5IwrI NfWYbZ/GuODP3v8oy4V1rXOkyKpC2Jll+86YuvLWkYe734P2R+vD/xLtOaGjj5TFSa QPzO9mD9TW9ucMNs66NcWmtj9IaEOM8jdYVDyG9FEdUPW7or2DJAmpuadqxJZs2n6w RDRLHBfcB+Tb/jFsQfSNhu8I+xqE1y3Usha3WQ4I9gUzFbO/wPVIEufyBrzwVcRxGN z3ZeBl6wg6f7XVfDElxc4Ig2wJ97ETXM1/k3e4Vgp7I3ByTo6uOpbkkc/740XhxO4l 1PS+MuLB59xEL1Wc0UX8dtruVhF8lCi0PemFcw4E/X0gukhxg1LEay5lSTHPe7Yd6g ohhYWrFgnJW1sxDwbOs4Ppuk= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 34421320AFE; Sun, 6 Oct 2024 17:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234069; bh=Rbmu5DDHRtiM7xI8m/s0uaYnXW/XXoA4KYy+ji8Rogo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RykUM7lEOnF1trTq3Iy5IULCM1vY/0U+RDT26AAmRcfC7Jqewe9fSMnPCBxpaMcu2 k9zw6lC5jz1LK/1jsVLg2c9UG6ivoj1IdGuC9vUMY83VKOGxdiTgP1OdywkSSaiy6t wjep/rzWSVtoImpq5j97mbBimXE3t/wYaqFCvKcZk099JKvQpqzNSX5t4m96AzQWog m5FB9a4iZLLFbM7fleq2JIb3QoA7JQ1odjw4IbWEVLvzFJ7eDA8SyKOQXJyfOIq4iC 6aKeAUYeDk1Khd2ozqN6Q+9SlrP6ymm/tVDf+OeBCkBq1zXLFkX6+HXzIKHaz5IwrI NfWYbZ/GuODP3v8oy4V1rXOkyKpC2Jll+86YuvLWkYe734P2R+vD/xLtOaGjj5TFSa QPzO9mD9TW9ucMNs66NcWmtj9IaEOM8jdYVDyG9FEdUPW7or2DJAmpuadqxJZs2n6w RDRLHBfcB+Tb/jFsQfSNhu8I+xqE1y3Usha3WQ4I9gUzFbO/wPVIEufyBrzwVcRxGN z3ZeBl6wg6f7XVfDElxc4Ig2wJ97ETXM1/k3e4Vgp7I3ByTo6uOpbkkc/740XhxO4l 1PS+MuLB59xEL1Wc0UX8dtruVhF8lCi0PemFcw4E/X0gukhxg1LEay5lSTHPe7Yd6g ohhYWrFgnJW1sxDwbOs4Ppuk= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:26 +0200 Message-ID: <048211ca5d3fca6a7d86973ddf7bfb8dca426649.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The #:modules argument was based on %glib-or-gtk-build-system-modules, which, despite the name, should go into #:imported-modules. When put into #:modules, it leads to following warning: WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system) Due to the definition of %glib-or-gtk-build-system-modules `((guix build glib-or-gtk-build-system) ,@%gnu-build-system-modules) It results in %standard-phases from gnu-build-system being used, effectively turning glib-or-gtk-build-system with #:modules set to %glib-or-gtk-build-system-modules into gnu-build-system. The solution is to use the (now) exported default value of #:modules (%glib-or-gtk-build-system-default-modules) as a base of the #:modules. * gnu/packages/libreoffice.scm (libreoffice)[arguments]<#:modules>: Use %glib-or-gtk-build-system-default-modules instead of %glib-or-gtk-build-system-modules. Change-Id: I5304d9993af7d5f1187c6276e72a269aa60f5666 --- Rebase on latest master. gnu/packages/libreoffice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.46.0 diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index ed8dfd432b..2acbddaa3b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -908,7 +908,7 @@ (define-public libreoffice ,@%glib-or-gtk-build-system-modules) #:modules `(((guix build python-build-system) #:select (python-version)) (ice-9 textual-ports) - ,@%glib-or-gtk-build-system-modules) + ,@%glib-or-gtk-build-system-default-modules) #:tests? #f ; Building the tests already fails. #:phases #~(modify-phases %standard-phases