From patchwork Sat Dec 17 10:01:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 45395 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 1CA1B27BBED; Sat, 17 Dec 2022 10:02:15 +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_INVALID, DKIM_SIGNED,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 66A5F27BBEB for ; Sat, 17 Dec 2022 10:02:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6U15-0008Fq-KP; Sat, 17 Dec 2022 05:02:03 -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 1p6U14-0008Dh-6Y for guix-patches@gnu.org; Sat, 17 Dec 2022 05:02: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 1p6U13-0007Is-Ri for guix-patches@gnu.org; Sat, 17 Dec 2022 05:02:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6U13-0005sg-M0 for guix-patches@gnu.org; Sat, 17 Dec 2022 05:02:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH] gnu: python-pygame: Update to 2.1.2. Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Dec 2022 10:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60153@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167127130022578 (code B ref -1); Sat, 17 Dec 2022 10:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Dec 2022 10:01:40 +0000 Received: from localhost ([127.0.0.1]:54963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6U0h-0005s4-Lt for submit@debbugs.gnu.org; Sat, 17 Dec 2022 05:01:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:45868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6U0e-0005ry-BK for submit@debbugs.gnu.org; Sat, 17 Dec 2022 05:01:37 -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 1p6U0d-0007vS-OT for guix-patches@gnu.org; Sat, 17 Dec 2022 05:01:36 -0500 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6U0Z-0007Cs-W2 for guix-patches@gnu.org; Sat, 17 Dec 2022 05:01:35 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6EE8241305 for ; Sat, 17 Dec 2022 11:01:28 +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 FQv_kQ9sD-Fq for ; Sat, 17 Dec 2022 11:01:26 +0100 (CET) Message-ID: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671271286; bh=uRHVolBO3M0LPlDICcR14wN4k0PjKi9prl4yR4yY4RY=; h=Date:To:From:Subject; b=KL1XbLtwrH61gf5U5Fxh6KCqga13zjY5kLpgndQalTdAwSVJB8yhPCSqyJrXDPuas wymGuoZuf/fGajJeJgD5f7twrDeyTAyNOUXEAE8nbSNIdmPL2fu92hC3lRx3lrYRfp kHUCZnhwh9OeRLkcQqIfiWGITheXnxXFto/mXAXNh3bbiBl/SdfZrNd+SxYOc5rEfS AGmXc2ZDpDiD/17gDQMNiDj419W8YFix81lo7wYd8YC/cM1ZVvKdrDiNe7mKFAjLO+ Kr9afwGGRmd0N6eDj37BuOZ06vatR9jDjHOIFqRIjgPxk8kSL/jKTUH7oJ9dqp2Xvq uLMerWZDdYCrg== Date: Sat, 17 Dec 2022 18:01:23 +0800 MIME-Version: 1.0 Content-Language: en-US Received-SPF: pass client-ip=178.21.23.139; envelope-from=adam.faiz@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz 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 From 2641ac309552016f5095b8f50259cd92b760ebad Mon Sep 17 00:00:00 2001 From: AwesomeAdam54321 Date: Sat, 17 Dec 2022 17:37:21 +0800 Subject: [PATCH] gnu: python-pygame: Update to 2.1.2. * gnu/packages/game-development.scm (python-pygame): Update to 2.1.2. [inputs]: Use the new style. [description]: Re-indent. --- gnu/packages/game-development.scm | 119 +++++++++++++----------------- 1 file changed, 51 insertions(+), 68 deletions(-) (home-page "https://www.pygame.org") (synopsis "SDL wrapper for Python") (description "Pygame is a set of Python modules designed for writing games. -Pygame adds functionality on top of the excellent SDL library. This allows you + Pygame adds functionality on top of the excellent SDL library. This allows you to create fully featured games and multimedia programs in the python language.") (license (list license:bsd-2 ;; python numeric license as listed by Debian looks like diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 4a0435045b..c3d8d9a8a9 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1194,92 +1194,75 @@ (define-public quesoglc (define-public python-pygame (package (name "python-pygame") - (version "1.9.4") + (version "2.1.2") (source (origin (method url-fetch) (uri (pypi-uri "pygame" version)) (sha256 (base32 - "1dn0nb86jl7yr8709cncxdr0yrmviqakw7zx3g8jbbwrr60if3bh")))) + "0g6j79naab7583kymf1bgxc5l5c9h5laq887rmvh8vw8iyifrl6n")) + (modules '((guix build utils))) + ;; Fix the configure script to allow passing the dependencies as + ;; environment variables. + (snippet + #~(begin + (substitute* "buildconfig/config_unix.py" + (("localbase.d") "d") + (("origincdirs = .*/include.*") + "origincdirs = os.environ['ORIGINCDIRS'].split(\":\")\n")))))) (build-system python-build-system) (arguments `(#:tests? #f ; tests require pygame to be installed first #:phases (modify-phases %standard-phases - ;; Set the paths to the dependencies manually because - ;; the configure script does not allow passing them as - ;; parameters. This also means we can skip the configure - ;; phase. + ;; Pass the dependencies to the configure script + ;; through environment variables. (add-before 'build 'set-library-paths (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((sdl-ref (assoc-ref inputs "sdl")) - (font-ref (assoc-ref inputs "sdl-ttf")) - (image-ref (assoc-ref inputs "sdl-image")) - (mixer-ref (assoc-ref inputs "sdl-mixer")) + (let ((font-ref (assoc-ref inputs "sdl2-ttf")) + (image-ref (assoc-ref inputs "sdl2-image")) + (mixer-ref (assoc-ref inputs "sdl2-mixer")) (smpeg-ref (assoc-ref inputs "libsmpeg")) (png-ref (assoc-ref inputs "libpng")) - (jpeg-ref (assoc-ref inputs "libjpeg")) - (freetype-ref (assoc-ref inputs "freetype")) - (v4l-ref (assoc-ref inputs "v4l-utils")) - (out-ref (assoc-ref outputs "out"))) - (substitute* "Setup.in" - (("SDL = -I/usr/include/SDL") - (string-append "SDL = -I" sdl-ref "/include/SDL -I."))) - (substitute* "Setup.in" - (("FONT = -lSDL_ttf") - (string-append "FONT = -I" font-ref "/include/SDL -L" - font-ref "/lib -lSDL_ttf"))) - (substitute* "Setup.in" - (("IMAGE = -lSDL_image") - (string-append "IMAGE = -I" image-ref "/include/SDL -L" - image-ref "/lib -lSDL_image"))) - (substitute* "Setup.in" - (("MIXER = -lSDL_mixer") - (string-append "MIXER = -I" mixer-ref "/include/SDL -L" - mixer-ref "/lib -lSDL_mixer"))) - (substitute* "Setup.in" - (("SMPEG = -lsmpeg") - (string-append "SMPEG = -I" smpeg-ref "/include/smpeg -L" - smpeg-ref "/lib -lsmpeg"))) - (substitute* "Setup.in" - (("PNG = -lpng") - (string-append "PNG = -I" png-ref "/include -L" - png-ref "/lib -lpng"))) - (substitute* "Setup.in" - (("JPEG = -ljpeg") - (string-append "JPEG = -I" jpeg-ref "/include -L" - jpeg-ref "/lib -ljpeg"))) - - (substitute* "Setup.in" - (("FREETYPE = -lfreetype") - (string-append "FREETYPE = -I" freetype-ref "/include/freetype2 -L" - freetype-ref "/lib -lfreetype"))) - - (substitute* "Setup.in" - (("^pypm") "#pypm")) - ;; Create a path to a header file provided by v4l-utils. - (system* "mkdir" "linux") - (system* "ln" "--symbolic" - (string-append v4l-ref "/include/libv4l1-videodev.h") - "linux/videodev.h") - (system* "ln" "--symbolic" "Setup.in" "Setup"))))))) + (jpeg-ref (assoc-ref inputs "libjpeg-turbo")) + (libx11-ref (assoc-ref inputs "libx11")) + (portmidi-ref (assoc-ref inputs "portmidi"))) + (setenv "LOCALBASE" " ") + (setenv "ORIGLIBDIRS" + (string-append + font-ref "/lib:" image-ref "/lib:" image-ref "/lib:" + mixer-ref "/lib:" smpeg-ref "/lib:" png-ref "/lib:" + jpeg-ref "/lib:" libx11-ref "/lib:" portmidi-ref "/lib")) + (setenv "ORIGINCDIRS" + (string-append + font-ref "/include/SDL2:" + image-ref "/include/SDL2:" + image-ref "/include/SDL:" + mixer-ref "/include/SDL2:" + smpeg-ref "/include/smpeg:" + png-ref "/include:" + jpeg-ref "/include:" + libx11-ref "/include/X11:" + portmidi-ref "/include")))))))) + (native-inputs + (list pkg-config)) (inputs - `(("freetype" ,freetype) - ("sdl" ,sdl) - ("sdl-image" ,sdl-image) - ("sdl-mixer" ,sdl-mixer) - ("sdl-ttf" ,sdl-ttf) - ("sdl-gfx" ,sdl-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)) 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. From patchwork Thu Dec 22 20:45:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45549 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 F1BE227BBEB; Fri, 23 Dec 2022 19:31:30 +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=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 815D427BBE9 for ; Fri, 23 Dec 2022 19:31:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8nlB-00064n-O1; Fri, 23 Dec 2022 14:31:13 -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 1p8nl1-00061R-Ly 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 1p8nl1-0002Ru-Dd for guix-patches@gnu.org; Fri, 23 Dec 2022 14:31:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p8nl1-0000yE-9b for guix-patches@gnu.org; Fri, 23 Dec 2022 14:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v2 3/3] gnu: python-pygame: Reword description. References: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> In-Reply-To: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Dec 2022 19:31:03 +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.16718238263688 (code B ref 60153); Fri, 23 Dec 2022 19:31:03 +0000 Received: (at 60153) by debbugs.gnu.org; 23 Dec 2022 19:30:26 +0000 Received: from localhost ([127.0.0.1]:38455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8nkP-0000xL-VM for submit@debbugs.gnu.org; Fri, 23 Dec 2022 14:30:26 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:39639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8nkL-0000wg-2e for 60153@debbugs.gnu.org; Fri, 23 Dec 2022 14:30:21 -0500 Received: by mail-ej1-f67.google.com with SMTP id gh17so13952726ejb.6 for <60153@debbugs.gnu.org>; Fri, 23 Dec 2022 11:30:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=vyq7n8kDC0EdQy0TMPRdQY2lOPAhJCy4CqMZQntP4+o=; b=HSqe2V+XI4x1AfKMKxtZfFFZqHOc+lflWwb+tUdh/iuI5hMIuzWM5dU5/iOXJSw5Ey VAmD8Mjzyl1y6pbPBIzn3qIXOfC1tWxDDlUK+xb7lgdjt7mUxkAFM/NyJyNHup1DqPuU Wp1RWbRIVTgBM3CC/sMDUn6DQgm2z467IhU7WIR96g0Q04qers5EgcgvruRGoqAj7ihb CTM1iQUZYwDRFDV65V210KxKJn5hz2x/Rdx0TLednWsQbBqMbsrjklHDh0EjqOO/knXf NT9Wl6APaDJNM2PvtDeOpkGTd9FjP2xXJjAC0MTpNyuCxJwvPTOBcccqo4NgaqNRooIc vVlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vyq7n8kDC0EdQy0TMPRdQY2lOPAhJCy4CqMZQntP4+o=; b=Rd0MHw8Sjjz3DMF043X/jL4+onNh7sdbbC+dLgcEarSx+Vj2LbPCFiKUzhSomKI1dU P93JUdqA3tWpiLt7TZFClv7Djv7qHSMQM3gvhGIzymGLcDJKG0WmbnqbszGYGXw2cBro 2w6vFNRcEMjJzAePd0lMsEE9m4OGFqcw6F+ieP/sgdhsziWeqfRoUF4DCWpznDKFYpiY UcxZUv+wq/eXog8gdXfWuLcvVmEHY6nl/lRTOx4/IISVX7EjpppduHNEodryFBRkBkUb gDvQo29JdXyeE1gW64Dmd2iTVGvfKn8thrLZc4F1lu0QqeWL873+9xXdpv/WBAVS5ZdI DHBg== X-Gm-Message-State: AFqh2koHGFuJkBMgAzeKj0kI8ssPtYa4f6JKaPCezZiO8iHi2gAWZPlV C/I198nc438n0MJh22CflvSObheCV3Y= X-Google-Smtp-Source: AMrXdXtYtOhPmjDd9csQLR8Q5D5uHaAn0lB4dZwLn44EUUNm05KB+VloClu5qRyWoloXBekEf27XJA== X-Received: by 2002:a17:907:cbc6:b0:7c0:8371:97aa with SMTP id vk6-20020a170907cbc600b007c0837197aamr9921724ejc.28.1671823815589; Fri, 23 Dec 2022 11:30:15 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Dec 2022 11:30:15 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 22 Dec 2022 21:45:24 +0100 MIME-Version: 1.0 Message-ID: <76223dfff555ef0c545e994eb2eb808423a333d4.camel@gmail.com> 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)[description]: Join sentences describing functionality. Capitalize “Python”. Cut down the marketing talk. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 31bc76d4fd..0f96784dd3 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1247,8 +1247,8 @@ (define-public python-pygame (home-page "https://www.pygame.org") (synopsis "SDL wrapper for Python") (description "Pygame is a set of Python modules designed for writing games. -Pygame adds functionality on top of the excellent SDL library. This allows you -to create fully featured games and multimedia programs in the python language.") +It adds functionality on top of the SDL library, allowing you to create games +and multimedia programs in the Python language.") (license (list license:bsd-2 ;; python numeric license as listed by Debian looks like ;; an Expat-style license with a warranty disclaimer for