From patchwork Sat Jul 3 09:28:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31077 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 3726B27BC83; Sat, 3 Jul 2021 10:31:33 +0100 (BST) 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,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 BBCFB27BC78 for ; Sat, 3 Jul 2021 10:31:32 +0100 (BST) Received: from localhost ([::1]:59304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzbzn-0005qe-Pz for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 05:31:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzbzK-0005oK-8K for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzbzK-0005Nl-0X for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzbzJ-00057C-Rn for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH v2 1/5] gnu: python2-renpy: Drop unused Ren'py sources. References: In-Reply-To: Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 09:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.162530462219578 (code B ref 49329); Sat, 03 Jul 2021 09:31:01 +0000 Received: (at 49329) by debbugs.gnu.org; 3 Jul 2021 09:30:22 +0000 Received: from localhost ([127.0.0.1]:37935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyg-00055c-3z for submit@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:22 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:19714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyb-00055C-Jf for 49329@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:21 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GH69y24vBz1DH93 for <49329@debbugs.gnu.org>; Sat, 3 Jul 2021 11:30:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GH69y24vBz1DH93 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625304614; bh=lA5L/EsAsgLJWfrQOoiB16ZKio35y+k8aIbb7YRTpDE=; h=From:To:Subject:Date:From; b=uqxnLcmdY12IydZxxbNLDLhoICwLUGIS6A344T8pfGkH7QxFrS7v3LmJ78DyoG1EG Fm1vRK9Q/jG4k52VmKOitU4Qf0f+AmJs6Fz0twjk8Yn3XLj7eURQ3AzRoAYa/X+CSB xiUIausNBsqIpXLjdnZAJZSn5yg5iHAAVLG1wYEs= From: Leo Prikler Date: Sat, 3 Jul 2021 11:28:39 +0200 Message-Id: <20210703092842.32189-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 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 These sources are written in Ren'py (the language) and thus not particularly useful before renpy itself is built. In particular, they serve no purpose when installed without prior compilation. * gnu/packages/game-development.scm (python2-renpy)[#:phases]: Drop installed "common" folder. (renpy)[#:phases]: Adjust comment accordingly. --- 0001 up to 0004 are identical to v1. gnu/packages/game-development.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 9069b88d0c..22c44a585c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1230,7 +1230,8 @@ developed mainly for Ren'py.") (with-directory-excursion "module" (apply (assoc-ref %standard-phases 'install) args)) (copy-recursively "renpy" - (string-append out site "/renpy"))) + (string-append out site "/renpy")) + (delete-file-recursively (string-append out site "/renpy/common"))) #t))))) (inputs `(("ffmpeg" ,ffmpeg) @@ -1304,11 +1305,14 @@ modules of Ren'py.") ;; After finishing this step, "out" will have the following: ;; |-- bin/renpy ;; `-- share/renpy ; i.e. path_to_renpy_base() - ;; `-- common + ;; |-- common + ;; `-- gui ;; - ;; Note that common is also a de facto unused directory in - ;; python2-renpy. On other systems, renpy_base would point to - ;; site-packages or even somewhere in /opt. + ;; Note that common shares the source files that would be installed + ;; by python2-renpy (which are instead deleted from that package), + ;; but also contains their byte-compiled versions. + ;; On other systems, renpy_base would point to site-packages or + ;; even somewhere in /opt. ;; The former approach is not as straightforward as it seems ;; -- it causes renpy to load files twice for some weird reason -- ;; and the latter is impossible on Guix. Hence the detour through @@ -1319,9 +1323,11 @@ modules of Ren'py.") ;; well. This differs from the traditional layout, which is ;; roughly the following: ;; `-- Super Awesome Game - ;; |-- game ; <- the folder we actually want - ;; |-- lib ; compiled renpy module and dependencies - ;; |-- renpy ; Ren'py python code (source + compiled) + ;; |-- game ; <- the folder we actually want + ;; |-- lib ; compiled renpy module and dependencies + ;; |-- renpy ; yet another copy of Ren'py's code + ;; | |-- common ; the common folder from above + ;; | `-- ... ; Python code (source + compiled) ;; |-- Super Awesome Game.py ;; `-- Super Awesome Game.sh (let* ((out (assoc-ref outputs "out")) From patchwork Sat Jul 3 09:28:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31079 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 D35EE27BC83; Sat, 3 Jul 2021 10:31:36 +0100 (BST) 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,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 7F03D27BC78 for ; Sat, 3 Jul 2021 10:31:36 +0100 (BST) Received: from localhost ([::1]:59348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzbzr-0005sA-IL for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 05:31:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzbzK-0005oL-HQ for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzbzK-0005Ns-9n for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzbzK-00057K-7q for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH v2 2/5] gnu: python2-renpy: Update description. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 09:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.162530463419603 (code B ref 49329); Sat, 03 Jul 2021 09:31:02 +0000 Received: (at 49329) by debbugs.gnu.org; 3 Jul 2021 09:30:34 +0000 Received: from localhost ([127.0.0.1]:37937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyg-00055j-El for submit@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:34 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:30703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyc-00055F-1S for 49329@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:21 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GH69z610Tz1DH95 for <49329@debbugs.gnu.org>; Sat, 3 Jul 2021 11:30:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GH69z610Tz1DH95 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625304615; bh=nANYCQgDug04g5rFTR1sA9gKOTwQB1UH8kSbbn8r/pw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=kZFgPx87yhyrdINIri9sIW2spa+V4p7fA2wXAPCZGQaoNEHuIOrxDdEDdBosyeX/F 1Gm3IHaBxvCWERaKT6ZXm+HOtkTIA6RL8F5zq/ffdcI6l932FVOvfCnTq/Via+lqWt k6sx6EyEaYWpIhweSUxaTt8MflTpwHWLhlbPby8E= From: Leo Prikler Date: Sat, 3 Jul 2021 11:28:40 +0200 Message-Id: <20210703092842.32189-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210703092842.32189-1-leo.prikler@student.tugraz.at> References: <20210703092842.32189-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)[description]: Mention, that it's only used for bootstrapping renpy. --- gnu/packages/game-development.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 22c44a585c..9b231ad333 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1250,8 +1250,10 @@ developed mainly for Ren'py.") ("xdg-utils" ,xdg-utils))) (home-page "https://www.renpy.org/") (synopsis "Ren'py python module") - (description "This package contains the shared libraries and Python -modules of Ren'py.") + (description "This package contains the shared libraries and Python modules +of Ren'py. While functional, they are not meaningful on their own without +the launcher and common Ren'py code provided by the @code{renpy} package and +are only used to bootstrap it.") (license license:expat))) (define-public renpy From patchwork Sat Jul 3 09:28:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31078 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 74E2727BC78; Sat, 3 Jul 2021 10:31:33 +0100 (BST) 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,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 CC87D27BC81 for ; Sat, 3 Jul 2021 10:31:32 +0100 (BST) Received: from localhost ([::1]:59302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzbzn-0005qc-Q9 for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 05:31:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzbzK-0005oM-T1 for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzbzK-0005O2-Lg for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzbzK-00057R-Jn for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH v2 3/5] gnu: python2-renpy: Correct inputs. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 09:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.162530463519612 (code B ref 49329); Sat, 03 Jul 2021 09:31:02 +0000 Received: (at 49329) by debbugs.gnu.org; 3 Jul 2021 09:30:35 +0000 Received: from localhost ([127.0.0.1]:37940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbys-000568-9W for submit@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:35 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:43821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyd-00055H-Qn for 49329@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:21 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GH6B147lNz1LXt0 for <49329@debbugs.gnu.org>; Sat, 3 Jul 2021 11:30:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GH6B147lNz1LXt0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625304617; bh=Ycr2IQssYLQZ0/LJO/vvIHi3XUiaKR79eZCG4OsUlB4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gO+/5ESXmHd3s/bL2HdEKW483fORQVNOzzCWX7VZOwSonqQm29pJ5i4jNnEeut3KM lX0EGuOuDiv6Btd/4Olq+2yBcPdjryZGdFlPZkzL0Fmrxn5ojTyZpkU5viNzBfzxtP xs5bhtB3d5CrYD/zdSKGmgqGQ1l1a/7XKJmp4+UU= From: Leo Prikler Date: Sat, 3 Jul 2021 11:28:41 +0200 Message-Id: <20210703092842.32189-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210703092842.32189-1-leo.prikler@student.tugraz.at> References: <20210703092842.32189-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)[#:phases]: Search for ‘xdg-open’ in inputs. : Search for ‘cython’ in native-inputs. [native-inputs]: Move ‘xdg-utils’ from here… [inputs]: … to here. --- gnu/packages/game-development.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 9b231ad333..7c5d45c412 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1186,10 +1186,11 @@ developed mainly for Ren'py.") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-commands - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "renpy/editor.py" (("xdg-open") - (which "xdg-open"))) + (string-append (assoc-ref inputs "xdg-utils") + "/bin/xdg-open"))) #t)) (add-after 'unpack 'fix-include-paths (lambda* (#:key inputs #:allow-other-keys) @@ -1199,9 +1200,10 @@ developed mainly for Ren'py.") "/include/fribidi"))) #t)) (add-after 'set-paths 'set-build-vars - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) (setenv "RENPY_CYTHON" - (string-append (assoc-ref inputs "python2-cython") + (string-append (assoc-ref (or native-inputs inputs) + "python2-cython") "/bin/cython")) (setenv "RENPY_DEPS_INSTALL" (string-join (map cdr inputs) ":")) #t)) @@ -1240,14 +1242,14 @@ developed mainly for Ren'py.") ("glew" ,glew) ("libpng" ,libpng) ("sdl-union" - ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))))) + ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) + ("xdg-utils" ,xdg-utils))) (propagated-inputs `(("python2-future" ,python2-future) ("python2-pygame" ,python2-pygame-sdl2))) (native-inputs `(("gcc" ,gcc-8) ; for const variables as initializer elements - ("python2-cython" ,python2-cython) - ("xdg-utils" ,xdg-utils))) + ("python2-cython" ,python2-cython))) (home-page "https://www.renpy.org/") (synopsis "Ren'py python module") (description "This package contains the shared libraries and Python modules From patchwork Sat Jul 3 09:28:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31081 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 EB80D27BC81; Sat, 3 Jul 2021 10:31:59 +0100 (BST) 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,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 789AF27BC78 for ; Sat, 3 Jul 2021 10:31:59 +0100 (BST) Received: from localhost ([::1]:60154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzc0E-0006TC-GJ for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 05:31:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzbzO-0005py-CZ for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzbzL-0005Om-19 for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzbzK-00057Y-WA for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH v2 4/5] gnu: renpy: Correct inputs. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 09:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.162530463519619 (code B ref 49329); Sat, 03 Jul 2021 09:31:02 +0000 Received: (at 49329) by debbugs.gnu.org; 3 Jul 2021 09:30:35 +0000 Received: from localhost ([127.0.0.1]:37942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyt-00056G-5u for submit@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:35 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:43983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyf-00055R-Lq for 49329@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:22 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GH6B32cVMz1LXt4 for <49329@debbugs.gnu.org>; Sat, 3 Jul 2021 11:30:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GH6B32cVMz1LXt4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625304619; bh=vrUaaG1fXhNhDOq9hmM/m+xmUmqF0kxH5AbZL969yfY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Ik8LiEAgkHk/12gXymifLoOpBePbN/YLHTcv1TsGt5h+ClcBN741/X3mx8didLqFl DjZH91yCbJ4WG00Q8olw4qQTe5NfL/ofvIwFjTlb0F9EIl45Mr9VbdinH/GeoBqJNY qrFxku6eTFJg6no9m1LxVpMhYHum274FM+pGqgdk= From: Leo Prikler Date: Sat, 3 Jul 2021 11:28:42 +0200 Message-Id: <20210703092842.32189-4-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210703092842.32189-1-leo.prikler@student.tugraz.at> References: <20210703092842.32189-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 (renpy)[#:modules]: Add SRFI-1. [#:imported-modules]: Likewise. [#:phases]: Search for ‘python2’ and ‘xdg-open’ in inputs. : Search for ‘xorg-server’ in native-inputs. : Search for ‘python2’ in inputs. : Search for python dependencies in inputs. [inputs]: Add python2, drop python2-pygame (already propagated by python2-renpy). Move xorg-server from here… [native-inputs]: … to here. [propagated-inputs]: Empty. --- gnu/packages/game-development.scm | 54 +++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7c5d45c412..5d5fa5cf8b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1266,15 +1266,22 @@ are only used to bootstrap it.") (arguments `(#:tests? #f ; see python2-renpy #:python ,python-2 + #:modules ((srfi srfi-1) + (guix build python-build-system) + (guix build utils)) + #:imported-modules ((srfi srfi-1) ,@%python-build-system-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-commands - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "launcher/game/choose_directory.rpy" - (("/usr/bin/python") (which "python2"))) + (("/usr/bin/python") + (string-append (assoc-ref inputs "python2") + "/bin/python2"))) (substitute* "launcher/game/front_page.rpy" (("xdg-open") - (which "xdg-open"))) + (string-append (assoc-ref inputs "xdg-utils") + "/bin/xdg-open"))) (substitute* "launcher/game/project.rpy" (("cmd = \\[ executable, \"-EO\", sys.argv\\[0\\] \\]") (string-append "cmd = [ \"" (assoc-ref outputs "out") @@ -1291,8 +1298,9 @@ are only used to bootstrap it.") ((", \"game\",") ",")) #t)) (add-before 'build 'start-xserver - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref (or native-inputs inputs) + "xorg-server"))) (setenv "HOME" (getcwd)) (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) (setenv "DISPLAY" ":1") @@ -1344,7 +1352,8 @@ are only used to bootstrap it.") (call-with-output-file bin/renpy (lambda (port) - (format port "#!~a~%" (which "python2")) + (format port "#!~a/bin/python2~%" + (assoc-ref inputs "python2")) (format port " from __future__ import print_function @@ -1433,15 +1442,32 @@ if __name__ == \"__main__\": #t)) (replace 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/renpy") - `("PYTHONPATH" = (,(getenv "PYTHONPATH")))) - #t))))) + (let ((out (assoc-ref outputs "out")) + (site (string-append "/lib/python" + (python-version + (assoc-ref inputs "python")) + "/site-packages"))) + (wrap-program (string-append out "/bin/renpy") + `("PYTHONPATH" = + (,@(delete-duplicates + (map + (lambda (store-path) + (string-append store-path site)) + (cons (assoc-ref outputs "out") + (map cdr + (filter + (lambda (input) + (string-prefix? "python2" (car input))) + inputs)))))))) + #t)))))) (inputs - `(("python2-tkinter" ,python-2 "tk") - ("python2-pygame" ,python2-pygame-sdl2) - ("python2-renpy" ,python2-renpy) - ("xorg-server" ,xorg-server))) + `(("python2-renpy" ,python2-renpy) + ("python2-tkinter" ,python-2 "tk") + ("python2" ,python-2) ; for ‘fix-commands’ and ‘wrap’ + ("xdg-utils" ,xdg-utils))) + (propagated-inputs '()) + (native-inputs + `(("xorg-server" ,xorg-server-for-tests))) (outputs (list "out" "tutorial" "the-question")) (home-page "https://www.renpy.org/") From patchwork Sat Jul 3 09:28:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31080 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 1531127BC78; Sat, 3 Jul 2021 10:31:37 +0100 (BST) 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,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 87A2627BC81 for ; Sat, 3 Jul 2021 10:31:36 +0100 (BST) Received: from localhost ([::1]:59332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzbzr-0005rx-K9 for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 05:31:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzbzO-0005pu-CT for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzbzL-0005PG-Ee for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzbzL-00057g-C2 for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH v2 5/5] gnu: Add python-pygame-sdl2. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 09:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.162530463519625 (code B ref 49329); Sat, 03 Jul 2021 09:31:03 +0000 Received: (at 49329) by debbugs.gnu.org; 3 Jul 2021 09:30:35 +0000 Received: from localhost ([127.0.0.1]:37944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyt-00056O-IN for submit@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:35 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:31195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyh-00055q-GF for 49329@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:23 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GH6B51XBJz1LZVs for <49329@debbugs.gnu.org>; Sat, 3 Jul 2021 11:30:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GH6B51XBJz1LZVs DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625304621; bh=TACTcAQTzZRNdB1nu7ByqgpxhYNYoQTIM8TSxqVrI14=; h=From:To:Subject:Date:In-Reply-To:References:From; b=kdtSwQRmHAIHHqDztZV8KLffrvxPV1FjznetjJUAfewSw+k6JP+Zqzh+dGGli4zOp C30fHNIEw+l/DVs1Z06yNbPzIHbn0ogtv2HQAbW2GsEBBg6Q1SYBrrqdqUvPA5Io6q R2zqaRXQmIwRoczBBPVivVbACP3mTUWsg4KQHP1Y= From: Leo Prikler Date: Sat, 3 Jul 2021 11:28:43 +0200 Message-Id: <20210703092842.32189-5-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210703092842.32189-1-leo.prikler@student.tugraz.at> References: <20210703092842.32189-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 (python-pygame-sdl2): New variable. Inherit package definition from previous python2-pygame-sdl2, with the following additions: [source]: Also drop “gen3” in snippet. [arguments]: Drop #:python. [native-inputs]: Use ‘python-cython’ instead of ‘python2-cython’. (python2-pygame-sdl2): Define in terms of python-pygame-sdl2. --- gnu/packages/game-development.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5d5fa5cf8b..e1593c0f82 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1106,12 +1106,12 @@ to create fully featured games and multimedia programs in the python language.") (define-public python2-pygame (package-with-python2 python-pygame)) -(define-public python2-pygame-sdl2 +(define-public python-pygame-sdl2 (let ((real-version "2.1.0") (renpy-version "7.4.6")) (package - (inherit python2-pygame) - (name "python2-pygame-sdl2") + (inherit python-pygame) + (name "python-pygame-sdl2") (version (string-append real-version "-for-renpy-" renpy-version)) (source (origin @@ -1124,12 +1124,12 @@ to create fully featured games and multimedia programs in the python language.") '(begin ;; drop generated sources (delete-file-recursively "gen") + (delete-file-recursively "gen3") (delete-file-recursively "gen-static") #t)))) (build-system python-build-system) (arguments `(#:tests? #f ; tests require pygame to be installed first - #:python ,python-2 #:phases (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-vars @@ -1149,7 +1149,7 @@ to create fully featured games and multimedia programs in the python language.") `(("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))))) (native-inputs - `(("python2-cython" ,python2-cython))) + `(("python-cython" ,python-cython))) (home-page "https://www.renpy.org/") (synopsis "Reimplementation of the Pygame API using SDL2") (description "Pygame_SDL2 reimplements the Pygame API using SDL2, @@ -1158,6 +1158,9 @@ While it aims to be used as a drop-in replacement, it appears to be developed mainly for Ren'py.") (license (list license:lgpl2.1 license:zlib))))) +(define-public python2-pygame-sdl2 + (package-with-python2 python-pygame-sdl2)) + (define-public python2-renpy (package (name "python2-renpy")