From patchwork Sat Dec 30 16:38:37 2023 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: 58217 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 F043D27BBE9; Sat, 30 Dec 2023 16:39:23 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 636E627BBE2 for ; Sat, 30 Dec 2023 16:39:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMb-00076X-U2; Sat, 30 Dec 2023 11:39:05 -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 1rJcMZ-00075P-N9 for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:03 -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 1rJcMZ-0008Ql-FB for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMa-0002Ex-28 for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH 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: Sat, 30 Dec 2023 16:39:04 +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.17039543418554 (code B ref 68150); Sat, 30 Dec 2023 16:39:04 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:39:01 +0000 Received: from localhost ([127.0.0.1]:44963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJcMW-0002Do-LJ for submit@debbugs.gnu.org; Sat, 30 Dec 2023 11:39:00 -0500 Received: from wolfsden.cz ([37.205.8.62]:38680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJcMM-0002CM-Up for 68150@debbugs.gnu.org; Sat, 30 Dec 2023 11:38:52 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id B07DD279698; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954328; bh=6vc9hPR327MG1IyfnLw5msvjN5x6xfHvwkGh9LZcUhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z+4rpG3itdoCnXpwIPXWjAPXZji4XockA1VPVx3V06YvO5/BCE6BmWkvwYy7H8tk8 JUN6lrlgZa0GfLo2eyyloMmGlGrtk48x/LC3E48Bxj0rF93eM11Oxi8E0oABd1haQe 6woPGgW1oe69hC7MTGqwj2nrWQPKP0OOYZhHo0JmwfqgtfTIKJNxZvuIJtwMErA5gd 87zPYkiv8vBK5OfmT1VUiCq6+1LAmYQ/a7NiF8Tgu3ZQ1gKRugrRKPk/p6qb6S9uoJ wOJEKJyuE1u1k9WQAKHopYXZ7YDxWKxrdvNZyqVvqRF+PiNx35bCEt2o6s5uUpJpYz MJBn2zjG7twDQjEg8wStzESZGeIz170guR/TY1vIzw4i7LRaMvdBKmpzm1KNBO65dN rbQ0muelKDnKi2bXQTclk7xJwlFf5fgfYTIEXKB9nolmug2jUX6fUduwUZqg6WS2nS GnCVAEUzHmGUJF7zcQZOZ9mzzkb823E9jTC+wmPxa/8LfYnrRrd/fvh+rGlvn8KxZe sXXHld0PyAxroREIalDfd+wM2kiS0eavlt/WgCOY4HJ92nN4R2/k31sUiS8axGIsCQ z7vwOLC3q+v2EAdhKnyn4O58psxOFy8lLtk94bO7n5pm54y5otJOoyDUwdX1bTIWEV c/FObxejRAGG59SoPPdOP/+Y= Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id 27DA2278F30; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954328; bh=6vc9hPR327MG1IyfnLw5msvjN5x6xfHvwkGh9LZcUhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z+4rpG3itdoCnXpwIPXWjAPXZji4XockA1VPVx3V06YvO5/BCE6BmWkvwYy7H8tk8 JUN6lrlgZa0GfLo2eyyloMmGlGrtk48x/LC3E48Bxj0rF93eM11Oxi8E0oABd1haQe 6woPGgW1oe69hC7MTGqwj2nrWQPKP0OOYZhHo0JmwfqgtfTIKJNxZvuIJtwMErA5gd 87zPYkiv8vBK5OfmT1VUiCq6+1LAmYQ/a7NiF8Tgu3ZQ1gKRugrRKPk/p6qb6S9uoJ wOJEKJyuE1u1k9WQAKHopYXZ7YDxWKxrdvNZyqVvqRF+PiNx35bCEt2o6s5uUpJpYz MJBn2zjG7twDQjEg8wStzESZGeIz170guR/TY1vIzw4i7LRaMvdBKmpzm1KNBO65dN rbQ0muelKDnKi2bXQTclk7xJwlFf5fgfYTIEXKB9nolmug2jUX6fUduwUZqg6WS2nS GnCVAEUzHmGUJF7zcQZOZ9mzzkb823E9jTC+wmPxa/8LfYnrRrd/fvh+rGlvn8KxZe sXXHld0PyAxroREIalDfd+wM2kiS0eavlt/WgCOY4HJ92nN4R2/k31sUiS8axGIsCQ z7vwOLC3q+v2EAdhKnyn4O58psxOFy8lLtk94bO7n5pm54y5otJOoyDUwdX1bTIWEV c/FObxejRAGG59SoPPdOP/+Y= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 975a8ad1; Sat, 30 Dec 2023 16:38:46 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:37 +0100 Message-ID: <035edc6095b0f8e7c3bee5408d37e0d23d493a6e.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 --- gnu/packages/libreoffice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 79b30cecaf..6368dbf5bb 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -915,7 +915,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