From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 09 03:40:04 2021 Received: (at submit) by debbugs.gnu.org; 9 Jan 2021 08:40:04 +0000 Received: from localhost ([127.0.0.1]:51195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ky9n1-0004Nn-U7 for submit@debbugs.gnu.org; Sat, 09 Jan 2021 03:40:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:34118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ky9n1-0004Nf-18 for submit@debbugs.gnu.org; Sat, 09 Jan 2021 03:40:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ky9n0-0003gs-QL for guix-patches@gnu.org; Sat, 09 Jan 2021 03:40:02 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:60290) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ky9mx-0008Gk-Dm for guix-patches@gnu.org; Sat, 09 Jan 2021 03:40:01 -0500 Received: from nijino.local (217-149-174-13.nat.highway.telekom.at [217.149.174.13]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DCYLb2XBVz3wYg for ; Sat, 9 Jan 2021 09:39:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1610181591; bh=R7MMGZHRU6SQsL3L3EHrELY9I1ao1THIzlgoSAb9EVk=; h=Subject:From:To:Date; b=U14u14PcObpCoc5Dc7VoGkEF9kCjzoxkC25hlP2xrGMwKWHrwB3NLJWUqwjdC1b4g 7z8snV0Yjpa3mQYnwD4lwAAKaEQHoE1UZtd5t4HwXDNiwwrek6jWMyZl6aMRdueeOI ZhFDKqLuqykCiLGoSID13HgRIxcVg83GqxAbOKSI= Message-ID: <87d9325eeb202a876c80652131de9f2f8cdcfce8.camel@student.tugraz.at> Subject: [PATCH 0/2] Update Renpy From: Leo Prikler To: guix-patches@gnu.org Date: Sat, 09 Jan 2021 09:39:50 +0100 Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello Guix, last year, Ren'py was updated to 7.4.0. It appears to still need to be run on Python2 (despite a Python3 compatibility mode being added) with full Python3 support being on the way for 8.0. At least I haven't yet been able to build python3 versions of those packages, but I've tried to make porting a little smoother in the future. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 09 03:58:48 2021 Received: (at 45736) by debbugs.gnu.org; 9 Jan 2021 08:58:48 +0000 Received: from localhost ([127.0.0.1]:51202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyA59-0004nq-Ll for submit@debbugs.gnu.org; Sat, 09 Jan 2021 03:58:48 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:9750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyA57-0004ne-VH for 45736@debbugs.gnu.org; Sat, 09 Jan 2021 03:58:46 -0500 Received: from localhost.localdomain (217-149-174-13.nat.highway.telekom.at [217.149.174.13]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DCYmK2F1rz3wVn for <45736@debbugs.gnu.org>; Sat, 9 Jan 2021 09:58:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1610182721; bh=EVuMBs6eIS7Yw59VuL2Zm1p+iy8qePATX2wR4LQ6xnc=; h=From:To:Subject:Date; b=jSJGjW+jeLt3/2nlr1KQTTu4ORt4ILm24xlMG2+SANhPQJEuz5NnTgryNdR7x01Lu c0kOD9Saw2sR+6e/DOobLNFvswkeROr06LoOpEjn6L1ecxAI39BVWkWtEqsQgGZaw4 mpHwN6WJBqOkTOBYkyExEeqfLr1oAar0RqMb2n28= From: Leo Prikler To: 45736@debbugs.gnu.org Subject: [PATCH 1/2] gnu: python2-pygame-sdl2: Update to renpy-version 7.4.0. Date: Sat, 9 Jan 2021 09:58:12 +0100 Message-Id: <20210109085812.17500-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45736 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/game-development.scm (python2-pygame-sdl2): Update to renpy-version 7.4.0. --- gnu/packages/game-development.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index fa7875d077..02e110ec0d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1062,7 +1062,7 @@ to create fully featured games and multimedia programs in the python language.") (define-public python2-pygame-sdl2 (let ((real-version "2.1.0") - (renpy-version "7.3.5")) + (renpy-version "7.4.0")) (package (inherit python2-pygame) (name "python2-pygame-sdl2") @@ -1072,13 +1072,13 @@ to create fully featured games and multimedia programs in the python language.") (method url-fetch) (uri (string-append "https://www.renpy.org/dl/" renpy-version "/pygame_sdl2-" version ".tar.gz")) - (sha256 (base32 "1bmr7j9mlsc4czpgw70ld15ymyp4wxrk9hdsqad40wjwdxvvg2dr")) + (sha256 (base32 "04hnfy1zbncs8n0m46sh6r8l55l2bz5y08a1birkhlri13f8zc29")) (modules '((guix build utils))) (snippet '(begin ;; drop generated sources (delete-file-recursively "gen") - (delete-file-recursively "gen3") + (delete-file-recursively "gen-static") #t)))) (build-system python-build-system) (arguments -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 09 03:58:49 2021 Received: (at 45736) by debbugs.gnu.org; 9 Jan 2021 08:58:49 +0000 Received: from localhost ([127.0.0.1]:51204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyA5B-0004o1-2S for submit@debbugs.gnu.org; Sat, 09 Jan 2021 03:58:49 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:9953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyA59-0004nh-0M for 45736@debbugs.gnu.org; Sat, 09 Jan 2021 03:58:47 -0500 Received: from localhost.localdomain (217-149-174-13.nat.highway.telekom.at [217.149.174.13]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DCYmM6LsRz3xNt for <45736@debbugs.gnu.org>; Sat, 9 Jan 2021 09:58:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1610182723; bh=yYLdmpqCICMx8AO8K24dj+jGNYI6UWoeFgTm0/R5YA0=; h=From:To:Subject:Date:In-Reply-To:References; b=njTrxp+NUW+v5R8Ql0IVyBrUHuTRzg7LfllItK+6wKwhbaqNrlbuWTroeSLHE+Inm oEKQNywKGRdQBGSdEXlgjcVZPaAyVVB2Y6nNWBkYibStC5z1bD2dwYEBPlXki3weBT QbBkHOffmdpZtrJJ1hvGUCbhwJqCrY3SFlonfGiQ= From: Leo Prikler To: 45736@debbugs.gnu.org Subject: [PATCH 2/2] gnu: python2-renpy: Update to 7.4.0. Date: Sat, 9 Jan 2021 09:58:13 +0100 Message-Id: <20210109085812.17500-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210109085812.17500-1-leo.prikler@student.tugraz.at> References: <20210109085812.17500-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45736 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/game-development.scm (python2-renpy): Update to 7.4.0. (inputs): Add python2-future. (#:phases)[install]: Infer python version from input. * gnu/packages/patches/renpy-use-system-fribidi.patch: Update to renpy 7.4.0. --- gnu/packages/game-development.scm | 10 ++++---- .../patches/renpy-use-system-fribidi.patch | 23 +++++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 02e110ec0d..863575d835 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,6 +1192,7 @@ developed mainly for Ren'py.") ("fribidi" ,fribidi) ("glew" ,glew) ("libpng" ,libpng) + ("python2-future" ,python2-future) ("python2-pygame" ,python2-pygame-sdl2) ("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))))) @@ -1208,7 +1209,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 = """ -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 23 04:58:33 2021 Received: (at 45736) by debbugs.gnu.org; 23 Jan 2021 09:58:33 +0000 Received: from localhost ([127.0.0.1]:33676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3Fgf-00038x-1b for submit@debbugs.gnu.org; Sat, 23 Jan 2021 04:58:33 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:59102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3Fgc-00038m-Tx for 45736@debbugs.gnu.org; Sat, 23 Jan 2021 04:58:32 -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 4DNBQq2RcSz3wYd for <45736@debbugs.gnu.org>; Sat, 23 Jan 2021 10:58:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1611395907; bh=EVuMBs6eIS7Yw59VuL2Zm1p+iy8qePATX2wR4LQ6xnc=; h=From:To:Subject:Date; b=bN7kICDlxPF6vRK63bgCfXuskP+AYE78zBv4dsAXA65zAi9QsJqJZ01Nb8JgHGq0E B8uBXjXVwULczeLJe352LQ1LqLkE6JYoJfEEjBIKkZOpsAQ+W5nhozp45/OSlS17bv GQ9Pe7XdnqCqaz0YWRmeP5wiHvSNEhr0LZTf2cSI= From: Leo Prikler To: 45736@debbugs.gnu.org Subject: [PATCH v2 1/3] gnu: python2-pygame-sdl2: Update to renpy-version 7.4.0. Date: Sat, 23 Jan 2021 10:58:01 +0100 Message-Id: <20210123095802.9500-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45736 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/game-development.scm (python2-pygame-sdl2): Update to renpy-version 7.4.0. --- gnu/packages/game-development.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index fa7875d077..02e110ec0d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1062,7 +1062,7 @@ to create fully featured games and multimedia programs in the python language.") (define-public python2-pygame-sdl2 (let ((real-version "2.1.0") - (renpy-version "7.3.5")) + (renpy-version "7.4.0")) (package (inherit python2-pygame) (name "python2-pygame-sdl2") @@ -1072,13 +1072,13 @@ to create fully featured games and multimedia programs in the python language.") (method url-fetch) (uri (string-append "https://www.renpy.org/dl/" renpy-version "/pygame_sdl2-" version ".tar.gz")) - (sha256 (base32 "1bmr7j9mlsc4czpgw70ld15ymyp4wxrk9hdsqad40wjwdxvvg2dr")) + (sha256 (base32 "04hnfy1zbncs8n0m46sh6r8l55l2bz5y08a1birkhlri13f8zc29")) (modules '((guix build utils))) (snippet '(begin ;; drop generated sources (delete-file-recursively "gen") - (delete-file-recursively "gen3") + (delete-file-recursively "gen-static") #t)))) (build-system python-build-system) (arguments -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 23 04:58:36 2021 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 To: 45736@debbugs.gnu.org Subject: [PATCH v2 2/3] gnu: python2-renpy: Update to 7.4.0. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45736 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 = """ -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 23 04:58:42 2021 Received: (at 45736) by debbugs.gnu.org; 23 Jan 2021 09:58:42 +0000 Received: from localhost ([127.0.0.1]:33681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3Fgk-00039T-LC for submit@debbugs.gnu.org; Sat, 23 Jan 2021 04:58:42 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:3733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3Fgg-00039A-C9 for 45736@debbugs.gnu.org; Sat, 23 Jan 2021 04:58:36 -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 4DNBQv4pYsz3xNC for <45736@debbugs.gnu.org>; Sat, 23 Jan 2021 10:58:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1611395911; bh=EgfTHJhnnqGnlrO8Oxo7U6u48wn38Z63tsX1fwcPt+A=; h=From:To:Subject:Date:In-Reply-To:References; b=OC18YNDVcFMJB55cqY+7gi641yAHZQr67yZze3XL2EfZoYDzO1pX4/A320/jktKvI CK/oKrqTf/uucvSNAUnQ0qkRyO6J7171LbXvGqmIKT+/nNY4VU4ree7odu1u4GEP8w vfpvjDXff/2IQKPid1+r0zeopNP6DlmWbK+uoEec= From: Leo Prikler To: 45736@debbugs.gnu.org Subject: [PATCH v2 3/3] gnu: Minor whitespace cleanup. Date: Sat, 23 Jan 2021 10:58:03 +0100 Message-Id: <20210123095802.9500-3-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 45736 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) * gnu/packages/game-development.scm: Update copyright line for previous renpy commits. (love-nuklear): Strip space at the end of the line. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 4e218b5205..5bb26897a9 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017, 2019 Rutger Helling ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt -;;; Copyright © 2019, 2020 Leo Prikler +;;; Copyright © 2019, 2020, 2021 Leo Prikler ;;; Copyright © 2019 Jethro Cao ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Timotej Lazar @@ -722,7 +722,7 @@ programming language.") (url "https://github.com/keharriso/love-nuklear/") (commit commit) (recursive? #t))) - ;; NOTE: the HEAD of the Nuklear git-submodule is at commit + ;; NOTE: the HEAD of the Nuklear git-submodule is at commit ;; "adc52d710fe3c87194b99f540c53e82eb75c2521" of Oct 1 2019 (file-name (git-file-name name version)) (sha256 -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 07 09:29:19 2021 Received: (at 45736-done) by debbugs.gnu.org; 7 Feb 2021 14:29:19 +0000 Received: from localhost ([127.0.0.1]:47216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l8l3u-0008Ar-RB for submit@debbugs.gnu.org; Sun, 07 Feb 2021 09:29:19 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:47346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l8l3q-0008Aa-T4; Sun, 07 Feb 2021 09:29:16 -0500 Received: from nijino.local (217-149-173-242.nat.highway.telekom.at [217.149.173.242]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DYWkG1kjXz1LBMx; Sun, 7 Feb 2021 15:29:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DYWkG1kjXz1LBMx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1612708150; bh=8CdYFj7IiZtgFH+nWu4A3cs/iOxskF3gpHa5qij70eg=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=iZ7UOMSS6o4sfLXJS7GqRluWR1Uq0226KqSDbMTpq10utjCfcLeQiPJGNJFcY3sWW jUEmHlN682hDgrBrdDNwT2+SybgI+HhxMSRtpfR4PWW+PD/WdVMELcwwLQyq73710L hd5uFvlmQxgYp4OpPGuzgSS6gk1DTCPEfd0gifhY= Message-ID: <2e82cd8cb0882ac3fde3b52b9ae897bb27ed32ba.camel@student.tugraz.at> Subject: Re: [bug#46053] [PATCH 0/2] Add Ren'py build system From: Leo Prikler To: Nicolas Goaziou Date: Sun, 07 Feb 2021 15:29:09 +0100 In-Reply-To: <87czxuen33.fsf@nicolasgoaziou.fr> References: <6bf051d15833939d09f190d11cdbbf7954fdc3c0.camel@student.tugraz.at> <87czxuen33.fsf@nicolasgoaziou.fr> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45736-done Cc: 46053-done@debbugs.gnu.org, 45736-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Am Sonntag, den 24.01.2021, 09:49 +0100 schrieb Nicolas Goaziou: > LGTM, in addition to #45736. I've now pushed both this (well, v2 of it) and #45736. > It should also be documented in the manual. Documentation is present in v2, which I've pushed. I hope it's sufficient. Regards, Leo. From unknown Mon Jun 23 04:15:39 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 08 Mar 2021 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator