From patchwork Sat Jul 29 00:42:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 15392 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 03EF527BBEA; Sat, 29 Jul 2023 02:15:38 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 3308227BBE9 for ; Sat, 29 Jul 2023 02:15:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPY2y-0003DH-LJ; Fri, 28 Jul 2023 20:43:04 -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 1qPY2w-0003BW-PC for guix-patches@gnu.org; Fri, 28 Jul 2023 20:43:03 -0400 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 1qPY2w-0000m3-HZ for guix-patches@gnu.org; Fri, 28 Jul 2023 20:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPY2w-0006io-DS for guix-patches@gnu.org; Fri, 28 Jul 2023 20:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64925] [PATCH] gnu: renpy: fix image reference paths. Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Jul 2023 00:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64925 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64925@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169059137725824 (code B ref -1); Sat, 29 Jul 2023 00:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jul 2023 00:42:57 +0000 Received: from localhost ([127.0.0.1]:46311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPY2q-0006iS-Ql for submit@debbugs.gnu.org; Fri, 28 Jul 2023 20:42:57 -0400 Received: from lists.gnu.org ([2001:470:142::17]:57646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPY2o-0006iF-OG for submit@debbugs.gnu.org; Fri, 28 Jul 2023 20:42:55 -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 1qPY2j-0003BJ-9T for guix-patches@gnu.org; Fri, 28 Jul 2023 20:42:49 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPY2h-0000hb-OG for guix-patches@gnu.org; Fri, 28 Jul 2023 20:42:49 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1bbf8cb61aeso1899955ad.2 for ; Fri, 28 Jul 2023 17:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690591365; x=1691196165; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=RvSokmoGToxfB8QswvKHrN6HnL6vojcqzMXuShFmlqQ=; b=dn88mY85apFwGZx/f3h8/uXQIFLE6HvxigSOok54OweQJD2K+i18z/ToOSOT1MiPBk 6dtaZI8XXfqw05MftMlYYeujYf5gn4rNifgdXxjwp+6rTA+V4TJdvcQgYp5ncTo9EYN9 IOVehYnPu93t4rUeeMt4JCxxL1oDJ/o8IH9uLDTugwNmuZRo6Z5ix1GWTOSe+NlbavS4 zRYSnmbN5pq2PwB1WShALFdiSCuWJRclBH3Uw14VUARoDf2hHXc0bxm0gHNPP3tUESBa 4bZ2H7S3cU1HNmlSIBg13zfyvSSZUrWpWRXDhxogl5f4sq5aMKcGANN/zUW7OQJYDWK7 XfFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591365; x=1691196165; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RvSokmoGToxfB8QswvKHrN6HnL6vojcqzMXuShFmlqQ=; b=bepY5bwI/88TtiJ6Z899Mh6UTIItiXZ4O1ZQ9pNveM3OEOnyJKtiiA3dGehjL5KJQH NcS96p0BhYdb8RkA1b2RVl0dHCh3UCew85GcVG3FcAis6In/MbcqIHReJPCaINfCIHbm 6V0RgyUEzwqCK3stHly0tS7UW1jdBM1/6DG1pVZT8Fw1H8oBN3Ycbt4T6DbYkNxkJYEM Z3Dp4oQdgMZfPtp0tY6f6vEeC6LwA2qj6lDOsGWVPEHjPlyONaS01NqgeZKYGkIMnKck yWwVyY59XtUaRo4jCPLQVhILHYpsmhv8ZVq/TMcmvVMrsvjb90DAdZkPG6fdxL8EulbG oHqA== X-Gm-Message-State: ABy/qLZGUpo7bqiegzt0ztt8u0lNj9mqGZlquDTdhaQLx7lJGpyJ0J8m ZoV+WU3n2Bx+Ze8mT5cariy9xOC9hxc= X-Google-Smtp-Source: APBJJlFRSc43I1eF0n8ebLO/4fsePB5khymAXbCtwE2Y5Ymz547/SKlj4nwE/krZCORujMmDpbM/oA== X-Received: by 2002:a17:903:248:b0:1b6:b44d:a5b6 with SMTP id j8-20020a170903024800b001b6b44da5b6mr2794276plh.14.1690591365489; Fri, 28 Jul 2023 17:42:45 -0700 (PDT) Received: from [192.168.0.56] ([69.162.253.10]) by smtp.gmail.com with ESMTPSA id 2-20020a170902e9c200b001bba27d1b65sm4150648plk.85.2023.07.28.17.42.44 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 28 Jul 2023 17:42:44 -0700 (PDT) Message-ID: <768b086d-b386-1eb1-8e73-180daac92da4@gmail.com> Date: Fri, 28 Jul 2023 18:42:43 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US From: Jesse Gibbons Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=jgibbons2357@gmail.com; helo=mail-pl1-x62b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Guix, The current version of renpy has errors when generating a basic project due to a substitution in the `drop-game-from-paths` phase that changes too much. Attached is a patch that fixes this problem. I do not know if there is a related bug report. Thanks. From 60c49e320b6e3411eff834883ea0f733f75d8c2d Mon Sep 17 00:00:00 2001 From: Jesse Date: Fri, 28 Jul 2023 17:50:06 -0600 Subject: [PATCH] gnu: renpy: fix image reference paths. gnu/packages/game-development.scm: (renpy) fix image reference paths. --- gnu/packages/game-development.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 127cbac127..11ecc7e52c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1458,7 +1458,7 @@ (define-public renpy (lambda _ (substitute* (list "launcher/game/gui7.rpy" "launcher/game/gui7/images.py") - ((", \"game\",") ",")) + ((", \"game\", \"gui7\",") ", \"gui7\",")) #t)) (add-before 'build 'start-xserver (lambda* (#:key inputs native-inputs #:allow-other-keys) @@ -3222,3 +3222,4 @@ (define-public bbcsdl allowing you to write utilities and games, use sound and graphics, perform calculations and create complete applications.") (license license:zlib))) +renpy -- 2.41.0