From patchwork Fri May 19 09:01:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 50152 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6831227BBEA; Fri, 19 May 2023 12:28:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CB28227BBE2 for ; Fri, 19 May 2023 12:28:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzyHG-0002rv-B2; Fri, 19 May 2023 07:28:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzyHE-0002qs-8X for guix-patches@gnu.org; Fri, 19 May 2023 07:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzyHE-0006GF-14 for guix-patches@gnu.org; Fri, 19 May 2023 07:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzyHC-0003NN-K9; Fri, 19 May 2023 07:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63582] [PATCH 1/4] gnu: python-pygame-sdl2: Update to 2.1.0-for-renpy-8.1.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 19 May 2023 11:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63582@debbugs.gnu.org Cc: iyzsong@envs.net X-Debbugs-Original-Xcc: iyzsong@envs.net Received: via spool by 63582-submit@debbugs.gnu.org id=B63582.168449565012920 (code B ref 63582); Fri, 19 May 2023 11:28:02 +0000 Received: (at 63582) by debbugs.gnu.org; 19 May 2023 11:27:30 +0000 Received: from localhost ([127.0.0.1]:55568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGf-0003MF-Q0 for submit@debbugs.gnu.org; Fri, 19 May 2023 07:27:30 -0400 Received: from mail-ej1-f52.google.com ([209.85.218.52]:51432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGd-0003Lg-G1 for 63582@debbugs.gnu.org; Fri, 19 May 2023 07:27:28 -0400 Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-965ab8ed1fcso576168466b.2 for <63582@debbugs.gnu.org>; Fri, 19 May 2023 04:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684495641; x=1687087641; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=lVLkk2x8NfleOPzqbwT9EGoG4rakW9IHWAVImUnApOw=; b=Cj2huFIHLr3RtWzTPFEshQInunD6O9TfLEFwtliDnn48DYUHP2tQbP9aQ9qexwOZB9 RbAKkLygLsY00U5D5SOgGafuTb2Yvez0trtJV8ndzzgrnBj2M5GdTJxLHhLuP0xSmW9Z OXPvAqWbKPthn7GjnQ4C4U1Ig41fhMCCsVTBSoJdqFCahYMHkA0GE3wFaXAnluKiTxTf zASogTCJZFsiC5OHbHTl6AvqmTc/EqPrlUQVxna5bF72QYntG92B3ePt+Vi77E0FFHxF INypgbs858l8uLE75in5cl1G3mUPSbjXzQNgxMZ0KU2yYJUleFri7T/mx82poMJTV20x xmiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684495641; x=1687087641; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lVLkk2x8NfleOPzqbwT9EGoG4rakW9IHWAVImUnApOw=; b=OpOd0vmGjj+zSm6ANvTCz7chTBb0ZgHdYYy3e5+zE69MSc9mNBwHXbpIvtLB0dNgtC GK4i9ycH+cxiWuqhDtRYZIuiFjTNfCE/L5diSD10GmT1H947abChTnCHGa/gSOeT+Pm0 9f1yAbxaxjjpMrpH5FQ2gIhoGMrH7N9E1B5TdOHEtCzALXXiNjA2WUhFNzA+F3K71UV1 IE7q9PW0TZL+uOd1z9i9dBAdFnoUwHLX8t8sDbc/yaQsSDbLlJx8dtpt2Y16PKOZJUZg GguNQu6KirbwNdBL9XbDBjgConSs6Hp+K/HYN+ac9TzgDOecMSGkbXV0ynLwNxs7m2uf WwRw== X-Gm-Message-State: AC+VfDwf88tiRSuRMNsN20GnYsr2wmlh9Lpt0tMCTmWe5rjXdy6oqbdP WqIP70A+c4d6AOXlLQvkGE0cnd+MqPY= X-Google-Smtp-Source: ACHHUZ4va1wCAWEmR6DmaVAnm+3uHvVdESflZsXGVIWr0ExvLisfBQg/KB+YoGdETlxJFY7dppLJZg== X-Received: by 2002:a17:907:1612:b0:969:9118:a991 with SMTP id hb18-20020a170907161200b009699118a991mr1605347ejc.42.1684495641264; Fri, 19 May 2023 04:27:21 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d14-20020a170906174e00b0096b4c3489e6sm2193520eje.177.2023.05.19.04.27.20 for <63582@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 04:27:20 -0700 (PDT) Message-Id: <12680874cca4063314cde128da3b8aa367b18f9b.1684493082.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Fri, 19 May 2023 11:01:06 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (python-pygame-sdl2): Update to 2.1.0-for-renpy-8.1.0. --- 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 66f23819fc..0f12d18b27 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1278,7 +1278,7 @@ (define-public python-pygame (define-public python-pygame-sdl2 (let ((real-version "2.1.0") - (renpy-version "8.0.3")) + (renpy-version "8.1.0")) (package (inherit python-pygame) (name "python-pygame-sdl2") @@ -1288,7 +1288,7 @@ (define-public python-pygame-sdl2 (method url-fetch) (uri (string-append "https://www.renpy.org/dl/" renpy-version "/pygame_sdl2-" version ".tar.gz")) - (sha256 (base32 "1nq78mybkvshshdjy5bly6nfq6dnwll648ng62fwmksxpni17486")) + (sha256 (base32 "1qj39jqnv334p4wnxc2v5qxyahp7nkqf9hpdd2sgqcmgaqwnqqmj")) (modules '((guix build utils))) (snippet '(begin From patchwork Fri May 19 10:13:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 50151 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B3B8427BBEA; Fri, 19 May 2023 12:28:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 21CD227BBE2 for ; Fri, 19 May 2023 12:28:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzyHF-0002rd-TI; Fri, 19 May 2023 07:28:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzyHE-0002qq-6l for guix-patches@gnu.org; Fri, 19 May 2023 07:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzyHD-0006GB-Te for guix-patches@gnu.org; Fri, 19 May 2023 07:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzyHC-0003NH-8E; Fri, 19 May 2023 07:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63582] [PATCH 2/4] gnu: python-pygame-sdl2: Use G-Expressions. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 19 May 2023 11:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63582@debbugs.gnu.org Cc: iyzsong@envs.net X-Debbugs-Original-Xcc: iyzsong@envs.net Received: via spool by 63582-submit@debbugs.gnu.org id=B63582.168449564912913 (code B ref 63582); Fri, 19 May 2023 11:28:02 +0000 Received: (at 63582) by debbugs.gnu.org; 19 May 2023 11:27:29 +0000 Received: from localhost ([127.0.0.1]:55566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGf-0003MB-EA for submit@debbugs.gnu.org; Fri, 19 May 2023 07:27:29 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:56715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGd-0003Lh-HQ for 63582@debbugs.gnu.org; Fri, 19 May 2023 07:27:27 -0400 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-965d2749e2eso483178166b.1 for <63582@debbugs.gnu.org>; Fri, 19 May 2023 04:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684495642; x=1687087642; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=nV98ur8X49Hkzd9hFOjpLIyzES8gvQ8j0yPoDbizKk0=; b=EC4/tzHt8Vs0LzoOeXNEoPyckvsEADAc35uh4PsgPt0Eq/uQUgZfW8HFA87mXHPnEp zCJPTUffVbx59RH3iqLu5ok2/jvE6Fmj3C1JAlYXi/3eoqZoGNfr9Mef3z+K9ENe5wd5 gOdikyR08qgRwi2XVvnfqi3h8TSTh48yAS8iT/sFrBSZbLGzj1LT5xEApybDp9/MjS+J Ywpj3GEmmKrwe+W6TJzBQVCdFYLihM2OJA8ZcdENvh9eLe6zk7W3W7a8bu0Rb7hkc0lJ r5EN1q2qH5H9dSpeaLiZq+GRJMenCrUW/+IgVQ9GyZL5VFBTBI0dOBCaTMWIP/5esNxe uhOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684495642; x=1687087642; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nV98ur8X49Hkzd9hFOjpLIyzES8gvQ8j0yPoDbizKk0=; b=StPbY8TiSw0rpf+ORLCq/LTnwWecZRHDHWk1eEx0YWvKT+Ey4AXmEv2IpORCHZao1U 0E3tOcf/imECyr+AsNrq1/uiR274Wd4YsWCeYAM3ZAO0StiN4cX61QUekjeMI8v/pU5v 5O1w8jADHzCuY7wpaNmwClooFo9owlZw0wluGkGlso/6obrw2sjm+2m6z1fJYP4dWqLZ MyxOtJ9DpDA5nS5qUeyFyIq3hVVn3K3L9nBKiQKxZKx6HsVOZl6s9yrIyAybZPx/VWSD KaLDLyhaIAPlcM+nK8Zkb6Jkefy7EJMKNDj1+eujjCXwv5kyHEEW+vA8e8feIRlI4/XP DfMg== X-Gm-Message-State: AC+VfDxR0pGLMd/tw2SxPlNXXbdo0Nbo665O1SOZ6z3sD3l/cZ5e6End o8QS/FBYhkBevrJaOruI35jbv4O5nsOoqw== X-Google-Smtp-Source: ACHHUZ5oLhCY5HYEG1yZUbN6m1A/76VtcPht/lbTW7Mlk1wSK74inMaLIzjg7WDIoBDub2ENMRZemg== X-Received: by 2002:a17:907:3f16:b0:94f:a292:20cc with SMTP id hq22-20020a1709073f1600b0094fa29220ccmr1714809ejc.41.1684495641695; Fri, 19 May 2023 04:27:21 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d14-20020a170906174e00b0096b4c3489e6sm2193520eje.177.2023.05.19.04.27.21 for <63582@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 04:27:21 -0700 (PDT) Message-Id: <8996533df8588efeae94692f14079a22c0f1e426.1684493082.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Fri, 19 May 2023 12:13:40 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (python-pygame-sdl2)[arguments]: Convert to list of G-Expressions. --- gnu/packages/game-development.scm | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0f12d18b27..5b3faceb89 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1298,22 +1298,22 @@ (define-public python-pygame-sdl2 (delete-file-recursively "gen-static"))))) (build-system python-build-system) (arguments - `(#:tests? #f ; tests require pygame to be installed first - #:phases - (modify-phases %standard-phases - (add-after 'set-paths 'set-sdl-vars - (lambda* (#:key inputs #:allow-other-keys) - (setenv "PYGAME_SDL2_CFLAGS" - (string-append "-I" - (assoc-ref inputs "sdl-union") - "/include/SDL2 -D_REENTRANT")) - (setenv "PYGAME_SDL2_LDFLAGS" - (string-append "-L" - (assoc-ref inputs "sdl-union") - "/lib -Wl,-rpath," - (assoc-ref inputs "sdl-union") - "/lib -Wl,--enable-new-dtags -lSDL2")) - #t))))) + (list + #:tests? #f ; tests require pygame to be installed first + #:phases + #~(modify-phases %standard-phases + (add-after 'set-paths 'set-sdl-vars + (lambda* (#:key inputs #:allow-other-keys) + (setenv "PYGAME_SDL2_CFLAGS" + (string-append "-I" + (assoc-ref inputs "sdl-union") + "/include/SDL2 -D_REENTRANT")) + (setenv "PYGAME_SDL2_LDFLAGS" + (string-append "-L" + (assoc-ref inputs "sdl-union") + "/lib -Wl,-rpath," + (assoc-ref inputs "sdl-union") + "/lib -Wl,--enable-new-dtags -lSDL2"))))))) (inputs (list (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))) (native-inputs From patchwork Fri May 19 09:55:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 50150 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B395227BBE9; Fri, 19 May 2023 12:28:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0A9F227BBE2 for ; Fri, 19 May 2023 12:28:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzyHF-0002ra-Ha; Fri, 19 May 2023 07:28:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzyHE-0002qp-6E for guix-patches@gnu.org; Fri, 19 May 2023 07:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzyHD-0006GA-Tc for guix-patches@gnu.org; Fri, 19 May 2023 07:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzyHC-0003NT-Vj; Fri, 19 May 2023 07:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63582] [PATCH 3/4] gnu: python-renpy: Update to 8.1.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 19 May 2023 11:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63582@debbugs.gnu.org Cc: iyzsong@envs.net X-Debbugs-Original-Xcc: iyzsong@envs.net Received: via spool by 63582-submit@debbugs.gnu.org id=B63582.168449565012926 (code B ref 63582); Fri, 19 May 2023 11:28:02 +0000 Received: (at 63582) by debbugs.gnu.org; 19 May 2023 11:27:30 +0000 Received: from localhost ([127.0.0.1]:55570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGg-0003ML-3z for submit@debbugs.gnu.org; Fri, 19 May 2023 07:27:30 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:51549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGd-0003Li-VD for 63582@debbugs.gnu.org; Fri, 19 May 2023 07:27:28 -0400 Received: by mail-ej1-f65.google.com with SMTP id a640c23a62f3a-96f53c06babso203391866b.3 for <63582@debbugs.gnu.org>; Fri, 19 May 2023 04:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684495642; x=1687087642; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=DBQMgxYfRDUh1FUgOcVHBFa35V0dkhY2EISeGZ7m+as=; b=AeQpZsYvJuQ/LyTKRjfmEtRsJ17VW883J+OBS7pZx3BoZgYVxN1R+LbQlnxytSpMsO MWKp6Metmqxjymd9VAYfXfT3grbYgdjSWP5brSU5Vo2SsXZ0CM4B5CJbI0M/jCRw/OVt EjN3n6SyAoHXaknwWxtC4Q5sUJYobO4Ay7WvFWkjsbu/vhNjSr4X5pqxDLnoRJY93/F9 2gBOOhhohP8eOgvRJL6riGuxkkcS+8bvSMngSGGMMNP9K16vELhxkCI6l5DgE6h+pSZy 1difkUUsd9NjfcFkQul0lZr1yLVSNpVWkmBlSVDg5GwrCfnPdA6qsdRGoLpGPmbCWKza tCOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684495642; x=1687087642; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DBQMgxYfRDUh1FUgOcVHBFa35V0dkhY2EISeGZ7m+as=; b=KDTovyNJApkIh+39d5zRI+PzEZrPzZJY1i4I10nWwTt9DEZ7Ur7GFZGh9eY+0ew09n 80AqFKbEkAPHxhJc9mjB4PWKrw626g5c2LAnpxVzVj33b6Qi3Ma/AvV5DpKlvI9W0Vxa lLPmwTBzxSxiXjH4knnbBbpHS0xM6ZdG50uqrGCv1iIO7fDNyWItAQ2wAfma3Oc6L8fb mg8rzM8DxU5T5zMyd3whZE1SG/CwsNYfSkTRNzvh+873MrhCNe2lsiggUiZZaWMo4V9v CfH+pV0FYMcrxOuT55b2DVGnOqE6f5oxxVNz828v9kxnQ0kNV7PezI8HobHZdLu4+5gq 2qSw== X-Gm-Message-State: AC+VfDxuP1IvQvK4MGANDD7tSVtoILMq7la1ybLSqDZGBiRJ6dvBNtTb PZ39X3PL0dPKLSSWpfRbinTBq8YZruYPFA== X-Google-Smtp-Source: ACHHUZ7A2g+g1f2zo89sHJDeQeTs4X7UO3B9ruanUa6ytHro+8BUSYziwE3anWnxpHhkscQuJ41YTQ== X-Received: by 2002:a17:907:3e05:b0:957:17c5:8705 with SMTP id hp5-20020a1709073e0500b0095717c58705mr1569124ejc.51.1684495642159; Fri, 19 May 2023 04:27:22 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d14-20020a170906174e00b0096b4c3489e6sm2193520eje.177.2023.05.19.04.27.21 for <63582@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 04:27:21 -0700 (PDT) Message-Id: <93dd15946900b1bddf1aabd02939459a452e4920.1684493082.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Fri, 19 May 2023 11:55:40 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (python-renpy): Update to 8.1.0. [source]: No longer unbundle fribidi. Drop sync service and report as official version. [arguments]<#:phases>: Drop ‘fix-include-paths’. [propagated-inputs]: Add python-ecdsa. --- gnu/packages/game-development.scm | 40 +++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5b3faceb89..96a7a52b62 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -99,6 +99,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) @@ -1329,25 +1330,33 @@ (define-public python-pygame-sdl2 (define-public python-renpy (package (name "python-renpy") - (version "8.0.3") + (version "8.1.0") (source (origin (method url-fetch) (uri (string-append "https://www.renpy.org/dl/" version "/renpy-" version "-source.tar.bz2")) - (sha256 (base32 "1b49y60pi6304fg06lw5gajzrgg9w80swpfkn6pw0lxbr6djgjgn")) + (sha256 + (base32 + "08l7z2vwqxkskj3rs2a0w9ahah28ixq8hy48h30k2dm9g19h450h")) (modules '((guix build utils))) - (patches - (search-patches - "renpy-use-system-fribidi.patch")) (snippet - '(with-directory-excursion "module" - ;; drop fribidi sources - (delete-file-recursively "fribidi-src") - ;; drop _renpytfd, as there are missing sources - (substitute* "setup.py" - (("cython\\(\"_renpytfd\"" all) - (string-append "pass # " all))))))) + #~(begin + ;; Build without sync service. + ;; Encryption is only used for enabling this service and requires + ;; libhydrogen, which doesn't have a public release, so drop it + ;; as well + (for-each delete-file + '("renpy/encryption.pyx" + "renpy/common/00sync.rpy")) + (substitute* "module/setup.py" + (("cython\\(\"renpy\\.encryption\"\\)") "")) + (substitute* "renpy/__init__.py" + (("import renpy\\.encryption") "")) + ;; Trust vc_version.py when it comes to detecting whether a + ;; version is official. + (substitute* "renpy/__init__.py" + (("official = official and .*") "")))))) (build-system python-build-system) (arguments `(#:tests? #f ; Ren'py doesn't seem to package tests @@ -1359,11 +1368,6 @@ (define-public python-renpy (("xdg-open") (string-append (assoc-ref inputs "xdg-utils") "/bin/xdg-open"))))) - (add-after 'unpack 'fix-include-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "module/setup.py" - (("/usr/include/fribidi") - (search-input-directory inputs "include/fribidi"))))) (add-after 'set-paths 'set-build-vars (lambda* (#:key inputs native-inputs #:allow-other-keys) (setenv "RENPY_CYTHON" @@ -1405,7 +1409,7 @@ (define-public python-renpy libpng (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)) xdg-utils)) - (propagated-inputs (list python-future python-pygame-sdl2)) + (propagated-inputs (list python-ecdsa python-future python-pygame-sdl2)) (home-page "https://www.renpy.org/") (synopsis "Ren'py python module") (description "This package contains the shared libraries and Python modules From patchwork Fri May 19 10:14:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 50153 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D847727BBE9; Fri, 19 May 2023 12:28:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2EDAD27BBE2 for ; Fri, 19 May 2023 12:28:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzyHG-0002rs-4J; Fri, 19 May 2023 07:28:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzyHE-0002qr-7N for guix-patches@gnu.org; Fri, 19 May 2023 07:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzyHD-0006GC-VF for guix-patches@gnu.org; Fri, 19 May 2023 07:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzyHD-0003Na-Bz; Fri, 19 May 2023 07:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63582] [PATCH 4/4] gnu: python-renpy: Use G-Expressions. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 19 May 2023 11:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63582@debbugs.gnu.org Cc: iyzsong@envs.net X-Debbugs-Original-Xcc: iyzsong@envs.net Received: via spool by 63582-submit@debbugs.gnu.org id=B63582.168449565712940 (code B ref 63582); Fri, 19 May 2023 11:28:03 +0000 Received: (at 63582) by debbugs.gnu.org; 19 May 2023 11:27:37 +0000 Received: from localhost ([127.0.0.1]:55572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGm-0003Me-Kz for submit@debbugs.gnu.org; Fri, 19 May 2023 07:27:37 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:49427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzyGe-0003Lj-EL for 63582@debbugs.gnu.org; Fri, 19 May 2023 07:27:29 -0400 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-510b4e488e4so5656017a12.3 for <63582@debbugs.gnu.org>; Fri, 19 May 2023 04:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684495642; x=1687087642; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=oQEczwYGvB6Vfis/L9eXe2HXv2gcZn6+z7BNDsjL17M=; b=UbJK2lXJ+YhhcpKugc7UiRu5zL5pWOV8HyPQMVaXmmgAJCYHGApycBrXWZIHisJcPY 93Iz9/Vyj+LLLP8MdrLMq2rvqaZpaapyFC1kbmpFOIStf3R3EfkOHYSMgA2ZDx+BNBcB JeFUu17iU+NKKOBZI2aqdGErXZCwdGC5YjrnOyIDwYp198DOfKb8v/borIv/F+uLoEUT wCo1LalLtFrEDWYjmuqz6y+uFgSKXNTdJC/saRg4AZ6F3AXFsvAdtBWrP4T5hhq3fwz/ p0SlGvnZFoe6kYfLp+ht5K2MCAPtMWg6CulR94VzeXLKAMioeZq4qwOhejl9IwDfIB38 drHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684495642; x=1687087642; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oQEczwYGvB6Vfis/L9eXe2HXv2gcZn6+z7BNDsjL17M=; b=St/ntHKwMmMmIQZJWc1YHN08l/sd2LFkEmAVeW6sZTbdUw4jMm75iYdNxI8rzpoYHw 4l4daw1UXbg5T7CYkVfF47Xtezwg2WrKd5UdYhsimbArqUtBff6HhawVWlnCKjdxNcfQ y+Jg61rqC6tTLOGO9S7oY5k9azpol6x45K3yNaUF+JRr8+THmx0sd/VaMcUTsojpQR7B 0QQ73HvxgsEOGI6uD3qcOcARmrbW3zVn7X3vASXCsiiLykD/EhEO1RVMcju+WeTu1aew IOxI8cRfNknY1MMHNbQJ6CgwAjPSS9ydQYG15ys3eFqra88/XQTD5prkBCTL3evWUzZl BOXA== X-Gm-Message-State: AC+VfDzjpcRpVmOdp4sIeCro0xokthWRLriYBeHYoQS/T1Ksw5LUFbVM VznJXu2dtg+HwnaAWc/H3GdbpHy35YGzNQ== X-Google-Smtp-Source: ACHHUZ5qA3EdZ7sIh7w+UPt5zSzQ3Xcx0o3G2e7hjvGj6YDU6iJ8QeIqIIQTkXK+/byMxAhkHG+Gvw== X-Received: by 2002:a17:907:e8c:b0:96f:678:d2e2 with SMTP id ho12-20020a1709070e8c00b0096f0678d2e2mr1378267ejc.11.1684495642632; Fri, 19 May 2023 04:27:22 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d14-20020a170906174e00b0096b4c3489e6sm2193520eje.177.2023.05.19.04.27.22 for <63582@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 04:27:22 -0700 (PDT) Message-Id: <8fac5ba5bd77bae12c9411c28f1ee03099ccb28f.1684493082.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Fri, 19 May 2023 12:14:28 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (python-renpy)[arguments]: Convert to list of G-Expressions. --- gnu/packages/game-development.scm | 83 ++++++++++++++++--------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 96a7a52b62..453196d3af 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1359,47 +1359,48 @@ (define-public python-renpy (("official = official and .*") "")))))) (build-system python-build-system) (arguments - `(#:tests? #f ; Ren'py doesn't seem to package tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-commands - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "renpy/editor.py" - (("xdg-open") - (string-append (assoc-ref inputs "xdg-utils") - "/bin/xdg-open"))))) - (add-after 'set-paths 'set-build-vars - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (setenv "RENPY_CYTHON" - (search-input-file (or native-inputs inputs) - "/bin/cython")) - (setenv "RENPY_DEPS_INSTALL" (string-join (map cdr inputs) ":")))) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) - ;; The "module" subdirectory contains a python (really cython) - ;; project, which is built using a script, that is thankfully - ;; named "setup.py". - (with-directory-excursion "module" - (apply (assoc-ref %standard-phases 'build) args)) - ;; The above only builds the cython modules, but nothing else, - ;; so we do that here. - (invoke "python" "-m" "compileall" "renpy"))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) - ;; Again, we have to wrap the module installation. - ;; Additionally, we want to install the python code - ;; (both source and compiled) in the same directory. - (let* ((out (assoc-ref outputs "out")) - (site (string-append "/lib/python" - (python-version - (assoc-ref inputs "python")) - "/site-packages"))) - (with-directory-excursion "module" - (apply (assoc-ref %standard-phases 'install) args)) - (copy-recursively "renpy" - (string-append out site "/renpy")) - (delete-file-recursively (string-append out site - "/renpy/common")))))))) + (list + #:tests? #f ; Ren'py doesn't seem to package tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-commands + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "renpy/editor.py" + (("xdg-open") + (string-append (assoc-ref inputs "xdg-utils") + "/bin/xdg-open"))))) + (add-after 'set-paths 'set-build-vars + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (setenv "RENPY_CYTHON" + (search-input-file (or native-inputs inputs) + "/bin/cython")) + (setenv "RENPY_DEPS_INSTALL" (string-join (map cdr inputs) ":")))) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + ;; The "module" subdirectory contains a python (really cython) + ;; project, which is built using a script, that is thankfully + ;; named "setup.py". + (with-directory-excursion "module" + (apply (assoc-ref %standard-phases 'build) args)) + ;; The above only builds the cython modules, but nothing else, + ;; so we do that here. + (invoke "python" "-m" "compileall" "renpy"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + ;; Again, we have to wrap the module installation. + ;; Additionally, we want to install the python code + ;; (both source and compiled) in the same directory. + (let* ((out (assoc-ref outputs "out")) + (site (string-append "/lib/python" + (python-version + (assoc-ref inputs "python")) + "/site-packages"))) + (with-directory-excursion "module" + (apply (assoc-ref %standard-phases 'install) args)) + (copy-recursively "renpy" + (string-append out site "/renpy")) + (delete-file-recursively (string-append out site + "/renpy/common")))))))) (native-inputs (list python-cython)) (inputs (list ffmpeg