From patchwork Sun Dec 18 15:54:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45550 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 E5A1627BBED; Fri, 23 Dec 2022 19:31:34 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 DE72B27BBE9 for ; Fri, 23 Dec 2022 19:31:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8nl7-00064J-HD; Fri, 23 Dec 2022 14:31:09 -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 1p8nl0-00061F-Os for guix-patches@gnu.org; Fri, 23 Dec 2022 14:31:04 -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 1p8nl0-0002RI-Gx for guix-patches@gnu.org; Fri, 23 Dec 2022 14:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p8nl0-0000xy-DI for guix-patches@gnu.org; Fri, 23 Dec 2022 14:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v2 2/3] gnu: python-pygame: Use G-Expressions and new-style inputs. References: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> In-Reply-To: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Dec 2022 19:31:02 +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.16718238253675 (code B ref 60153); Fri, 23 Dec 2022 19:31:02 +0000 Received: (at 60153) by debbugs.gnu.org; 23 Dec 2022 19:30:25 +0000 Received: from localhost ([127.0.0.1]:38451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8nkO-0000xC-R8 for submit@debbugs.gnu.org; Fri, 23 Dec 2022 14:30:25 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:40863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8nkK-0000wc-F4 for 60153@debbugs.gnu.org; Fri, 23 Dec 2022 14:30:21 -0500 Received: by mail-ej1-f68.google.com with SMTP id jo4so13917731ejb.7 for <60153@debbugs.gnu.org>; Fri, 23 Dec 2022 11:30:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=TOQS/z6rGvpZaWEeH3rNz4fOdqxZoZ/Ldx9HxJ/OvF8=; b=jfV1P+batQA88m7pZBxw1WAUTTjx9rhWBeJUlETXbd3p4jM2VumvI9L5eYaYMGB+UG 7cs9LXBuHxppJq9M0eLOVd1tUZ0Cbq4BQBIViLdphzoPtC1GwYY0Z6lh7T1XyPfVbb9U p7rCwnsFnrMJps2K1V34knO34cKUgAZ4nFSuIxALQFpfP/YZcki7Pcvlxnt67f+74Jtd pr0tfNRMF+rbjZhEaBJ98bEGUf/FeIeHGh+vwf2m4BwO5VpTSaRm2R2Vki8voG3n0pvJ oDDNL0wf5uY59pjaz9VYd6xeOkJN2+r08QhKWBFlVaYjeFPwLQzVtL9FSO4dX5RnbmHi fkgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TOQS/z6rGvpZaWEeH3rNz4fOdqxZoZ/Ldx9HxJ/OvF8=; b=fCx8KiL0ebXlUUOQM1bbP4/qByWRtgwM1SjWVqFStYcTg2md1S9wAoVYnB5fV+t8p3 Hn/OPCpM3JufwWkFDwgb0ANf9H0sBNlGomtA2wKWpUVn+aHzVdMC4fNsS1jPFqp9DVuX yuHH4CuXRPUVHCWeKh+y7K3ZpY0wEQtLHRkQY0GN5gcXNbP1ZglSAZQtz7O8VtlVJxzd VJAU5I7HA9e3U9pFMqdm6o7pD8Sx71QaNmZNkOdaoiaXyXr2hLyfjGZTBo6lMHKdWcd9 FM9RZy2LrzE9vsDQLQyckqV4B4ltT48+0SOGIehgHddIktO39qHO24MiayKCxK/IOT4g JqUg== X-Gm-Message-State: AFqh2krPb/ikaHGtDO5xTSI03iQ1anaNJ3bCprfWO9PZFX4Aod1CTr76 mgLWbCv2IV6SvD82dTd9rrs9A1hJjGU= X-Google-Smtp-Source: AMrXdXuhOnQgcJGPyyOq1w8q/xv15AUVdmVZtITHv5EWU/+ry1SOFl7zJnlMPSoVtbDxW5vMFtreAg== X-Received: by 2002:a17:906:2854:b0:7c0:e30a:d3e5 with SMTP id s20-20020a170906285400b007c0e30ad3e5mr8378250ejc.18.1671823814891; Fri, 23 Dec 2022 11:30:14 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id l18-20020a1709060cd200b007c0c1e18e28sm1674920ejh.124.2022.12.23.11.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Dec 2022 11:30:14 -0800 (PST) From: Adam Faiz X-Google-Original-From: Adam Faiz Date: Sun, 18 Dec 2022 23:54:22 +0800 Message-ID: <0a0ec42cff859e92452309eae9cb9e4c02946f92.camel@disroot.org> 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 * gnu/packages/game-development.scm (python-pygame)[arguments]: Convert to list of G-Expressions. [inputs]: Drop labels. --- gnu/packages/game-development.scm | 75 ++++++++++++++++--------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 07b2c6f3fe..31bc76d4fd 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1203,46 +1203,47 @@ (define-public python-pygame "0g6j79naab7583kymf1bgxc5l5c9h5laq887rmvh8vw8iyifrl6n")))) (build-system python-build-system) (arguments - `(#:tests? #f ; tests require pygame to be installed first - #:phases - (modify-phases %standard-phases - (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"))))))) + (list + #:tests? #f ; tests require pygame to be installed first + #:phases + #~(modify-phases %standard-phases + (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"))))))) (native-inputs (list pkg-config)) (inputs - `(("freetype" ,freetype) - ("sdl2" ,sdl2) - ("sdl2-image" ,sdl2-image) - ("sdl2-mixer" ,sdl2-mixer) - ("sdl2-ttf" ,sdl2-ttf) - ("sdl2-gfx" ,sdl2-gfx) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libX11" ,libx11) - ("libsmpeg" ,libsmpeg) - ("portmidi" ,portmidi) - ("v4l-utils" ,v4l-utils))) + (list freetype + sdl2 + sdl2-image + sdl2-mixer + sdl2-ttf + sdl2-gfx + libjpeg-turbo + libpng + libx11 + libsmpeg + portmidi + v4l-utils)) (home-page "https://www.pygame.org") (synopsis "SDL wrapper for Python") (description "Pygame is a set of Python modules designed for writing games.