From patchwork Sat Feb 17 09:33:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 60450 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 140A427BBE9; Sat, 17 Feb 2024 09:40:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 3D37227BBE2 for ; Sat, 17 Feb 2024 09:40:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbHBe-0004Qp-W4; Sat, 17 Feb 2024 04:40:47 -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 1rbHBa-0004QJ-3K for guix-patches@gnu.org; Sat, 17 Feb 2024 04:40:42 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rbHBZ-00023n-RI for guix-patches@gnu.org; Sat, 17 Feb 2024 04:40:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbHBt-00081C-J2 for guix-patches@gnu.org; Sat, 17 Feb 2024 04:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68644] [PATCH v2 1/2] gnu: python-pygame-sdl2: Update to 2.1.0+renpy8.2.0. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 09:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68644 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68644@debbugs.gnu.org Cc: msglm , iyzsong@envs.net Received: via spool by 68644-submit@debbugs.gnu.org id=B68644.170816283530775 (code B ref 68644); Sat, 17 Feb 2024 09:41:01 +0000 Received: (at 68644) by debbugs.gnu.org; 17 Feb 2024 09:40:35 +0000 Received: from localhost ([127.0.0.1]:60471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbHBT-00080J-FQ for submit@debbugs.gnu.org; Sat, 17 Feb 2024 04:40:35 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:42483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbHBQ-0007zz-PC for 68644@debbugs.gnu.org; Sat, 17 Feb 2024 04:40:34 -0500 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-561587ce966so5567586a12.1 for <68644@debbugs.gnu.org>; Sat, 17 Feb 2024 01:40:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708162747; x=1708767547; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=55Y6Z+v0Im7Ecpcg5Sxgg8jdJoiOT+R9fWWYyauVbB8=; b=Y9j0Yk4UQPajtg6BDnCVMyBqmfMtWA7EBjL3rv/4jqnWKH5hoBic+TrRNlA1ur7NbG KfYf9sbXr21DIBd/CMsff+T6MobKbYl5sJwoPIPu80lkXfnuzGbFS7cXz92PuZ5h6Kc5 tAG8nmkTSoARzCuqLpQP9DHBx1mJtjzQqDSVBk6+kyOnSWLgeOaWZhdpQ3nhRBH7YIHq m61sv1DF8VIAkTU/oZHVIc/x5pcJcIMmbELLmUP1U8kstIIvIuZph8Z1onBFmxFs90AZ O/geh7zdUSgZhz24fRj8sv4pGrMXm5qupTeGG5Rwe28LCSZxNIBu3qcB0svz14gF9z7i Jx6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708162747; x=1708767547; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=55Y6Z+v0Im7Ecpcg5Sxgg8jdJoiOT+R9fWWYyauVbB8=; b=o4/Kq4R+M7OWs8WEA1L0B5Hlc9FxWZoYWFTj6i/sk6YqIo8uT/aFGAUHlDjuAN/DkY 4tt1WnBOaAexPOFF6gVG9TqkT43H39uSgqAmAzzx/ilLAZjD6/+PA0/a+7dmnRykhEKb 5j+SEpJH5AByYpzfEmUyBl5E3G4CNkTbcfYBd4uuvzodrIMDYCW/GSusqarM4Ur3Q0qQ N/2kJ8fsO2kz8n4St2ERt5NRGyt4+x+hKwVQxiRhVw3BSt0inUgqPkHmRBu6HADv3s4+ USYo5eGpPelSWw/XjcNY0M73vONU1e+Jwd03OuIdnYYOcr5t1xxJ6W+1R6bKLmAEeNgR EyWg== X-Gm-Message-State: AOJu0YyaD6ItwnQrHhhBhoEXqcnF8qZ2ZTZq0rUA12bNhhj8vQVhwbd7 WljLDpTJOmDx3jteGDB/AdKncTkEz6Yd9ynlsOxaeOkTT0ti8M7Co8zZCRDvvco= X-Google-Smtp-Source: AGHT+IHvPzL4nqO6J5wLoPHhS3jPYErCXyaqJxJ3pgLvIC/kPn/dsktsR2oAD+HgJC9hS2R1eFh/8g== X-Received: by 2002:a05:6402:500f:b0:561:fc2:bec0 with SMTP id p15-20020a056402500f00b005610fc2bec0mr10489051eda.4.1708162747017; Sat, 17 Feb 2024 01:39:07 -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 d8-20020aa7d5c8000000b00563c3192f56sm752002eds.5.2024.02.17.01.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 01:39:06 -0800 (PST) Message-ID: <16d9312128ef3017cca4c2ffcd867415f81a342e.1708162723.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 17 Feb 2024 10:33:34 +0100 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+renpy8.2.0. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 7142f6df77bfac4fdc8da65a7caae915df945a8b diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 78fd42518e..614fc7a85f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1344,7 +1344,7 @@ (define-public python-pygame (define-public python-pygame-sdl2 (let ((real-version "2.1.0") - (renpy-version "8.1.3")) + (renpy-version "8.2.0")) (package (inherit python-pygame) (name "python-pygame-sdl2") @@ -1354,7 +1354,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 "0qlprs9n3w254ilizqzvr6s01zx72gh7an0bgwxsq4hm22qypdws")) + (sha256 (base32 "17mc39c7ha83kzv2wmq61a15mn6p8wh2y33ixhf5sb4bvyr48mhy")) (modules '((guix build utils))) (snippet '(begin From patchwork Sat Feb 17 09:34:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 60451 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 0C32E27BBE2; Sat, 17 Feb 2024 09:40:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 C4F5D27BBEA for ; Sat, 17 Feb 2024 09:40:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbHBe-0004Qm-Uo; Sat, 17 Feb 2024 04:40:46 -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 1rbHBa-0004QQ-FJ for guix-patches@gnu.org; Sat, 17 Feb 2024 04:40:43 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rbHBa-00023t-7k for guix-patches@gnu.org; Sat, 17 Feb 2024 04:40:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbHBt-00081K-VX for guix-patches@gnu.org; Sat, 17 Feb 2024 04:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68644] [PATCH v2 2/2] gnu: renpy: Update to 8.2.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 09:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68644 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68644@debbugs.gnu.org Cc: msglm , iyzsong@envs.net Received: via spool by 68644-submit@debbugs.gnu.org id=B68644.170816283830784 (code B ref 68644); Sat, 17 Feb 2024 09:41:01 +0000 Received: (at 68644) by debbugs.gnu.org; 17 Feb 2024 09:40:38 +0000 Received: from localhost ([127.0.0.1]:60473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbHBV-00080S-Rw for submit@debbugs.gnu.org; Sat, 17 Feb 2024 04:40:38 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:57559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbHBR-000800-Ko for 68644@debbugs.gnu.org; Sat, 17 Feb 2024 04:40:34 -0500 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-563e6131140so1821305a12.2 for <68644@debbugs.gnu.org>; Sat, 17 Feb 2024 01:40:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708162748; x=1708767548; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=wWe92HAyQDHMOourO/yNTBK6EUG/8ugNdD4GX1cq6Vw=; b=VnkvuUj4qNpj2Qm4SAOUdIgVH+zqbIXVKRQ0wTWuII2iDQwL+8jKj//+m9jydiEORQ B0Nl04TtwBghFArhpiAO9hr0PjnyjvDF2/KSyl9b1pH3rExQ2xmAMxWrMZipr4HiE6yL SfNcPv3Jh2RrlvUb1OXJx8p0S734LgqvpgRBfW8D1Q8jq7q9rpCFp2+1fD721WolwipP UGy8nYZx4MnlQMpRp+aQz0ZBV7Aat9iFMAx+BajB8iYAC8Ot2NhfVlQuewrzUT912lC8 M+ligM9DaiqRs0KAl01thoF2e5iD/1CW6X3q4Lmbh3NzUGkrclbse1C6AJl/KG+pQgt3 4r8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708162748; x=1708767548; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wWe92HAyQDHMOourO/yNTBK6EUG/8ugNdD4GX1cq6Vw=; b=uWSJVOsQABMSrMLqrPD2iZwyLakOEDBwHP5kA2ew+nh2x+gIOMd/Z6seO6vACGchZp NbfVt7ENl30WC9Z9fugHa1IcuT+Ybrpq0NvHHZSzZNrZy3hwAs0Vqx/a/+V4wflQYs5D bkI57oHcTzGG8nZLnJD5LxxLmQWCAnnkEF3+r5gF52vLDpDfDluIdKpY4v/7QKl2pWoC 7mFQsjV56JYzL+/TSshFA3/6PWDudgmObNMtaflMRrTIjKOVnu1f89kirXagYr7IPFrf KIejJhiQwsVzkgtQW1LNDjO6gcUFSZhcaV8Mm1hh/nyi8JxaAj7cCbPKHqrA/MB+9d5s +clw== X-Gm-Message-State: AOJu0YzO3irvGBipU/9Go3ff4V3XOVXpp6l9NuJYbBM4DvJra2Pjm1Vt m2R+qPPHrJK0Whwz55p16yFK2fQ2QMSq6VT+ptkm6swACJZ50DrVmbU9EossFW0= X-Google-Smtp-Source: AGHT+IHiQOhyp3nk8xptkP1rmCDCrO+cf0beh3PTO0BhVX2iUEBUt+qbTHu2HO5YJI3sA2z24ZMlig== X-Received: by 2002:a50:874f:0:b0:563:e5c0:af96 with SMTP id 15-20020a50874f000000b00563e5c0af96mr3113917edv.4.1708162747653; Sat, 17 Feb 2024 01:39:07 -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 d8-20020aa7d5c8000000b00563c3192f56sm752002eds.5.2024.02.17.01.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 01:39:07 -0800 (PST) Message-ID: <9939daa255ba7b5a6559a8ca8a9b0fe24c9afe6c.1708162723.git.liliana.prikler@gmail.com> In-Reply-To: <16d9312128ef3017cca4c2ffcd867415f81a342e.1708162723.git.liliana.prikler@gmail.com> References: <16d9312128ef3017cca4c2ffcd867415f81a342e.1708162723.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 17 Feb 2024 10:34:50 +0100 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/aux-files/renpy/renpy.in (path-to-saves): Honour RENPY_PATH_TO_SAVES. (path_to_logdir, predefined_searchpath): New procedures. * gnu/packages/game-development.scm (python-renpy): Update to 8.2.0. --- gnu/packages/aux-files/renpy/renpy.in | 22 +++++++++++++++++++++- gnu/packages/game-development.scm | 4 ++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/gnu/packages/aux-files/renpy/renpy.in b/gnu/packages/aux-files/renpy/renpy.in index 9115d9aee3..deef297aa2 100644 --- a/gnu/packages/aux-files/renpy/renpy.in +++ b/gnu/packages/aux-files/renpy/renpy.in @@ -37,7 +37,27 @@ def path_to_saves(gamedir, save_directory=None): if not save_directory: return gamedir + "/saves" - return os.path.join(os.path.expanduser("~/.renpy"), save_directory) + prefix = os.environ.get("RENPY_PATH_TO_SAVES", + os.path.expanduser("~/.renpy")) + + return os.path.join(prefix, save_directory) + +def path_to_logdir(basedir): + return basedir + +def predefined_searchpath(commondir): + import renpy + + # The default gamedir, in private. + searchpath = [ renpy.config.gamedir ] + + if env_searchpath := os.environ.get("RENPY_SEARCHPATH"): + searchpath.extend(env_searchpath.split("::")) + + if commondir and os.path.isdir(commondir): + searchpath.append(commondir) + + return searchpath def main(): try: diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 614fc7a85f..5335166d19 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1395,7 +1395,7 @@ (define-public python-pygame-sdl2 (define-public python-renpy (package (name "python-renpy") - (version "8.1.3") + (version "8.2.0") (source (origin (method url-fetch) @@ -1403,7 +1403,7 @@ (define-public python-renpy "/renpy-" version "-source.tar.bz2")) (sha256 (base32 - "1g6fz5dxp7yxhgv6q4brzf5hpfqq3l1g3dfv3fsiwwn6mj0b01z2")) + "02v54qqjjigfqhdr50kzhkdvplk56bvprq65jl57kcs1qhvlf5s9")) (modules '((guix build utils))) (snippet #~(begin