From patchwork Sat Jan 23 09:58:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 26569 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 4634A27BC18; Sat, 23 Jan 2021 09:59:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BD68727BC17 for ; Sat, 23 Jan 2021 09:59:27 +0000 (GMT) Received: from localhost ([::1]:55236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3FhW-00083u-V7 for patchwork@mira.cbaines.net; Sat, 23 Jan 2021 04:59:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3Fh8-00083W-KW for guix-patches@gnu.org; Sat, 23 Jan 2021 04:59:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l3Fh8-0000VI-9j for guix-patches@gnu.org; Sat, 23 Jan 2021 04:59:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l3Fh8-0003AL-9S for guix-patches@gnu.org; Sat, 23 Jan 2021 04:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45736] [PATCH v2 2/3] gnu: python2-renpy: Update to 7.4.0. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Jan 2021 09:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45736 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45736@debbugs.gnu.org Received: via spool by 45736-submit@debbugs.gnu.org id=B45736.161139591612114 (code B ref 45736); Sat, 23 Jan 2021 09:59:02 +0000 Received: (at 45736) by debbugs.gnu.org; 23 Jan 2021 09:58:36 +0000 Received: from localhost ([127.0.0.1]:33679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3Fgi-00039K-9e for submit@debbugs.gnu.org; Sat, 23 Jan 2021 04:58:36 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:3455) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3Fge-00038p-6g for 45736@debbugs.gnu.org; Sat, 23 Jan 2021 04:58:33 -0500 Received: from localhost.localdomain (217-149-173-242.nat.highway.telekom.at [217.149.173.242]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DNBQs3Kg1z3xBm for <45736@debbugs.gnu.org>; Sat, 23 Jan 2021 10:58:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1611395909; bh=EuouBAVmnLW8ugJ4PDg+mE2BiDVgFBjFwHh4jf3t7Pg=; h=From:To:Subject:Date:In-Reply-To:References; b=DUp0NC5RZXwPtyvWh1jQhImmCPmx2to6TJH8cQIPuD30NQIxIEtz3XCoomoO8jWYV YWI4dOt1re4waPIFfPX2U9tDFEWIE05bKuvQJfej2w6zaXzkxaG4YOK07Tsaq0Z/jh etYqQ4HmQXxCjNQz+NPpvzlMiNag1+jGbR75cYPM= From: Leo Prikler Date: Sat, 23 Jan 2021 10:58:02 +0100 Message-Id: <20210123095802.9500-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210123095802.9500-1-leo.prikler@student.tugraz.at> References: <20210123095802.9500-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (python2-renpy): Update to 7.4.0. (inputs): Move python2-pygame... (propagated-inputs): ... to here. Add python2-future. (#:phases)[install]: Infer python version from input. * gnu/packages/patches/renpy-use-system-fribidi.patch: Update to renpy 7.4.0. python2-renpy: propagate python inputs --- gnu/packages/game-development.scm | 13 ++++++----- .../patches/renpy-use-system-fribidi.patch | 23 +++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 02e110ec0d..4e218b5205 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1115,13 +1115,13 @@ developed mainly for Ren'py.") (define-public python2-renpy (package (name "python2-renpy") - (version "7.3.5") + (version "7.4.0") (source (origin (method url-fetch) (uri (string-append "https://www.renpy.org/dl/" version "/renpy-" version "-source.tar.bz2")) - (sha256 (base32 "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4")) + (sha256 (base32 "0av3mbh54xh6i3rvf60x5hbsjcfpzgia2j958mhyc5826zjxzfpg")) (modules '((guix build utils))) (patches (search-patches @@ -1178,8 +1178,8 @@ developed mainly for Ren'py.") ;; (both source and compiled) in the same directory. (let* ((out (assoc-ref outputs "out")) (site (string-append "/lib/python" - ,(version-major+minor - (package-version python-2)) + (python-version + (assoc-ref inputs "python")) "/site-packages"))) (with-directory-excursion "module" (apply (assoc-ref %standard-phases 'install) args)) @@ -1192,9 +1192,11 @@ developed mainly for Ren'py.") ("fribidi" ,fribidi) ("glew" ,glew) ("libpng" ,libpng) - ("python2-pygame" ,python2-pygame-sdl2) ("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))))) + (propagated-inputs + `(("python2-future" ,python2-future) + ("python2-pygame" ,python2-pygame-sdl2))) (native-inputs `(("python2-cython" ,python2-cython) ("xdg-utils" ,xdg-utils))) @@ -1208,7 +1210,6 @@ modules of Ren'py.") (package (inherit python2-renpy) (name "renpy") - (version "7.3.5") (build-system python-build-system) (arguments `(#:tests? #f ; see python2-renpy diff --git a/gnu/packages/patches/renpy-use-system-fribidi.patch b/gnu/packages/patches/renpy-use-system-fribidi.patch index 1437274bcc..913415e317 100644 --- a/gnu/packages/patches/renpy-use-system-fribidi.patch +++ b/gnu/packages/patches/renpy-use-system-fribidi.patch @@ -2,22 +2,27 @@ See also [Arch] and [Gentoo] for similar patches in other distros. [Arch] https://github.com/archlinux/svntogit-community/blob/packages/renpy/trunk/renpy-system-fribidi.patch [Gentoo] https://gitweb.gentoo.org/repo/gentoo.git/tree/games-engines/renpy/files/renpy-7.3.5-use-system-fribidi.patch -Index: renpy-7.3.5-source/module/renpybidicore.c +Index: renpy-7.4.0-source/module/renpybidicore.c =================================================================== ---- renpy-7.3.5-source.orig/module/renpybidicore.c -+++ renpy-7.3.5-source/module/renpybidicore.c -@@ -1,5 +1,5 @@ +--- renpy-7.4.0-source.orig/module/renpybidicore.c ++++ renpy-7.4.0-source/module/renpybidicore.c +@@ -1,9 +1,3 @@ #include +- +-#ifdef RENPY_BUILD + #include +-#else -#include -+#include +-#endif +- #include #ifndef alloca -Index: renpy-7.3.5-source/module/setup.py +Index: renpy-7.4.0-source/module/setup.py =================================================================== ---- renpy-7.3.5-source.orig/module/setup.py -+++ renpy-7.3.5-source/module/setup.py -@@ -119,30 +119,13 @@ cython( +--- renpy-7.4.0-source.orig/module/setup.py ++++ renpy-7.4.0-source/module/setup.py +@@ -125,30 +125,13 @@ cython( sdl + [ png, 'z', 'm' ]) FRIBIDI_SOURCES = """