From patchwork Sat Jul 29 16:39:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 52376 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 DBCB127BBEA; Sat, 29 Jul 2023 18:09:01 +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=0.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no 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 5E59927BBE2 for ; Sat, 29 Jul 2023 18:08:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPmz6-0005JE-6p; Sat, 29 Jul 2023 12:40: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 1qPmz5-0005J3-3A for guix-patches@gnu.org; Sat, 29 Jul 2023 12:40: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 1qPmz4-0004Ry-QE for guix-patches@gnu.org; Sat, 29 Jul 2023 12:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPmz4-0004lp-EO for guix-patches@gnu.org; Sat, 29 Jul 2023 12:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64925] Fwd: [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 16:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64925 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64925@debbugs.gnu.org Received: via spool by 64925-submit@debbugs.gnu.org id=B64925.169064877518300 (code B ref 64925); Sat, 29 Jul 2023 16:40:02 +0000 Received: (at 64925) by debbugs.gnu.org; 29 Jul 2023 16:39:35 +0000 Received: from localhost ([127.0.0.1]:48696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPmyc-0004l5-GF for submit@debbugs.gnu.org; Sat, 29 Jul 2023 12:39:35 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:42245) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPmyZ-0004ks-SZ for 64925@debbugs.gnu.org; Sat, 29 Jul 2023 12:39:33 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-686ba29ccb1so1926804b3a.1 for <64925@debbugs.gnu.org>; Sat, 29 Jul 2023 09:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690648765; x=1691253565; h=in-reply-to:from:to:references:content-language:subject:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=TmHcEinLP0vE87xF3jZGIUi1yQso+zKm+Dq5+4weRq4=; b=PJz4Sj7/YXvqYIjU/BvQrQS7XdxLlQVHTrpi5K70m9vn6v96ciER8WkZBlWOyT0c2S WwSdgO9+GwnphJri9r6vmnqbV/fslb7646KUkgZcIMo9HJ8tx6EbH9K+F+7d4XCWLzp+ pWzozsHw75jhmz4gMK7UO5cBJW7nLlqzYlZNP6+jiXuvXo2M0+EmhM+1aAcagxxWGErH nvKiWIrXjaqq1JQ3ktrAkRbiyBbb22py2fV955WeZrEzhAqR7hDCDGodrvg2UfQayDh1 G8xkMHlnmTdBA4w/BO2oYlmhMOuBzAsiweUav7v4eDyl/RYVRGCBHm2O3GduiDfybHxw dUNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690648765; x=1691253565; h=in-reply-to:from:to:references:content-language:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=TmHcEinLP0vE87xF3jZGIUi1yQso+zKm+Dq5+4weRq4=; b=D6bILWP6EF9+tAWY639zcZc/5Iy0GMYQxf7kFnRXCxAQTAl03DRFeUCdo/Ll6vL1M+ EZPOtb/y5wGaoBttM/uEFgH7GQZ2PVYokdoqu/IEkcSkGq09QniR+hl4ZeRi8baa5uis uQ0w+H5troaT5v5qAW8+tqKT5zFZQVIcbYFlxt0w2iSTb24r2x6fGU0HHk4dSV2QdRbM Rb6QNonZIAlJPQstqArlzgDRzweXIkHcz6vwUXVRxn0exRSPV6AiWAuzJwVV1B71OxB5 L/qq/2Dd+C+c1B6NHGBDTUX58XY5BvgpVuq7zrGzBSsRTXEVZBqNLGfAsur34DN8YZah fowg== X-Gm-Message-State: ABy/qLafQdEWUOfrX/lfyREyCoitWV/qkkObPWKaEAVCC4uA2H3EfAfa Cq6yhaxl+8Z6aW+NIAgoXFeHCTB9cZA= X-Google-Smtp-Source: APBJJlHVY+2rD30lmjpl1TgAsqS7bmrUvpAMSnW+GzPAIEjB00HMvnOP8CtEmgGSb5uLi62Ljuswyg== X-Received: by 2002:a05:6a00:2e02:b0:67f:830f:b809 with SMTP id fc2-20020a056a002e0200b0067f830fb809mr6168997pfb.3.1690648764760; Sat, 29 Jul 2023 09:39:24 -0700 (PDT) Received: from [192.168.0.56] ([69.162.253.10]) by smtp.gmail.com with ESMTPSA id k10-20020aa792ca000000b00682868714fdsm5047238pfa.95.2023.07.29.09.39.23 for <64925@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Jul 2023 09:39:24 -0700 (PDT) Message-ID: <3934b1e4-2173-c416-1445-fbaa41763cd6@gmail.com> Date: Sat, 29 Jul 2023 10:39:22 -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 References: <180a6e7b-1c08-36bd-b67c-e76cb67070b4@gmail.com> From: Jesse Gibbons In-Reply-To: <180a6e7b-1c08-36bd-b67c-e76cb67070b4@gmail.com> X-Forwarded-Message-Id: <180a6e7b-1c08-36bd-b67c-e76cb67070b4@gmail.com> 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 I have not been able to verify that this was sent other than that my mail client says it was. I sent a follow-up that I can verify actually was received and should make more sense after reading this. -------- Forwarded Message -------- Subject: Re: [PATCH] gnu: renpy: fix image reference paths. Date: Sat, 29 Jul 2023 10:12:11 -0600 From: Jesse Gibbons To: Liliana Marie Prikler , 64925@debbugs.gnu.org On 7/29/23 08:32, Liliana Marie Prikler wrote: > Am Freitag, dem 28.07.2023 um 18:42 -0600 schrieb Jesse Gibbons: >> 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. > Could you do a comparison of 'tree' when invoked on a game created with > unpatched renpy vs. patched renpy? Is this to prove that the patch fixes a problem? Ok. `guix time-machine --commit=3bb3fddb5c6e79056172e5858cdc0ee0b6b8cfaa -- shell --pure renpy -- renpy-launcher` The launcher window pops up. I click "create new project" and call it "vanilla". I go with all the defaults. It reports an error in the attached screenshot. In a clone of the repository, I check out 3bb3fddb5c6e79056172e5858cdc0ee0b6b8cfaa and apply the most recent patch. I also make sure the last line of gnu/packages/game-development.scm is renpy. `guix shell --pure -f gnu/packages/game-development.scm -- renpy-launcher` A window pops up. I click "create new project" and call it "chocolate". I go with all the defaults. The window does not report an error. In the directory I set renpy to put all the projects, I run `diff --recursive chocolate/ vanilla/ | tee generated-dir-differences.diff` The output is attached. Is there anything else you want me to do before you accept the patch? Only in chocolate/game: audio Only in chocolate/game: cache Only in chocolate/game/gui: bar Only in chocolate/game/gui: bubble.png Only in chocolate/game/gui/button: check_foreground.png Only in chocolate/game/gui/button: check_selected_foreground.png Only in chocolate/game/gui/button: hover_background.png Only in chocolate/game/gui/button: idle_background.png Only in chocolate/game/gui/button: radio_foreground.png Only in chocolate/game/gui/button: radio_selected_foreground.png Only in chocolate/game/gui/button: slot_hover_background.png Only in chocolate/game/gui/button: slot_idle_background.png Only in chocolate/game/gui/phone: bar Only in chocolate/game/gui/phone/button: check_foreground.png Only in chocolate/game/gui/phone/button: check_selected_foreground.png Only in chocolate/game/gui/phone/button: hover_background.png Only in chocolate/game/gui/phone/button: idle_background.png Only in chocolate/game/gui/phone/button: radio_foreground.png Only in chocolate/game/gui/phone/button: radio_selected_foreground.png Only in chocolate/game/gui/phone/button: slot_hover_background.png Only in chocolate/game/gui/phone/button: slot_idle_background.png Only in chocolate/game/gui/phone: scrollbar Only in chocolate/game/gui/phone: slider Only in chocolate/game/gui: scrollbar Only in chocolate/game/gui: slider Only in chocolate/game/gui: thoughtbubble.png Only in chocolate/game: gui.rpy Only in chocolate/game: gui.rpyc Only in chocolate/game: images Only in chocolate/game: log.txt Only in chocolate/game: options.rpy Only in chocolate/game: options.rpyc Only in chocolate/game: saves Only in chocolate/game: screens.rpy Only in chocolate/game: screens.rpyc Only in chocolate/game: script.rpy Only in chocolate/game: script.rpyc Only in chocolate/game: tl