From unknown Sun Jul 27 00:54:40 2025 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 From: Adam Faiz Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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(-) 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)) (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 -- 2.38.1 From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] Fwd: [PATCH] gnu: python-pygame: Update to 2.1.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Dec 2022 10:53: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.167127435724833 (code B ref 60153); Sat, 17 Dec 2022 10:53:01 +0000 Received: (at 60153) by debbugs.gnu.org; 17 Dec 2022 10:52:37 +0000 Received: from localhost ([127.0.0.1]:55173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Uo1-0006ST-4i for submit@debbugs.gnu.org; Sat, 17 Dec 2022 05:52:37 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:52745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Unz-0006SJ-4D for 60153@debbugs.gnu.org; Sat, 17 Dec 2022 05:52:35 -0500 Received: by mail-wm1-f65.google.com with SMTP id ay40so3421763wmb.2 for <60153@debbugs.gnu.org>; Sat, 17 Dec 2022 02:52:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=YxVNTMbF/eJeKXTKBfQ6jRDeghn5JtpEt3k0GMt0R5A=; b=BVUE5TKfcL9wjxdQiu3WPQnDrEx3okJfBRqFufDatUGaCeqQyCztpMHlb8YOABBKLv iUxonLMpteG++/o/CigUI7iMn3r+GiTUsvZZEkrjkvCw44j2zpTebT3iGaY9GvL2NsS5 0bWKw4vwrnWdwjpqeb+MiCMwF3X2Cqp+JorEIQyGREuw+nfe/IVZnR2WCKpWtbcjXQwx wrwbY4TG+T4Nw/wFej3saIEWbekYQwrk2dCV+4Fb/5d6KlW5LOy1OAH5edC3scmF6g7X 8GcG7/n4Zppu6BzMwejBlLnRi1BWB/Ld5GyUwJa4aG4+fiECIzpBAbmiEo2HRxTO85oz dinA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=YxVNTMbF/eJeKXTKBfQ6jRDeghn5JtpEt3k0GMt0R5A=; b=CfO9oMPMEVlLV8BDFmMU89i3BksV+lbB+6QbwP8pJXfnZPgoONDnSFANy2uZklSyqo lwQBpZ6ZmGDtpCwPpLZ9uHj3lmZ8wfdJMmK/JNgL0EJiyrWqBn2Z3cGDARyT9eYtx/cD YEK1+/PBigImdbyjazp/A1VtJ7W7jJeMXxIHw5O7zzGfNKhzNpq3RopBirhcHJMQZ1fK puv+qGo/ipWuEh0Mis0iH0bPM60LjZGpbfCt/iWYP6bwpTOzmoPxfWwBeVoD++U57oDk PM3+y8X9dJZ7owLMUGqofWGCSrgVbGaj3r8Bzd6vuIOJmIDdCyrGUMVliZsoInk3QWQE dqUQ== X-Gm-Message-State: ANoB5pnC/pRggB9cokSKKgZhR22XEc1D8kLCPoQunDuK2+pvtNedi9I3 Dete+SIK73peago5J/+xGQY= X-Google-Smtp-Source: AA0mqf7Pu5Kt53uYydgDy2Rdn7OwP65TOmnvbqEtfZxRotHm1mgP+nDXDpobxrea68OFXZTcPh1omw== X-Received: by 2002:a05:600c:4f51:b0:3cf:d18e:528b with SMTP id m17-20020a05600c4f5100b003cfd18e528bmr28237383wmq.39.1671274349103; Sat, 17 Dec 2022 02:52:29 -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 d22-20020a05600c34d600b003a6125562e1sm5507452wmq.46.2022.12.17.02.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 02:52:28 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Sat, 17 Dec 2022 11:52:27 +0100 In-Reply-To: <93aa8b09-cc29-4030-3c76-458158ea0c0f@disroot.org> References: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> <93aa8b09-cc29-4030-3c76-458158ea0c0f@disroot.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gU2Ftc3RhZywgZGVtIDE3LjEyLjIwMjIgdW0gMTg6MDYgKzA4MDAgc2NocmllYiBBZGFtIEZh aXo6Cj4gKiBnbnUvcGFja2FnZXMvZ2FtZS1kZXZlbG9wbWVudC5zY20gKHB5dGhvbi1weWdhbWUp OiBVcGRhdGUgdG8gMi4xLjIuClNpbmNlIHRoaXMgaXMgYSBtYWpvciBidW1wLCBkaWQgeW91IGNo ZWNrIHdoZXRoZXIgZGVwZW5kYW50IHBhY2thZ2VzCnN0aWxsIGJ1aWxkPwo+IFtpbnB1dHNdOiBV c2UgdGhlIG5ldyBzdHlsZS4KSSdkIHNwbGl0IHRoZSBzdHlsZSBhZGp1c3RtZW50cyBpbnRvIGEg c2VwYXJhdGUgY29tbWl0LiAgQWxzbyBub3RlLAp0aGF0ICM6cGhhc2VzIG5lZWRzIHNpbWlsYXIg dHJlYXRtZW50IHcuci50LiB1c2luZyB0aGUgbmV3ZXIgQVBJLgo+IFtkZXNjcmlwdGlvbl06IFJl LWluZGVudC4KSU1ITyB0aGF0IG9uZSdzIG5vaXNlIGdlbmVyYXRlZCBieSBndWl4IHN0eWxlLgo+ IC0tLQo+IMKgIGdudS9wYWNrYWdlcy9nYW1lLWRldmVsb3BtZW50LnNjbSB8IDExOSArKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0KPiAtLS0KPiDCoCAxIGZpbGUgY2hhbmdlZCwgNTEgaW5zZXJ0 aW9ucygrKSwgNjggZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9n YW1lLWRldmVsb3BtZW50LnNjbSAKPiBiL2dudS9wYWNrYWdlcy9nYW1lLWRldmVsb3BtZW50LnNj bQo+IGluZGV4IDRhMDQzNTA0NWIuLmMzZDhkOWE4YTkgMTAwNjQ0Cj4gLS0tIGEvZ251L3BhY2th Z2VzL2dhbWUtZGV2ZWxvcG1lbnQuc2NtCj4gKysrIGIvZ251L3BhY2thZ2VzL2dhbWUtZGV2ZWxv cG1lbnQuc2NtCj4gQEAgLTExOTQsOTIgKzExOTQsNzUgQEAgKGRlZmluZS1wdWJsaWMgcXVlc29n bGMKPiDCoCAoZGVmaW5lLXB1YmxpYyBweXRob24tcHlnYW1lCj4gwqDCoMKgIChwYWNrYWdlCj4g wqDCoMKgwqDCoCAobmFtZSAicHl0aG9uLXB5Z2FtZSIpCj4gLcKgwqDCoCAodmVyc2lvbiAiMS45 LjQiKQo+ICvCoMKgwqAgKHZlcnNpb24gIjIuMS4yIikKPiDCoMKgwqDCoMKgIChzb3VyY2UgKG9y aWdpbgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobWV0aG9kIHVybC1mZXRjaCkK PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHVyaSAocHlwaS11cmkgInB5Z2FtZSIg dmVyc2lvbikpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzaGEyNTYKPiDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYmFzZTMyCj4gLcKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoAo+ICIxZG4wbmI4NmpsN3lyODcwOWNuY3hkcjB5cm12aXFha3c3engzZzhq YmJ3cnI2MGlmM2JoIikpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgCj4gIjBn Nmo3OW5hYWI3NTgza3ltZjFiZ3hjNWw1YzloNWxhcTg4N3Jtdmg4dnc4aXlpZnJsNm4iKSkKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG1vZHVsZXMgJygoZ3VpeCBidWlsZCB1dGlscykp KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBGaXggdGhlIGNvbmZpZ3VyZSBzY3Jp cHQgdG8gYWxsb3cgcGFzc2luZyB0aGUgCj4gZGVwZW5kZW5jaWVzIGFzCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIDs7IGVudmlyb25tZW50IHZhcmlhYmxlcy4KPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKHNuaXBwZXQKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAj fihiZWdpbgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1 dGUqICJidWlsZGNvbmZpZy9jb25maWdfdW5peC5weSIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJsb2NhbGJhc2UuZCIpICJkIikKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJvcmlnaW5jZGlycyA9IC4qL2luY2x1ZGUu KiIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAib3JpZ2lu Y2RpcnMgPSAKPiBvcy5lbnZpcm9uWydPUklHSU5DRElSUyddLnNwbGl0KFwiOlwiKVxuIikpKSkp KQpDYW4ndCB3ZSBtYWtlIGl0IHNvIHRoYXQgdGhlIG5vcm1hbCBHQ0Mgc2VhcmNoIHBhdGhzIHN1 ZmZpY2U/CkFsc28gbm90ZSB0aGUgdmFsdWUgb2YgZmlsbC1jb2x1bW4gYXQgODAgKG9yIDc5Pyku CgoKQ2hlZXJzCg== From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] Fwd: [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: Sun, 18 Dec 2022 14:16: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: Liliana Marie Prikler Cc: 60153@debbugs.gnu.org Received: via spool by 60153-submit@debbugs.gnu.org id=B60153.167137291623150 (code B ref 60153); Sun, 18 Dec 2022 14:16:01 +0000 Received: (at 60153) by debbugs.gnu.org; 18 Dec 2022 14:15:16 +0000 Received: from localhost ([127.0.0.1]:34173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6uRf-00061K-PX for submit@debbugs.gnu.org; Sun, 18 Dec 2022 09:15:16 -0500 Received: from knopi.disroot.org ([178.21.23.139]:49438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6uRe-00061C-07 for 60153@debbugs.gnu.org; Sun, 18 Dec 2022 09:15:14 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2FBF240526; Sun, 18 Dec 2022 15:15:11 +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 7hhbrgEUO1an; Sun, 18 Dec 2022 15:15:09 +0100 (CET) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671372909; bh=idN3bUu/PTpGlSY/+rLTVEPOh29XTQD9+jkDQ/604Vs=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=Ou16eQrr/QrtPrYrAaeuoFYPFjORpc1A9lO95VSKwNO1fXMbuI7PgUQ3PKG6t8IGa v6t9l19KFvntueoVV/0i6Bb0VrdCcmVEiJG+0f0gJCU92GwO8vtaa9Zc0t0oL1fu2c 6PWd+Vr2rURhLHv0dJ5GXsCIawRv6P7ptAtcfFZz59Sc5sE6CDxUJ4HwnE9l7HJ9sB XZKMrJ+nZu9ortEpFogJ8FHYeC7bMYM4FZDCTn13Gs0mFn5mTRfBVDNg7Evu1VKSEu 1A44Onw9mYFEW83J5RslsjXLIckxIK0iMqVaypYPNJ614VRYSA1CeaR1dg/aLTD4mu fgMJcepQb6Veg== Date: Sun, 18 Dec 2022 22:15:02 +0800 MIME-Version: 1.0 References: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> <93aa8b09-cc29-4030-3c76-458158ea0c0f@disroot.org> Content-Language: en-US From: Adam Faiz In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 12/17/22 18:52, Liliana Marie Prikler wrote: > Am Samstag, dem 17.12.2022 um 18:06 +0800 schrieb Adam Faiz: >> * gnu/packages/game-development.scm (python-pygame): Update to 2.1.2. > Since this is a major bump, did you check whether dependant packages > still build? The dependent packages build without issue. I built the packages listed in `./pre-inst-env guix refresh -l python-pygame`. >> [inputs]: Use the new style. > I'd split the style adjustments into a separate commit. Also note, > that #:phases needs similar treatment w.r.t. using the newer API. Alright, I'll do the style adjustments in a separate patch. Most of what was in the #:phases that would have used the newer API is now unnecessary, so I've removed it. >> [description]: Re-indent. > IMHO that one's noise generated by guix style. I don't think it hurts to change it. >> +              ;; 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")))))) > Can't we make it so that the normal GCC search paths suffice? The normal GCC search paths do work, so I've changed it to use those instead. I'll send the revised patches soon. > Also note the value of fill-column at 80 (or 79?). Is it a problem with how Icedove wraps the email? If so, I'm not sure how to change it. > > > Cheers From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] Fwd: [PATCH] gnu: python-pygame: Update to 2.1.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Dec 2022 15:03: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.167137576024997 (code B ref 60153); Sun, 18 Dec 2022 15:03:01 +0000 Received: (at 60153) by debbugs.gnu.org; 18 Dec 2022 15:02:40 +0000 Received: from localhost ([127.0.0.1]:34368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6vBX-0006V7-Qx for submit@debbugs.gnu.org; Sun, 18 Dec 2022 10:02:40 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:46026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6vBW-0006V1-RJ for 60153@debbugs.gnu.org; Sun, 18 Dec 2022 10:02:39 -0500 Received: by mail-ej1-f66.google.com with SMTP id fc4so16256892ejc.12 for <60153@debbugs.gnu.org>; Sun, 18 Dec 2022 07:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=N4exrR5zxFbCKXhkNGgVWOcbC3XF2kk5t8bXbtdOzY0=; b=F6Rp9TZ3zDgeEWimbBT230USFVETc7rO/c3/dXvFBY66svcRQkTZzEla61Zvlv3xPY Ba0ZznAWGwimPHKkvrl9ChtC8mMHFqWgTaTzPcTHRNz4lmhz1Cfcfv3j63XyT9yL6BTh MzUzujmpbCwYAHln4dmOc0ABIfpYAYv+/MOAK3IrTwo7oHjZ/140c00AzEgstomJM2dM m3WzQYyfBjAGSg7hJ5ZAUYKMO9cNuYwbidGHE6Mz+DwhKDtuVtTOP3xlvOekpjRtBJWS Lxz1FiGmL+CHFv5XAdpP9yCX30sHhExbb1SzLE8ZQqxxI8nyIF/3pyYKNsr4CH70ma8/ Ij/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=N4exrR5zxFbCKXhkNGgVWOcbC3XF2kk5t8bXbtdOzY0=; b=qqrD1gycKa6iBs3VrlJaYv4fCCC3dfJLDNZ6lAXHoqyXZwBe4fzbcNFwPch3JeQKVi AQhYQiBPwlG3VjAV+qIR5APl2ZI8LBW2sDSZZ2/4oYczafReRV/cFsXU4pnjWc4VJYSe d5/jiO3ZFk/Lh52vbCH7Y+HuGce2OhArh9MP/Vt1Egz2ftEYEnfbLfrzhkJ/C3BbxnFp ywsd6ZfC4YB+uLXaBzFwG+A9qj5Irb/2KC3GTu6L9pSj0ZWjjl3GDSqz6j/DWjqAJHTP UUMWA8oR+Dk6Xlj/ZcIB8i3qzu4dCmXSQVV/3yP3INqMlbXUyxkpSCmSUt/mToitKjE0 hkoA== X-Gm-Message-State: ANoB5pm7iPzEFC93Mrz439A9du0LG75FlYaK7IErJ5oH7Hfn4IgzAQLh NwKZn+WH9CrEokk1xwnngQI= X-Google-Smtp-Source: AA0mqf4Bwx4S47k6FXe2d2SyIfG8fIAk7uUb/DjzyVlo+rlzEFaBoGlU3gf37/0FLWV2MEmszQnyEw== X-Received: by 2002:a17:906:9705:b0:7c0:fd1e:972e with SMTP id k5-20020a170906970500b007c0fd1e972emr29771207ejx.46.1671375752776; Sun, 18 Dec 2022 07:02:32 -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 gz20-20020a170906f2d400b0077f324979absm3215973ejb.67.2022.12.18.07.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 07:02:32 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Sun, 18 Dec 2022 16:02:31 +0100 In-Reply-To: References: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> <93aa8b09-cc29-4030-3c76-458158ea0c0f@disroot.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 18.12.2022 um 22:15 +0800 schrieb Adam Faiz: > > > [inputs]: Use the new style. > > I'd split the style adjustments into a separate commit.=C2=A0 Also note= , > > that #:phases needs similar treatment w.r.t. using the newer API. > Alright, I'll do the style adjustments in a separate patch. Most of > what was in the #:phases that would have used the newer API is now=20 > unnecessary, so I've removed it. Nice. > > > [description]: Re-indent. > > IMHO that one's noise generated by guix style. > I don't think it hurts to change it. Fair enough, just saying. > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 ;; Fix the configure script to allow passing the > > > dependencies as > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 ;; environment variables. > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (snippet > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 #~(begin > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (substitute* "buildconfig/config= _unix.py" > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (("localbase.d") "d"= ) > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (("origincdirs =3D .= */include.*") > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "origincdirs = =3D > > > os.environ['ORIGINCDIRS'].split(\":\")\n")))))) > > Can't we make it so that the normal GCC search paths suffice? > The normal GCC search paths do work, so I've changed it to use those=20 > instead. I'll send the revised patches soon. Cool. > > Also note the value of fill-column at 80 (or 79?). > Is it a problem with how Icedove wraps the email? If so, I'm not sure > how to change it. No, it's a code style problem in general, i.e. you shouldn't make the line so long that any mail client will have to wrap it anyway. Since that line definitely exceeded the limit, I wanted you to know. Cheers From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v1 1/3] gnu: python-pygame: Update to 2.1.2. 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: Sun, 18 Dec 2022 15:52: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: 60153@debbugs.gnu.org Received: via spool by 60153-submit@debbugs.gnu.org id=B60153.167137867327483 (code B ref 60153); Sun, 18 Dec 2022 15:52:01 +0000 Received: (at 60153) by debbugs.gnu.org; 18 Dec 2022 15:51:13 +0000 Received: from localhost ([127.0.0.1]:34571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6vwX-00079D-0d for submit@debbugs.gnu.org; Sun, 18 Dec 2022 10:51:13 -0500 Received: from knopi.disroot.org ([178.21.23.139]:54962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6vwV-000796-Di for 60153@debbugs.gnu.org; Sun, 18 Dec 2022 10:51:12 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C53F1407BD for <60153@debbugs.gnu.org>; Sun, 18 Dec 2022 16:51:09 +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 kzhxdgfUCQoz for <60153@debbugs.gnu.org>; Sun, 18 Dec 2022 16:51:08 +0100 (CET) Message-ID: <169f8bfa-c40d-b5bb-ad7e-6517267096b7@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671378668; bh=2FRzpmnqsFZoFnAGOmilVNfcZUl9E5CErvr4DrgAuac=; h=Date:To:From:Subject; b=iat+fGUwQo0HihEAo4e2uWqCP3bZ/GUQD4HHeBmxZdH1AYL6B340q1xpXeUoz31GY vhr7Bok1DZ5Mba3UEOXALywEGWzkQ+fSlnGmJ4ZTFG5XBOaXItpttEzqxxhLG8AP4J uTKq3LJMtn/Sm9eAaSRk4qdzLTr4Vf8LzpboPiWlUbzrBWQtPzly+iLQ5tFmaFf2HN EpCsHncmOeh/WgsF3wQSR6ADP0r7ubBHof/5f/OsvzJNkUfMUUrQqdPw0CssTIsFuS nLfaFxcKZrMaXA5eulaC04Fr/TJWuUMHnHjxAXIMsSd07c30LQPekYuMrd7jtNwzCh Y1hceZ26re20w== Date: Sun, 18 Dec 2022 23:51:04 +0800 MIME-Version: 1.0 Content-Language: en-US From: Adam Faiz Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From 3e89a0d6f4cca4338661625bdf2b701425341507 Mon Sep 17 00:00:00 2001 From: AwesomeAdam54321 Date: Sat, 17 Dec 2022 17:37:21 +0800 Subject: [PATCH v1 1/3] gnu: python-pygame: Update to 2.1.2. * gnu/packages/game-development.scm (python-pygame): Update to 2.1.2. --- gnu/packages/game-development.scm | 98 +++++++++++-------------------- 1 file changed, 35 insertions(+), 63 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 4a0435045b..f9a53799f5 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1194,82 +1194,54 @@ (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))) + (snippet + #~(begin + ;; Fix the configure script to allow passing the dependencies + ;; as environment variables. + (substitute* "buildconfig/config_unix.py" + (("localbase.d") "d") + (("origincdirs = .*/include.*]") + "origincdirs = os.environ['C_INCLUDE_PATH'].split(\":\")") + (("ORIGLIBDIRS") "LIBRARY_PATH") + ;; Fix headers + (("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")))))) (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")) - (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"))))))) + (lambda _ + (setenv "LOCALBASE" " ")))))) + (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) + ("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) -- 2.38.1 From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v1 2/3] gnu: python-pygame: Use gexps and new style inputs. Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Dec 2022 15:55: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: 60153@debbugs.gnu.org Received: via spool by 60153-submit@debbugs.gnu.org id=B60153.167137886927591 (code B ref 60153); Sun, 18 Dec 2022 15:55:01 +0000 Received: (at 60153) by debbugs.gnu.org; 18 Dec 2022 15:54:29 +0000 Received: from localhost ([127.0.0.1]:34588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6vzg-0007Ax-PE for submit@debbugs.gnu.org; Sun, 18 Dec 2022 10:54:29 -0500 Received: from knopi.disroot.org ([178.21.23.139]:40714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6vze-0007Ap-VU for 60153@debbugs.gnu.org; Sun, 18 Dec 2022 10:54:27 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 51C9640A2D for <60153@debbugs.gnu.org>; Sun, 18 Dec 2022 16:54:26 +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 7dSodqN5VsOp for <60153@debbugs.gnu.org>; Sun, 18 Dec 2022 16:54:25 +0100 (CET) Message-ID: <1871bcf2-19a8-1928-0244-710d8fcab224@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671378864; bh=alWkywKO/MuezPRKsnsJiRVR50+/Gz5ZKFMkyZBRH1U=; h=Date:Subject:From:To:References:In-Reply-To; b=ir6SDi87PqNZ7a17EAE0yD2bns70kBzk6yHTt6oCh5vuseIclyUCgPQSV1ijIS6Nz S7SXmpqap7xEIh4FLoWLCAC9l+fdZ6FdpF90w7HRPFQHEripXhNK2pbL6P9jrHsVrg 6zpNa5P2F/frVikOMlDfe4UZfUTuENkNHstt1cEsx5SS6deh1tUZpYVkhn9jrIUbXG WggexiuvdZoC3sgHn34SCgVQTDv71cx+pJgY+kG9qxkfCXfQdK08APZenrfFFSV/Mw iTWUAPxun+ceT9vsqi2BDKEzKsZjQNHy9Lu0qCU9xarwcQbnCnWzfC80QxYdTxf+no Y8g1sT4eZsx8g== Date: Sun, 18 Dec 2022 23:54:22 +0800 MIME-Version: 1.0 Content-Language: en-US From: Adam Faiz References: <169f8bfa-c40d-b5bb-ad7e-6517267096b7@disroot.org> In-Reply-To: <169f8bfa-c40d-b5bb-ad7e-6517267096b7@disroot.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From 76f9b1970a8dfb11108823be8dc0f16b1d0861a7 Mon Sep 17 00:00:00 2001 From: AwesomeAdam54321 Date: Sun, 18 Dec 2022 23:20:27 +0800 Subject: [PATCH v1 2/3] gnu: python-pygame: Use gexps and new style inputs. * gnu/packages/game-development.scm (python-pygame)[arguments]: Use gexps. [inputs]: Use the new style. --- gnu/packages/game-development.scm | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f9a53799f5..a96f62603f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1225,29 +1225,29 @@ (define-public python-pygame (("SDL_mixer.h") "SDL2/SDL_mixer.h")))))) (build-system python-build-system) (arguments - `(#:tests? #f ; tests require pygame to be installed first - #:phases - (modify-phases %standard-phases - ;; Pass the dependencies to the configure script - ;; through environment variables. - (add-before 'build 'set-library-paths - (lambda _ - (setenv "LOCALBASE" " ")))))) + (list #:tests? #f ; tests require pygame to be installed first + #:phases + #~(modify-phases %standard-phases + ;; Pass the dependencies to the configure script + ;; through environment variables. + (add-before 'build 'set-library-paths + (lambda _ + (setenv "LOCALBASE" " ")))))) (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. -- 2.38.1 From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v1 3/3] gnu: python-pygame: Fix description. Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Dec 2022 15:58: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: 60153@debbugs.gnu.org Received: via spool by 60153-submit@debbugs.gnu.org id=B60153.167137903527735 (code B ref 60153); Sun, 18 Dec 2022 15:58:01 +0000 Received: (at 60153) by debbugs.gnu.org; 18 Dec 2022 15:57:15 +0000 Received: from localhost ([127.0.0.1]:34609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6w2N-0007DH-I6 for submit@debbugs.gnu.org; Sun, 18 Dec 2022 10:57:15 -0500 Received: from knopi.disroot.org ([178.21.23.139]:48318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6w2M-0007DB-Df for 60153@debbugs.gnu.org; Sun, 18 Dec 2022 10:57:14 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BD13340952 for <60153@debbugs.gnu.org>; Sun, 18 Dec 2022 16:57:13 +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 KjAg843Ey3Kc for <60153@debbugs.gnu.org>; Sun, 18 Dec 2022 16:57:12 +0100 (CET) Message-ID: <2073a5f5-9e89-49ad-7ab2-5bab39a61f5a@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671379032; bh=RH+BVprvd8tSXyksLkEIkn/fZcN/tYDdUOXwSCZdIhs=; h=Date:Subject:From:To:References:In-Reply-To; b=N18IpB8Ke6+YmKAiWuIEqllLqDkDRNfDY5OueEG3jh/Zq83x79sfjvXjb+U7DUGIz Mfnn4igjMba5FW5DzEyhhq+puUdY5gnn8CjMmkBYG5UtCMoSJY6TSOALeFWE2IQYe0 uPpEK06kCQvrRMB+77WmsGpaRv1vGQU9DJ9D/Jhn/7FWM3XeIJTW38E9TXCxRFOFK3 m/mKGhSg6YzP4syD23qPntZAspnpWg+f12d+QTBQbaXGXJZuJuEP4UoBgI1kIsowQ9 evYjqfyAm0pdNWYRXzrWxx6toDqlqBSJv61Z1Ndw6j9XG0L6ap7t1E4VJ4iNFUwNZP s1vq7gerN5vFA== Date: Sun, 18 Dec 2022 23:57:08 +0800 MIME-Version: 1.0 Content-Language: en-US From: Adam Faiz References: <169f8bfa-c40d-b5bb-ad7e-6517267096b7@disroot.org> <1871bcf2-19a8-1928-0244-710d8fcab224@disroot.org> In-Reply-To: <1871bcf2-19a8-1928-0244-710d8fcab224@disroot.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From c9a3aa24f836b1f0813fd5fd81420c1d00d35c29 Mon Sep 17 00:00:00 2001 From: AwesomeAdam54321 Date: Sun, 18 Dec 2022 23:34:43 +0800 Subject: [PATCH v1 3/3] gnu: python-pygame: Fix description. * gnu/packages/game-development.scm (python-pygame)[description]: Fix the whitespace. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a96f62603f..a99d7ca586 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1251,7 +1251,7 @@ (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 + 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 -- 2.38.1 From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v2 0/3] Update python-pygame to 2.1.2. 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: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.16718238223660 (code B ref 60153); Fri, 23 Dec 2022 19:31:01 +0000 Received: (at 60153) by debbugs.gnu.org; 23 Dec 2022 19:30:22 +0000 Received: from localhost ([127.0.0.1]:38448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8nkK-0000wm-JK for submit@debbugs.gnu.org; Fri, 23 Dec 2022 14:30:21 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:36738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8nkJ-0000wW-CL for 60153@debbugs.gnu.org; Fri, 23 Dec 2022 14:30:19 -0500 Received: by mail-ej1-f66.google.com with SMTP id qk9so13954891ejc.3 for <60153@debbugs.gnu.org>; Fri, 23 Dec 2022 11:30:19 -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=7ArHufakYv2jYuPinFr8Ez1ZuQ7Hhsdd4oqhSE9vB3o=; b=nXEnEQ5l/tfq0ueCPr1S/8MqNI2vEldxf4vdHmvV+RC/R6XkMyBO85HsrzDohZi1jN 9fQHamoKMd3L/s/oxJrgVpJsg1ZZHIyt+sLuQOBCxcQBcLtQi74UAR8Es0eg3AIx+Yhf 4rSl/ijt8+1xLdYyarjviTPBxOON8XBqEZhhQj+wuxWx3k6vMQAyATUphE2l1V4P7V75 ibz4cis/ydtwHxQ31tpKMv+RrPjGhHa6Nvd99R9M720rVWiwRZxg50iZcbPHEUJITOTJ q4h2C4uY/o77LHUc47nWYf7POB+In8Rs9Oeyv2IymQbIaSkXK1/VVL65T1qTxyW9aRTH 6o5A== 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=7ArHufakYv2jYuPinFr8Ez1ZuQ7Hhsdd4oqhSE9vB3o=; b=KBOwLbMd9sQveRaZSp74ruSFu47aWlfWLvhlayKDkIwawgwMcy6ks/AJjPgb71EbHY /Iehwl2p19qqrhv+lDm2PaXTxvOFSSXMmBqASV7N06oOzjEM+BQx4M1OONCbgtt0sWyJ Ppvv3fLOt+KSL+6PJNKb9m1MS+IB1aUhnKMrkiD3PZI/vw2bPImwLrazTMqj0VoZRXMT D+cqVSWUgLxytN80Cgbv59YZEkmoZas/cYeLPLcV8z4+rqARx8uNdoLaNZTbG0AHzsKP 3ypH4ZsmUzUFkZA0K46yEPqM2kCvWTAXlyLiUz60DoPtEpk1j0O4PTzt+E1x2unZBOB6 20eg== X-Gm-Message-State: AFqh2kpfZNXDl8PQ1/4toUOI37mvWMPldQ35zARld13aZ2mh3TAixVjw gGe2biVjSh5njHA/fJZboa8= X-Google-Smtp-Source: AMrXdXv4oWk6EZXaNQtKopxeTZGcrq/JSvBYn2WvBuCD5GaJeljOkt4iIZOXSTIWgFW+s4XbDld2GQ== X-Received: by 2002:a17:906:9f0a:b0:7c0:e302:b523 with SMTP id fy10-20020a1709069f0a00b007c0e302b523mr10339016ejc.59.1671823813494; Fri, 23 Dec 2022 11:30:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Dec 2022 11:30:13 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 22 Dec 2022 22:09:48 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: <53f166d39fab514f30a67ad24b40633aae9bb43f.camel@gmail.com> X-Spam-Score: 0.8 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) Hi Adam and everyone else reading. For the sake of transparency, this is the series I plan on pushing on December 31st to close this bug. Obviously, I'll add proper sign-offs before doing so ;) Cheers Adam Faiz (2): gnu: python-pygame: Update to 2.1.2. gnu: python-pygame: Use G-Expressions and new-style inputs. Liliana Marie Prikler (1): gnu: python-pygame: Reword description. gnu/packages/game-development.scm | 120 +++++++++++------------------- 1 file changed, 44 insertions(+), 76 deletions(-) -- 2.38.1 From unknown Sun Jul 27 00:54:40 2025 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-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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. -- 2.38.1 From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v2 1/3] gnu: python-pygame: Update to 2.1.2. 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.16718238263682 (code B ref 60153); Fri, 23 Dec 2022 19:31:02 +0000 Received: (at 60153) by debbugs.gnu.org; 23 Dec 2022 19:30:26 +0000 Received: from localhost ([127.0.0.1]:38453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8nkP-0000xE-C2 for submit@debbugs.gnu.org; Fri, 23 Dec 2022 14:30:25 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:46753) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8nkK-0000wb-5F for 60153@debbugs.gnu.org; Fri, 23 Dec 2022 14:30:21 -0500 Received: by mail-ed1-f67.google.com with SMTP id c17so8216147edj.13 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=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=Cj8ZnJSRVZ2crPot6t5FAI1AINanR+yaJhHiPoZpeSA=; b=TLqCKXF2qC1i8x7Cav2a9NlmVAeWIk5N/6pf091EKbjX5W5BZNBiW0F9i8E3KkWegz e2fNs9FYeNtSAvoksJNc4/hiqa842QK5prHSbLGoDu3T5+hf+/N4gp/V3X5yBQS/zrfS o2emwRAItmF3oCFkod0ihSidbPofKgDjcwXvA0wqjzLSJl8LHqHL6vC+BwdVrdWWoQ0J XvCNWUnTJMNLiJ8G1kliAisvALUF553Bn59be7IuJpxLdyhCsnV2XoEOrPBiaJ+uEchX fS7TKuBZuPZj99SIq4ytr8IvUFrKBpglyzxzy2dsQveJ6s24C71acIFcXDifNfFZtPnF m4zA== 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=Cj8ZnJSRVZ2crPot6t5FAI1AINanR+yaJhHiPoZpeSA=; b=6cHEF7P6OuPlfUQaTmLKTVyslAg4K9xOUyRM0bxT5xUD2zQRr31igF0zDzrub9wBrR S56IywOSvHu/yWZKkeiKNauFGwfZJnOGJ3gh3bCIqLLn14+ctvJSxic4cvGpaTuHvC76 Q6gdoNM9vbsWubOO0YLyridnewcGQPtCChQm34UAUrZBtzUAknEOQwfeJvkC97lmnYYG 9FVGQ+ZB3i/nPMAp2r9Etgkno+RcWTDaP1dtm8BFYX1lbsO2a7CTHqREsOoK7TfD0Sy8 L5PoL4pU9ERB3z0xXIbZeZp9u1fFPYxaVJJCVfKtiURkzUzQTIsobFPmYWD5cPrUt2sj vCFw== X-Gm-Message-State: AFqh2krCGLjjbG1NX0aJVeUKz54sens97gWFU2sJLEiW4TQjoSCVSIDs lKhpJqZJFQHcVYI186i9tEg= X-Google-Smtp-Source: AMrXdXvgnTyVfhcoT4TRysWivbnPuoV7IoggeNp0vPJLAe71Yvqh0sbFeO+wGTTFQp/looAxwQfK2g== X-Received: by 2002:a05:6402:4150:b0:47e:1b4a:5491 with SMTP id x16-20020a056402415000b0047e1b4a5491mr9382204eda.20.1671823814248; 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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Dec 2022 11:30:13 -0800 (PST) From: Adam Faiz X-Google-Original-From: Adam Faiz Date: Sun, 18 Dec 2022 23:51:04 +0800 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org> X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/game-development.scm (python-pygame): Update to 2.1.2. [arguments]<#:phases>: Add =?UTF-8?Q?=E2=80=98fix-build-config=E2=80=99?= and =?UTF-8?Q?=E2=80=98fix-sdl2-headers=E2=80=99.?= [inputs]: Remove =?UTF-8?Q?=E2=80=9Csdl=E2=80=9D,_?= =?UTF-8?Q?=E2=80=9Csdl-image=E2=80=9D,_?= =?UTF-8?Q?=E2=80=9Csdl-?= [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.67 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.67 listed in wl.mailspike.net] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/game-development.scm (python-pygame): Update to 2.1.2. [arguments]<#:phases>: Add =?UTF-8?Q?=E2=80=98fix-build-config=E2=80=99?= and =?UTF-8?Q?=E2=80=98fix-sdl2-headers=E2=80=99.?= [inputs]: Remove =?UTF-8?Q?=E2=80=9Csdl=E2=80=9D,_?= =?UTF-8?Q?=E2=80=9Csdl-image=E2=80=9D,_?= =?UTF-8?Q?=E2=80=9Csdl-?= [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.67 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/game-development.scm (python-pygame): Update to 2.1.2. [arguments]<#:phases>: Add ‘fix-build-config’ and ‘fix-sdl2-headers’. [inputs]: Remove “sdl”, “sdl-image”, “sdl-mixer”, “sdl-ttf”, and “sdl-gfx”. Add “sdl2”, “sdl2-image”, “sdl2-mixer”, “sdl2-ttf”, and “sdl2-gfx”. --- gnu/packages/game-development.scm | 95 ++++++++++--------------------- 1 file changed, 31 insertions(+), 64 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 8fec474d0b..07b2c6f3fe 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1194,82 +1194,49 @@ (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")))) (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. - (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")) - (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"))))))) + (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) - ("sdl" ,sdl) - ("sdl-image" ,sdl-image) - ("sdl-mixer" ,sdl-mixer) - ("sdl-ttf" ,sdl-ttf) - ("sdl-gfx" ,sdl-gfx) + ("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) -- 2.38.1 From unknown Sun Jul 27 00:54:40 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: <76223dfff555ef0c545e994eb2eb808423a333d4.camel@gmail.com> X-Spam-Score: 0.8 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) * 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 -- 2.38.1 From unknown Sun Jul 27 00:54:40 2025 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 From: Adam Faiz In-Reply-To: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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. From unknown Sun Jul 27 00:54:40 2025 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:44: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.167183899513265 (code B ref 60153); Fri, 23 Dec 2022 23:44:02 +0000 Received: (at 60153) by debbugs.gnu.org; 23 Dec 2022 23:43:15 +0000 Received: from localhost ([127.0.0.1]:39497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8rh5-0003Rs-2W for submit@debbugs.gnu.org; Fri, 23 Dec 2022 18:43:15 -0500 Received: from knopi.disroot.org ([178.21.23.139]:56810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8rh3-0003Rm-A9 for 60153@debbugs.gnu.org; Fri, 23 Dec 2022 18:43:14 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4817540DDE; Sat, 24 Dec 2022 00:43:11 +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 llFMdo7fTmgV; Sat, 24 Dec 2022 00:43:10 +0100 (CET) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671838990; bh=jU6ZOn0yTU3CU4CJKRakh6IwXzk7GT10gwX6BisfMwg=; h=Date:Subject:From:To:Cc:References:In-Reply-To; b=Mu60V0Jw1xYC8E4TkF8eOx6e8Jm7fNW8j2jz/Mfs0c2VVCM9R2WUf2pZo+NQrYVC1 M36g+JoN6LFOlRGY1TzVkpl6a78D2wHFTaH8B7sXUtsJjSxk2HgOJ8e4GljrxQG8YJ NmvMJNbVLeoeEkxR2ce9khaxnQ/pGGqmNoggi+B8H5i+zCVh4TSQWji/3TXQScOe6v OSc6GfehcFUEyyEfnjkkxeQGFc0rIHaJhbkTTvC8vDRCJrhrjHCdyce99cDJNpWR0Q 4Cd03rmBsEuEYC8r6Cw3CRD4bDLGPMq0tMqUKmcDPBiEGuNWJAByDFtlIRHZkUOH0L McA7QxBnfTWLg== Date: Sat, 24 Dec 2022 07:43:06 +0800 MIME-Version: 1.0 Content-Language: en-US From: Adam Faiz References: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org> <61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org> In-Reply-To: <61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 12/24/22 07:20, Adam Faiz wrote: > + (("incdirs = \\[\\]") "incdirs = origincdirs") > + (("libdirs = \\[\\]") "libdirs = origlibdirs")))) I didn't do this kind of thing, because I didn't want to hardcode these. Most systems that pygame supports want to stay with the defaults. > (substitute* "buildconfig/config_unix.py" > (("localbase.d") "d" > #~(modify-phases %standard-phases > ;; Pass the dependencies to the configure script > ;; through environment variables. > (add-before 'build 'set-library-paths > (lambda _ > (setenv "LOCALBASE" " ")))))) I added this so that Guix as well as other systems can choose to pass the dependencies at the precise locations, otherwise it uses the defaults and doesn't affect those that use the defaults. I hope this clarifies my understanding of this issue. I like that Guix can provide patched and sometimes enhanced package sources while Guix-specific things stay in the build phases. From unknown Sun Jul 27 00:54:40 2025 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:56: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.167183970914140 (code B ref 60153); Fri, 23 Dec 2022 23:56:02 +0000 Received: (at 60153) by debbugs.gnu.org; 23 Dec 2022 23:55:09 +0000 Received: from localhost ([127.0.0.1]:39555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8rsa-0003g0-Uo for submit@debbugs.gnu.org; Fri, 23 Dec 2022 18:55:09 -0500 Received: from knopi.disroot.org ([178.21.23.139]:37464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8rsY-0003fs-S1 for 60153@debbugs.gnu.org; Fri, 23 Dec 2022 18:55:07 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0536240837; Sat, 24 Dec 2022 00:55:05 +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 aaZON-ITMv2Z; Sat, 24 Dec 2022 00:55:03 +0100 (CET) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671839703; bh=rYb72wjs2qukRDspCXFjEj3/irOhBiiCt7Whi37slr4=; h=Date:Subject:From:To:Cc:References:In-Reply-To; b=HC7+GqAiJ+rDwP0Z9UvCscUQmwlR+lTXNpeFffaHiZYGXtf2CfwM4gsYZ/vMTg5LM pNiaV/X0HCHLZNf7gX/kjTJQEDQVS5jhsidxKM+h3af7HB3mCq0b6mejn2KH55Yk70 9FtGUcsnvQQjP9QI2IyyTbeg01BQi/CwEpRzY5Qp1HYZQ/FH6df3s+j/BcpB3UE7Hq yNFDX0NvATVpHl4dUhGYc1sEn+9nmjsmsyoAZKdwRdcW1dIyjHuhvRV3njx1dDNdm7 jFiXADTBkhWN/Qtj7X5Wvsk7U/u2jVdwE6utTck5I+pVO8IGKGzxoUamJlUq/eykjU 33kXwXWOKc7Cg== Date: Sat, 24 Dec 2022 07:54:55 +0800 MIME-Version: 1.0 Content-Language: en-US From: Adam Faiz References: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org> <61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 12/24/22 07:43, Adam Faiz wrote: >>                    (substitute* "buildconfig/config_unix.py" >>                      (("localbase.d") "d" >>            #~(modify-phases %standard-phases >>              ;; Pass the dependencies to the configure script >>              ;; through environment variables. >>              (add-before 'build 'set-library-paths >>                (lambda _ >>                  (setenv "LOCALBASE" " ")))))) > I added this so that Guix as well as other systems can choose to pass > the dependencies at the precise locations, otherwise it uses the > defaults and doesn't affect those that use the defaults. This part is actually flawed, what was done as part of 'fix-build-config is better. My mistake. From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v2 1/3] gnu: python-pygame: Update to 2.1.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Dec 2022 05:40: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.167186040027608 (code B ref 60153); Sat, 24 Dec 2022 05:40:02 +0000 Received: (at 60153) by debbugs.gnu.org; 24 Dec 2022 05:40:00 +0000 Received: from localhost ([127.0.0.1]:40900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8xGJ-0007BE-V9 for submit@debbugs.gnu.org; Sat, 24 Dec 2022 00:40:00 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:46635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8xGI-0007B8-8z for 60153@debbugs.gnu.org; Sat, 24 Dec 2022 00:39:58 -0500 Received: by mail-wm1-f68.google.com with SMTP id f13-20020a1cc90d000000b003d08c4cf679so4745899wmb.5 for <60153@debbugs.gnu.org>; Fri, 23 Dec 2022 21:39:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=f/pXtc5uLmgfYIiI4PAvqpSAGanXUm0fYOwMef7i1FY=; b=H+kEqUm//qt+mXMRJNVT2kg/ohcjDoUuvJRxf/MROVHihaWtm5ZOMIeCo7oDzO9wnC ghgjRye3nFYNVCpb9AdTRxplA0yX1oM+zvHcDJzcjVVM1mfbM8rFmL/ZHgAqIUbdLERr /LuEQTIo8Jtr4QBH/vnuB5t+wx00t+v9ak57hi8/Wbek/NRsDcv6JpEvJZzbuMGYaeBQ dqrUory6yzViCS+X0Ofzu2zTXkuu1QlFQTMBGMy9h9sxQw6wRgm0ETKkcNvSOVDe25QL k852iD1AqJagPKohFjWBPXdx8AMhyt5895+g8YTlJtUVtIz3opRhFB/K3qhN7g6YYo3p pnIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=f/pXtc5uLmgfYIiI4PAvqpSAGanXUm0fYOwMef7i1FY=; b=o8mJ+ULkrfSeB91ujVqKX8FZ9JRvYKwAdInjaifouQxZBqUEwwA1NCEpOLWrKELpm8 YcqkEAVmPmCZNeQ5DXNr5hAZI4X/ZYV8YlNeRL3BIeTVWgeVMm/yXAx0ZkqtF/n537mN 5K/EP4hOJg0/iTSEDCcvj7ibBJom+ISLrxjw22WZGl322r+jE5D55edSuWBjEGfSmKA9 U7yuM1hwDsDW/PE0uvGwxQ41+cuxrMOfHWRmyMXXS0vPH1jA70DGsacnecGGUP6GDb7S hpXzLAi6Atj+poyHbpRUk4uugqeAcml9O6IPjMX4JZaZaUK2A8Qxb69LNT/aY/JMGOdl nePg== X-Gm-Message-State: AFqh2kowEcAH3+q8wAKnUFjDGsu2C7aEky6H2IWTAwHGE95wVned9iWB NuSUwlN8j+8quYMrs002D84= X-Google-Smtp-Source: AMrXdXvwf7eOh0UGbQrcDkJbCeUA/VVyGr1e0r/TZ/C16icl4hY+p82tQ3gkWor5ADDzGVNe61qkLw== X-Received: by 2002:a05:600c:687:b0:3cf:e7c8:494 with SMTP id a7-20020a05600c068700b003cfe7c80494mr8678018wmn.29.1671860392291; Fri, 23 Dec 2022 21:39:52 -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 u13-20020a05600c19cd00b003d1d5a83b2esm11975408wmq.35.2022.12.23.21.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Dec 2022 21:39:51 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Sat, 24 Dec 2022 06:39:50 +0100 In-Reply-To: <61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org> References: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org> <61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gU2Ftc3RhZywgZGVtIDI0LjEyLjIwMjIgdW0gMDc6MjAgKzA4MDAgc2NocmllYiBBZGFtIEZh aXo6Cj4gT24gMTIvMTgvMjIgMjM6NTEsIEFkYW0gRmFpeiB3cm90ZToKPiA+ICvCoMKgwqDCoMKg wqDCoMKgIChhZGQtYWZ0ZXIgJ3VucGFjayAnZml4LWJ1aWxkLWNvbmZpZwo+ID4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgIChsYW1iZGEgXwo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vi c3RpdHV0ZSogImJ1aWxkY29uZmlnL2NvbmZpZ191bml4LnB5Igo+ID4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKCgib3JpZ2luY2RpcnMgPSBcXFsuKlxcXSIpCj4gPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICJvcmlnaW5jZGlycyA9Cj4gPiBvcy5lbnZpcm9uWydDX0lO Q0xVREVfUEFUSCddLnNwbGl0KFwiOlwiKSIpCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoKCJPUklHTElCRElSUyIpICJMSUJSQVJZX1BBVEgiKQo+ID4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKCgiaW5jZGlycyA9IFxcW1xcXSIpICJpbmNkaXJzID0gb3JpZ2luY2Rp cnMiKQo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgibGliZGlycyA9IFxcW1xc XSIpICJsaWJkaXJzID0gb3JpZ2xpYmRpcnMiKSkpKQo+ID4gK8KgwqDCoMKgwqDCoMKgwqAgKGFk ZC1hZnRlciAndW5wYWNrICdmaXgtc2RsMi1oZWFkZXJzCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKg wqAgKGxhbWJkYSBfCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRlKiAi YnVpbGRjb25maWcvY29uZmlnX3VuaXgucHkiCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoKCJTRExfdHRmLmgiKSAiU0RMMi9TRExfdHRmLmgiKQo+ID4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKCgiU0RMX2ltYWdlLmgiKSAiU0RMMi9TRExfaW1hZ2UuaCIpCj4gPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJTRExfbWl4ZXIuaCIpICJTREwyL1NETF9t aXhlci5oIikpCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRlKiAic3Jj X2MvaW1hZ2VleHQuYyIKPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoIlNETF9p bWFnZS5oIikgIlNETDIvU0RMX2ltYWdlLmgiKSkKPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKHN1YnN0aXR1dGUqICJzcmNfYy9mb250LmgiCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoKCJTRExfdHRmLmgiKSAiU0RMMi9TRExfdHRmLmgiKSkKPiA+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUqICJzcmNfYy9taXhlci5oIgo+ID4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiU0RMX21peGVyLmgiKSAiU0RMMi9TRExfbWl4ZXIuaCIp KQo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0ZSogInNyY19jL19zZGwy L21peGVyLmMiCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJTRExfbWl4ZXIu aCIpICJTREwyL1NETF9taXhlci5oIikpKSkpKSkKPiBJIGRvbid0IHNlZSB3aHkgdGhlc2Ugc2hv dWxkIGdvIGluIHBoYXNlcywgd2hlbiBJIHRoaW5rIGdvaW5nIGluIGEgCj4gc25pcHBldCB3b3Vs ZCBiZSBiZXR0ZXIuIEZyb20gIlNuaXBwZXRzIGFuZCBQaGFzZXMiIGluIHRoZSBHdWl4Cj4gbWFu dWFsOgo+IAo+ID4gVGhlIHNvdXJjZSBkZXJpdmVkIGZyb20gYW4gb3JpZ2luIHNob3VsZCBwcm9k dWNlIGEgc291cmNlIHRoYXQgY2FuCj4gPiBiZSB1c2VkIHRvIGJ1aWxkIHRoZSBwYWNrYWdlIG9u IGFueSBzeXN0ZW0gdGhhdCB0aGUgdXBzdHJlYW0KPiA+IHBhY2thZ2Ugc3VwcG9ydHMgKGkuZS4s IGFjdCBhcyB0aGUgY29ycmVzcG9uZGluZyBzb3VyY2UpLsKgIEluCj4gPiBwYXJ0aWN1bGFyLCBv cmlnaW4gc25pcHBldHMgbXVzdCBub3QgZW1iZWQgc3RvcmUgaXRlbXMgaW4gdGhlCj4gPiBzb3Vy Y2VzOyBzdWNoIHBhdGNoaW5nIHNob3VsZCByYXRoZXIgYmUgZG9uZSB1c2luZyBidWlsZCBwaGFz ZXMuCj4gVGhlICdmaXgtYnVpbGQtY29uZmlnIGlzIHdoYXQgSSBjb25zaWRlciB0byBiZSBhIHNl cmlvdXMgYnVnZml4LCBpdCAKPiBkb2Vzbid0IG1hdHRlciB0aGF0IGl0IHdhcyBvcmlnaW5hbGx5 IGZpeGVkIGFzIHBhcnQgb2YgZ3VpeAo+IHBhY2thZ2luZy4KVGhhdCBwYXJ0IG9mIHRoZSBtYW51 YWwgaXMgc2FkbHkgaW4gbmVlZCBvZiBhIHNlcmlvdXMgb3ZlcmhhdWwgKHNlZSBbMV0KZm9yIGEg bW9yZSBleHRlbmRlZCBkaXNjdXNzaW9uKS4gIEluIGFueSBjYXNlLCBwYXRjaGluZyB0aGUgc291 cmNlIHNvCnRoYXQgaXQgZmluZHMgY2VydGFpbiBoZWFkZXJzIG9yIGxpYnJhcmllcyBpcyB0eXBp Y2FsbHkgYSAjOnBoYXNlcwp0aGluZywgbm90IGEgc25pcHBldCBvbmUuICBUaGUgbW92ZSB0byAj OnBoYXNlcyByZWZsZWN0cyB0aGF0LiAgCgpDaGVlcnMKClsxXSBodHRwczovL2lzc3Vlcy5ndWl4 LmdudS5vcmcvNTc1OTgKCg== From unknown Sun Jul 27 00:54:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60153] [PATCH v2 1/3] gnu: python-pygame: Update to 2.1.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Dec 2022 05:52: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.16718610764646 (code B ref 60153); Sat, 24 Dec 2022 05:52:02 +0000 Received: (at 60153) by debbugs.gnu.org; 24 Dec 2022 05:51:16 +0000 Received: from localhost ([127.0.0.1]:40952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8xRE-0001Cs-E2 for submit@debbugs.gnu.org; Sat, 24 Dec 2022 00:51:16 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:35670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8xRC-0001Ck-OE for 60153@debbugs.gnu.org; Sat, 24 Dec 2022 00:51:15 -0500 Received: by mail-wr1-f65.google.com with SMTP id y16so6209347wrm.2 for <60153@debbugs.gnu.org>; Fri, 23 Dec 2022 21:51:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=pXliw+hlW3uX6Ww4RSv5iK0mLtnRb0+MEgNts/xw6BM=; b=XusOXdz+M7z1e7kHTY/qdAsIePAlLIJ4HC17ehvlIieaAcWgV5Q1euEyCor67Wi5OD 3GY0HQHWEsDzV/cJi3zz2TmgZSTp/De0AqVkKyPKwdYgFmMah50e6y7bueMas5q2Mgqv Dv48nlZleVunDsGsSYqOtryzF3OxNfJ1kuVmUIkO3Bh4nliiPuAFVBa59LkLd7e4+QGV dfFdTtBkLpotR1T+DQhUtebXPWFNBMgeUYZc443vUTbqVTMBmabvJ7rs9z534qeLscQe f2lTntgOzVyccwk8HRBPggYoxR2JuRyoMphOaFPX3tqr14C3X9x/0THB0g7K9MbQVZKc MXaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pXliw+hlW3uX6Ww4RSv5iK0mLtnRb0+MEgNts/xw6BM=; b=MxxvcRZY8MqdobpMYfsGwBNY7jh9G36bmKYx+NklwvL4tT7jk0uUvSjMRZKdBUpraf 5fAMhPRkzjyvxbWNy6KQYZBGKEjHPiZzBRE2F1RZnd+7EYE20zeXCtvme8u4cf8ViXbz FLJnl23Kt1n/P2rxXgLE3QjgXTxdZwfqBJrXMYJ+2+PkXJK2OmjUFU1NTmSfMq4SrKJI AnKprakXICQMGQjzyBsW4bEsAY0ihE0rnIstudSLat+hna4eFjErUAzGpFUh2D9tyCLH ZdaHKc4/GanGviZzqZscSg72PcL4Br71ilbQSjEhXTabD/WSEUpb0RH9CfBFBHgaWfRW 7WrQ== X-Gm-Message-State: AFqh2kpVRySYy2rsOTfUssTHTjCv1eWnN65n2WR/fEdWHo+EVUOcyr5e tNBPo8bL9usXkCXjR6B3F4o= X-Google-Smtp-Source: AMrXdXu/rTe3ekGxEFlc1QMQly0VvcxtyYYBNk34gZCGyA5T5vEsSM3OfUHFYr/DQCDzoBxda2Ndow== X-Received: by 2002:adf:f789:0:b0:242:509a:ad4a with SMTP id q9-20020adff789000000b00242509aad4amr7612936wrp.7.1671861068775; Fri, 23 Dec 2022 21:51:08 -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 k17-20020a5d4291000000b002415dd45320sm4577454wrq.112.2022.12.23.21.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Dec 2022 21:51:08 -0800 (PST) Message-ID: <52d8cb8ba9792d712964f5c6d0a75d4d0d86e250.camel@gmail.com> From: Liliana Marie Prikler Date: Sat, 24 Dec 2022 06:51:07 +0100 In-Reply-To: References: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org> <61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 24.12.2022 um 07:43 +0800 schrieb Adam Faiz: > On 12/24/22 07:20, Adam Faiz wrote: > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (("incdirs =3D \\[\\]") "incdirs =3D origincdirs") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (("libdirs =3D \\[\\]") "libdirs =3D origlibdirs"))))=20 > I didn't do this kind of thing, because I didn't want to hardcode > these.=20 > Most systems that pygame supports want to stay with the defaults. Here, "using the defaults" equates to having both origincdirs and origlibdirs being empty, i.e. expanded from non-existing or empty environment variables, right? In that case, the build config will still add the default /usr stuff =E2=80=93 it just won't start out empty. I feel as though we could do without this patch by supplying PYGAME_EXTRA_BASE as a configure flag. Wouldn't that be better than patching? Cheers From unknown Sun Jul 27 00:54:40 2025 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: Sat, 24 Dec 2022 13:20: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: Liliana Marie Prikler Cc: 60153@debbugs.gnu.org Received: via spool by 60153-submit@debbugs.gnu.org id=B60153.16718879834230 (code B ref 60153); Sat, 24 Dec 2022 13:20:02 +0000 Received: (at 60153) by debbugs.gnu.org; 24 Dec 2022 13:19:43 +0000 Received: from localhost ([127.0.0.1]:42944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p94RC-00016A-OE for submit@debbugs.gnu.org; Sat, 24 Dec 2022 08:19:42 -0500 Received: from knopi.disroot.org ([178.21.23.139]:41330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p94RA-000164-Hg for 60153@debbugs.gnu.org; Sat, 24 Dec 2022 08:19:41 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 20C2B403BC; Sat, 24 Dec 2022 14:19:39 +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 iNlX3js3YESO; Sat, 24 Dec 2022 14:19:38 +0100 (CET) Message-ID: <00a7606b-9247-c118-8196-2216bc5444b9@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671887978; bh=MEqQfteOxNWrkyh5GQWejV4JYx0GhWY1VA6uPsfYQwc=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=guiRz3J0j1qUU1BvThgUuw7Le+TdGTuukMtcBBsUsyX+J4LVK5ONhijsJbLKW90ma HJ8nSAIZWIkrNPlULjlsG6Q3DaBVftmNVb2Gy0aaavLtODIjZMMbDaVwSFvyU/RZWU nSuosSfuKq1D6hkblf8tf5NFVJRYI5C9BfwAErg8HxiPUdjoJnnGy73rWGlfgI4Rwl SVpIdVvI5JlSLfcu5X72K/FPZKmguuf7lzl8S2tBeJ1fNOTysO0VfC6zZsU2UKATcK qu7jwzjjp/bkysnHPS+BbntdT4r1MtkXkISvxAWUW7cWIzMqjQwh0C3qQoTVxaoBJ7 1PiIpKzL4VO2A== Date: Sat, 24 Dec 2022 21:19:34 +0800 MIME-Version: 1.0 References: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org> <61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org> <52d8cb8ba9792d712964f5c6d0a75d4d0d86e250.camel@gmail.com> Content-Language: en-US From: Adam Faiz In-Reply-To: <52d8cb8ba9792d712964f5c6d0a75d4d0d86e250.camel@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 12/24/22 13:51, Liliana Marie Prikler wrote: > Am Samstag, dem 24.12.2022 um 07:43 +0800 schrieb Adam Faiz: >> On 12/24/22 07:20, Adam Faiz wrote: >>> +               (("incdirs = \\[\\]") "incdirs = origincdirs") >>> +               (("libdirs = \\[\\]") "libdirs = origlibdirs")))) >> I didn't do this kind of thing, because I didn't want to hardcode >> these. >> Most systems that pygame supports want to stay with the defaults. > Here, "using the defaults" equates to having both origincdirs and > origlibdirs being empty, i.e. expanded from non-existing or empty > environment variables, right? In that case, the build config will > still add the default /usr stuff – it just won't start out empty. Yes, I hadn't considered that when sending the patch. > I feel as though we could do without this patch by supplying > PYGAME_EXTRA_BASE as a configure flag. Wouldn't that be better than > patching? Indeed, it's better than patching and should be done if it works for you. I feel it's suboptimal though because the include path doesn't deserve to be called "extra". > Cheers From unknown Sun Jul 27 00:54:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Adam Faiz Subject: bug#60153: closed (Re: [PATCH v2 0/3] Update python-pygame to 2.1.2.) Message-ID: References: <2cda4ce97c6cbd4e0551e2690d7a6c13d6f3ee44.camel@gmail.com> <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org> X-Gnu-PR-Message: they-closed 60153 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 60153@debbugs.gnu.org Date: Sat, 31 Dec 2022 07:35:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1672472102-10766-1" This is a multi-part message in MIME format... ------------=_1672472102-10766-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #60153: [PATCH] gnu: python-pygame: Update to 2.1.2. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 60153@debbugs.gnu.org. --=20 60153: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D60153 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1672472102-10766-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 60153-done) by debbugs.gnu.org; 31 Dec 2022 07:34:24 +0000 Received: from localhost ([127.0.0.1]:36475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBWNs-0002mb-Kq for submit@debbugs.gnu.org; Sat, 31 Dec 2022 02:34:24 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:46758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBWNr-0002mL-Ad for 60153-done@debbugs.gnu.org; Sat, 31 Dec 2022 02:34:23 -0500 Received: by mail-wm1-f68.google.com with SMTP id m26-20020a05600c3b1a00b003d9811fcaafso10287963wms.5 for <60153-done@debbugs.gnu.org>; Fri, 30 Dec 2022 23:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=lUDXelo1No4OYKu3N9LpPFyMEEcIEpXkkk93NPUD3M8=; b=oDO65ueRs0VXrLR8wHvutM2uktIc7TB/2WimBnmr06HIdGBxcqEzn/tlpFUtwxwNEK bWQP9YEY1qzcjAe38lkIzBWhF85jDjHBOxJEHkGjyCJOpmt93i6mGjs6VTQt+/aP8cke iOlI7nlYpBKwNIwmAS8Z0OOm7oHr+2CfJjai0ghhIzvIMYUDkt9Sib2DZe/4npkC1dD/ tX7raw3B911pTe2FQulUH3MEs1KMQoPPozwr1lODijw1my326l+KpK/D7daEKdrSUorA kaOyKhTEy59/UXhDPUkTCxQnTQPHZqHhs2afIAQFSo3yg5wucPzbqTIDuUBYLKVHBEOv 1RaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=lUDXelo1No4OYKu3N9LpPFyMEEcIEpXkkk93NPUD3M8=; b=2QA9+2rgj8ZYZ+mL1nK6urvEgA+sygPdrA6nd8BBai4HmSAOX1z1x1M1WpRmcI4Dqb csvbO2i4MK2FqQSwrUjATrdcdtMrnHvX9iwmmcbEYW9A5FLx/0GwAEXYXXwR89/obh5k 2zjzC0zL6y/OWkD37D2a58WzOSM76j8+nLhhqZ+327JoMHKO4M3GgGnfhWAFT3AArTWH hXrSkJJiKt3wUBwD4iKze3k5cyeusr0o3f1uB/w2NYa1tLBVs8HQziVi+ho1hZ44oBgE mNSdVDSOBG2JAoUOd1YzjF1BcYr2aQahu9BPkpMYzJPu4ezY5sd9/IH+FaFJNwErkSSR RhhQ== X-Gm-Message-State: AFqh2kr9mLTX6Sd2zR1rLsbD/ii+2EQp19EggpYp/wPBk/3q8r71nu/O 0LQAs0mcXdW4s2h1R+CGhfY= X-Google-Smtp-Source: AMrXdXv5PAbmeouIVYX/hpCjkEvp4NeQx/ljS65DSqo5tj7wPQeDJoffTFfGvJBa60s4j/w2ybEBFg== X-Received: by 2002:a1c:ed19:0:b0:3d3:52bb:3984 with SMTP id l25-20020a1ced19000000b003d352bb3984mr24699253wmh.17.1672472057668; Fri, 30 Dec 2022 23:34:17 -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 l27-20020a05600c1d1b00b003cfd4e6400csm33467796wms.19.2022.12.30.23.34.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 23:34:17 -0800 (PST) Message-ID: <2cda4ce97c6cbd4e0551e2690d7a6c13d6f3ee44.camel@gmail.com> Subject: Re: [PATCH v2 0/3] Update python-pygame to 2.1.2. From: Liliana Marie Prikler To: Adam Faiz Date: Sat, 31 Dec 2022 08:34:16 +0100 In-Reply-To: <53f166d39fab514f30a67ad24b40633aae9bb43f.camel@gmail.com> References: <53f166d39fab514f30a67ad24b40633aae9bb43f.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60153-done Cc: 60153-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 22.12.2022 um 22:09 +0100 schrieb Liliana Marie Prikler: > Hi Adam and everyone else reading. >=20 > For the sake of transparency, this is the series I plan on pushing on > December 31st to close this bug.=C2=A0 Obviously, I'll add proper sign- > offs before doing so ;) >=20 > Cheers >=20 > Adam Faiz (2): > =C2=A0 gnu: python-pygame: Update to 2.1.2. > =C2=A0 gnu: python-pygame: Use G-Expressions and new-style inputs. >=20 > Liliana Marie Prikler (1): > =C2=A0 gnu: python-pygame: Reword description. >=20 > =C2=A0gnu/packages/game-development.scm | 120 +++++++++++----------------= - > -- > =C2=A01 file changed, 44 insertions(+), 76 deletions(-) Pushed now. Cheers ------------=_1672472102-10766-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org From: Adam Faiz Subject: [PATCH] gnu: python-pygame: Update to 2.1.2. Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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(-) 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)) (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 -- 2.38.1 ------------=_1672472102-10766-1--