From patchwork Sun Oct 6 17:00:25 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: 68644 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 6F2EB27BBE9; 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 CC06A27BBEA 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 1sxUdq-0000fj-Qy; Sun, 06 Oct 2024 13:01:58 -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-0000fS-Ae 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 1sxUdp-0000z8-2i 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=hpgAkongXbUIMpul8fTwVFqIwAVpiCysvekA881GqrU=; b=spplThEvy7R552uLlrUAM+qgrgRLrw+Oul80mZ+IxMD+o8SZixwyI6a7CFfBaC8auhi7r72MHyM1Wkv8A15RssiFD3aBt0uw0v056Kt5ep4NW++ZVdY7WK0LPpwAJblEPb4q2F1gWmky12eV5Dxsa8wtcbUCM6S+243rsGLVAZVyn+J+/8h2cpK8SnnClx7GYt/eOAkr9VKUhz7IXBB0mDlw5G/+54nqwZvHtVoqPB4pJ2PeodkwT7SSNonE4iPwM1oyVOKp0xPA3ro8QvfksFnj/2vmWddsFxK7emyOp6aLUSNs6y2Q2EKpn+SC7edmkY2AuMqfiGGyuLI8XXBlMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdu-0004dR-G1 for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 2/8] gnu: netsurf: 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.172823408017676 (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]:42190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdD-0004ar-Aw for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:19 -0400 Received: from wolfsden.cz ([37.205.8.62]:53420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUd9-0004aK-RK for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:17 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 70E8C320E1E; Sun, 6 Oct 2024 17:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234068; bh=tFClRpeTe8fCns+OD2qta3i1vCnV3SJERlKtrDRilhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dbbVzelALM8qRdiPM2niAvEIkyn8l7Y7XXq6kuUFlOZrXAn7qTeN+6JGG0OMzALp3 8BQU9hwlDQnCLV/trW3f541Rg6CSWzxvg8+SeV6T07Wae0pIBhyMhsEC+wcp8nyqDP 5t5dLaa4kuPweQP1PBkzKwMmOK9jaago9ajBQGyd3ltsYdQ79RlVfMvzL7KE3Mv7sU M0Au3VM1ceQs0w4MpJsx55Hdc78ath1Y7pcZYH0Yg+7N7ziGS0FZXZn04JvuGlK+br 6y3dA9YbxgETP7nwu6DJzvBXTF845mqBViV274dwSZ5UPYRieOAtc5C1O9YNQY6u8r dvXy0hjxLIH/1hGUoTqtTPRcOFQ4ffvZY8SCA8zQt0M8qKsqx79TlbF/qIFUrX9pt8 s+mxnsebX15lXN4eLghAXgP6++4sIhFOz9hKgis73l/qyaV8g3Vtwbh4wA5moGWzgR wgtio8t5eDUmw/d5unPl9JPmh3aLwnLyvNEbcjB5VZtUpRPpgBbwN4K8OJrJtQ80Bq Mm8VISM05glBBE6BsaxMzVUCFqJk9a/xjArDW1AlkQVnYSDEVqEYgbD5p9296SNbsw zP0M+LmOcLVc0HhKwS00DAKQisqSuHdIVg2Vg6l2kpmFAanKH6azYHbAtB26POdaQy P3Wo5P9+zRvDLavkfgKAc0sE= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 0ED6C31EE3C; Sun, 6 Oct 2024 17:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234068; bh=tFClRpeTe8fCns+OD2qta3i1vCnV3SJERlKtrDRilhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dbbVzelALM8qRdiPM2niAvEIkyn8l7Y7XXq6kuUFlOZrXAn7qTeN+6JGG0OMzALp3 8BQU9hwlDQnCLV/trW3f541Rg6CSWzxvg8+SeV6T07Wae0pIBhyMhsEC+wcp8nyqDP 5t5dLaa4kuPweQP1PBkzKwMmOK9jaago9ajBQGyd3ltsYdQ79RlVfMvzL7KE3Mv7sU M0Au3VM1ceQs0w4MpJsx55Hdc78ath1Y7pcZYH0Yg+7N7ziGS0FZXZn04JvuGlK+br 6y3dA9YbxgETP7nwu6DJzvBXTF845mqBViV274dwSZ5UPYRieOAtc5C1O9YNQY6u8r dvXy0hjxLIH/1hGUoTqtTPRcOFQ4ffvZY8SCA8zQt0M8qKsqx79TlbF/qIFUrX9pt8 s+mxnsebX15lXN4eLghAXgP6++4sIhFOz9hKgis73l/qyaV8g3Vtwbh4wA5moGWzgR wgtio8t5eDUmw/d5unPl9JPmh3aLwnLyvNEbcjB5VZtUpRPpgBbwN4K8OJrJtQ80Bq Mm8VISM05glBBE6BsaxMzVUCFqJk9a/xjArDW1AlkQVnYSDEVqEYgbD5p9296SNbsw zP0M+LmOcLVc0HhKwS00DAKQisqSuHdIVg2Vg6l2kpmFAanKH6azYHbAtB26POdaQy P3Wo5P9+zRvDLavkfgKAc0sE= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:25 +0200 Message-ID: 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/web.scm (netsurf)[arguments]<#:modules>: Use %glib-or-gtk-build-system-default-modules instead of %glib-or-gtk-build-system-modules. Change-Id: Iacc4df7e213dbdae5a783e3aedde7e6e20402025 --- Rebase on latest master. gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.46.0 diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 552abf83c5..0ed88c11cf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6265,7 +6265,7 @@ (define-public netsurf (ice-9 match) (srfi srfi-1) (sxml simple) - ,@%glib-or-gtk-build-system-modules) + ,@%glib-or-gtk-build-system-default-modules) #:phases (modify-phases %standard-phases (delete 'configure)