From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id FZROMfA3pmPAYQEAbAwnHQ (envelope-from ) for ; Sat, 24 Dec 2022 00:21:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id oB2oMPA3pmP8/gAAauVa8A (envelope-from ) for ; Sat, 24 Dec 2022 00:21:20 +0100 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 86A03247D8 for ; Sat, 24 Dec 2022 00:21:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8rLc-0006O8-0I; Fri, 23 Dec 2022 18:21:04 -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 1p8rLa-0006Nf-6V for guix-patches@gnu.org; Fri, 23 Dec 2022 18:21:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p8rLZ-0006vR-Mg for guix-patches@gnu.org; Fri, 23 Dec 2022 18:21:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p8rLZ-0003Ei-Iw for guix-patches@gnu.org; Fri, 23 Dec 2022 18:21:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v2 1/3] gnu: python-pygame: Update to 2.1.2. Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Dec 2022 23:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Adam Faiz Cc: 60153@debbugs.gnu.org Received: via spool by 60153-submit@debbugs.gnu.org id=B60153.167183761412422 (code B ref 60153); Fri, 23 Dec 2022 23:21:01 +0000 Received: (at 60153) by debbugs.gnu.org; 23 Dec 2022 23:20:14 +0000 Received: from localhost ([127.0.0.1]:39409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8rKn-0003EI-PS for submit@debbugs.gnu.org; Fri, 23 Dec 2022 18:20:14 -0500 Received: from knopi.disroot.org ([178.21.23.139]:55130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8rKl-0003EA-P2 for 60153@debbugs.gnu.org; Fri, 23 Dec 2022 18:20:12 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 43A1340743; Sat, 24 Dec 2022 00:20:10 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A0Ujoujx5ucp; Sat, 24 Dec 2022 00:20:09 +0100 (CET) Message-ID: <61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671837609; bh=zOrpFCbN1J9q99bA8dfIyQyVK3Hcm3+rbDKZV61vhXA=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=ErimVry0ns3itHNXAte/HVMLyHcHGzPz7ibUnRzOm6ias2XF6FL8ZO7zeGMMFV0lC pW11FPoC6V/28v5NhC6fE/rNbv+EvX0VZhP9myfYMEXm7E+mjmxrmyfK9sZAclr12q PhropzU7+wUylae/e00updBhPdC8mV3TbQPyrqKp60FBKL6FGztrIABulns2CYP31+ S7QlV1USA8ECce80t5g3a+VBugayB42Hf5so0Qp1/tLrfa+6QzSX6W/eq6FsPVYS3E hjps9AcMj8qzttFp3LBjbo7qSBwv7q4dY+Yz0pqi5i9eux7lyekI+eT3ldj57FHAKI tfsyNCcUYwAug== Date: Sat, 24 Dec 2022 07:20:04 +0800 MIME-Version: 1.0 References: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org> Content-Language: en-US In-Reply-To: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches From: Adam Faiz via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671837680; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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=abic0OaXmVra8taiYBqxyGoqyB8GiV0+1oE8BVoFCPk=; b=hqIke66YGN2xHvGhsNHtJH4OQ05nWdXbQl2TrHLG8ZSNpCDC3vCNbDefu3ZTE4tH/Zg0YW KXUyywzj/K97y0dwOEF2EnarMyxSgL6TWQv2zmMbPz3GOcGn5aeJy2l3nryQHHIRZiGqsP +7/qGXmR7J8vkSvuJJYXNgCni27AxCXEcaRxZRUUrzvCoDVlWxFNg6jP9emquqANxoXWfC k1hCCzIW4xNYuVFgrNA+5RJ4TAr1yKFjVepi8ZFO8kwtH3/puUyq4rNHSxROHC4OBBguJr e0wzguCtsqt7K1iPM/0X9/rdNsIkfMYj2SSEV0rZ8klb5mEJRAakqhxLsflNag== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=ErimVry0; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1671837680; a=rsa-sha256; cv=none; b=q+btaILcW+s5qFZKPwosxMDkOC5bdk9WlVfCFs0hnm60HzULaeLUk0RwGr5nxmWODwcsjy KxfjLVgp+qsoYt79wFaCznqzyH/7QtViuj9ToeHQp1+gaVxqpzpHoqK9WtdaHFtubp6ygk W79PvF02DRT//P6D/OchhnMuI87nTbrx4fdOc7jMSmPbCso+EmQpidtFRlNyY/71wWRym7 QjA3lCtAW/BEHDi/3AczKNGEKfcLsyh2qUjz2KqDmdf0dZhBgOuo3BW8fVvEriN8FbD8Bh m4X6KODpOUb+kW/7Rg2ieeF/Jehmkjxxz9tDCEKDhMQ0Ts/KmYB+kb8G2W62vQ== X-Spam-Score: -2.01 X-Migadu-Queue-Id: 86A03247D8 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=ErimVry0; 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"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.01 X-TUID: dWlavHJRi8gz On 12/18/22 23:51, Adam Faiz wrote: > + (add-after 'unpack 'fix-build-config > + (lambda _ > + (substitute* "buildconfig/config_unix.py" > + (("origincdirs = \\[.*\\]") > + "origincdirs = os.environ['C_INCLUDE_PATH'].split(\":\")") > + (("ORIGLIBDIRS") "LIBRARY_PATH") > + (("incdirs = \\[\\]") "incdirs = origincdirs") > + (("libdirs = \\[\\]") "libdirs = origlibdirs")))) > + (add-after 'unpack 'fix-sdl2-headers > + (lambda _ > + (substitute* "buildconfig/config_unix.py" > + (("SDL_ttf.h") "SDL2/SDL_ttf.h") > + (("SDL_image.h") "SDL2/SDL_image.h") > + (("SDL_mixer.h") "SDL2/SDL_mixer.h")) > + (substitute* "src_c/imageext.c" > + (("SDL_image.h") "SDL2/SDL_image.h")) > + (substitute* "src_c/font.h" > + (("SDL_ttf.h") "SDL2/SDL_ttf.h")) > + (substitute* "src_c/mixer.h" > + (("SDL_mixer.h") "SDL2/SDL_mixer.h")) > + (substitute* "src_c/_sdl2/mixer.c" > + (("SDL_mixer.h") "SDL2/SDL_mixer.h"))))))) I don't see why these should go in phases, when I think going in a snippet would be better. From "Snippets and Phases" in the Guix manual: > The source derived > from an origin should produce a source that can be used to build the > package on any system that the upstream package supports (i.e., act as > the corresponding source). In particular, origin snippets must not > embed store items in the sources; such patching should rather be done > using build phases. The 'fix-build-config is what I consider to be a serious bugfix, it doesn't matter that it was originally fixed as part of guix packaging. The 'fix-sld2-headers phase might stay in a build phase, if most systems that pygame supports doesn't keep these headers where guix would locate them. But I would consider that a bug in other systems for not storing the headers in the file path upstream places them. The 'fix-sdl2-headers doesn't embed store items, so there's no other justification other than the reason given above.