From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id CFf2BCd/0GWCtwAAe85BDQ:P1 (envelope-from ) for ; Sat, 17 Feb 2024 10:40:55 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CFf2BCd/0GWCtwAAe85BDQ (envelope-from ) for ; Sat, 17 Feb 2024 10:40:55 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=VnkvuUj4; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708162854; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=wWe92HAyQDHMOourO/yNTBK6EUG/8ugNdD4GX1cq6Vw=; b=b2/12r0Cr6PEJmC9Nmfza/NFu3YkuhhD5wnrZ1aGCNdddccvUjcMhFpWqUyyJR6c31ke2I I/qB5I4hQRgpkBO9cHoEv9+MAuXLuhYGCeLcj3rdb34MbkeJymDvOXN0YmJ71bPvm6Z4TD m3s8rG/5FXfFU8I5j+YL2+3FRde5SKJinPJvn2iBWWLd1CGnE01m0p2IUfsdaJw1BUlvpa S8Dl/9Gd7dr2Nl2U6wrUzYehBcPqlj3jx4XD7cRWqHK8uSq1ljQnXJoTHJt3KE06Bfyfzt NTYutMCDPOLW1DqgvGKLXEZvg3IzsG6ESrzGaoaJsLF/ynTwDaKzRIoRN31zjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=VnkvuUj4; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708162854; a=rsa-sha256; cv=none; b=oKAexRe748mLQs+x3EZPxUyyuiwG3oMjkzSplUkPe9gc5xD90xcFIJMaWHtfeGcu59y9Bj ChrfL4n66uPia5nsnCPwMeyIdWFu9zr2ztI+3DkqyeOFq1T2hlU8QwzEvzKgVNBiE5oVHU WxiMeHisb5KbBm9xcNqx+0xtlDAb4U80bJhCSjQ2Yp8ohz7+enie00fqfmgwJk3Opiqt5p Ywc8mfTEdr3LQjgBP8ow6pQNdGXy5ufqlcFrpE0BneF75EHYG+Nl19LOw2ofqkAzOUJxTG vBVd9Ek7eDqv7fdgxV9TfiNFBHanpqxc864PuVUs/Th7W37j1ziiwOwFTEGQ3w== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C1F7730153 for ; Sat, 17 Feb 2024 10:40:54 +0100 (CET) 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 2.53 X-Spam-Score: 2.53 X-Migadu-Queue-Id: C1F7730153 X-TUID: uBhF2BzzPd/C * 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 -- 2.41.0