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