* [bug#52595] [PATCH 1/5] gnu: python-future: Fix sanity check.
2021-12-17 19:52 [bug#52595] [PATCH 0/5] Update Ren'py to 7.4.11 Liliana Marie Prikler
@ 2021-12-17 17:56 ` Liliana Marie Prikler
2021-12-17 18:22 ` [bug#52595] [PATCH 2/5] gnu: python2-renpy: Do not delete non-existing file Liliana Marie Prikler
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2021-12-17 17:56 UTC (permalink / raw)
To: 52595
* gnu/packages/python-xyz.scm (python-future): Exclude winreg and tkinter from
sanity check.
---
gnu/packages/python-xyz.scm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 13d883c26d..3970153894 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14780,7 +14780,24 @@ (define-public python-future
;; Many tests connect to the network or are otherwise flawed.
;; https://github.com/PythonCharmers/python-future/issues/210
(arguments
- `(#:tests? #f))
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'sanity-check
+ (let ((sanity-check (assoc-ref %standard-phases 'sanity-check)))
+ (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+ (let* ((files (find-files (site-packages inputs outputs)
+ "top_level\\.txt"))
+ (backups (map (lambda (f) (string-append f ".bak"))
+ files)))
+ (for-each copy-file files backups)
+ (substitute* files
+ ;; Nobody be usin' winreg on Guix
+ ;; Also, don't force users to have tkinter when they don't
+ ;; need it
+ (("(winreg|tkinter)") ""))
+ (apply sanity-check args)
+ (for-each rename-file backups files))))))))
(home-page "https://python-future.org")
(synopsis "Single-source support for Python 3 and 2")
(description
--
2.34.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#52595] [PATCH 2/5] gnu: python2-renpy: Do not delete non-existing file.
2021-12-17 19:52 [bug#52595] [PATCH 0/5] Update Ren'py to 7.4.11 Liliana Marie Prikler
2021-12-17 17:56 ` [bug#52595] [PATCH 1/5] gnu: python-future: Fix sanity check Liliana Marie Prikler
@ 2021-12-17 18:22 ` Liliana Marie Prikler
2021-12-17 18:59 ` [bug#52595] [PATCH 3/5] gnu: renpy: Move renpy command to aux-files Liliana Marie Prikler
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2021-12-17 18:22 UTC (permalink / raw)
To: 52595
* gnu/packages/game-development.scm (python2-renpy)[build]: Don't delete
renpy/__init__.pyc, it is no longer being built. Adjust comment accordingly.
---
gnu/packages/game-development.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 19d5e71506..fb8744382c 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1317,9 +1317,8 @@ (define-public python2-renpy
;; named "setup.py".
(with-directory-excursion "module"
(apply (assoc-ref %standard-phases 'build) args))
- ;; the above causes renpy.__init__ to be compiled but does not
- ;; compile anything else, hence we do that here
- (delete-file "renpy/__init__.pyc")
+ ;; The above only builds the cython modules, but nothing else,
+ ;; so we do that here.
(invoke "python" "-m" "compileall" "renpy")
#t))
(replace 'install
--
2.34.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#52595] [PATCH 3/5] gnu: renpy: Move renpy command to aux-files.
2021-12-17 19:52 [bug#52595] [PATCH 0/5] Update Ren'py to 7.4.11 Liliana Marie Prikler
2021-12-17 17:56 ` [bug#52595] [PATCH 1/5] gnu: python-future: Fix sanity check Liliana Marie Prikler
2021-12-17 18:22 ` [bug#52595] [PATCH 2/5] gnu: python2-renpy: Do not delete non-existing file Liliana Marie Prikler
@ 2021-12-17 18:59 ` Liliana Marie Prikler
2021-12-17 19:31 ` [bug#52595] [PATCH 4/5] gnu: python2-pygame-sdl2: Update to renpy version 7.4.11 Liliana Marie Prikler
2021-12-17 19:32 ` [bug#52595] [PATCH 5/5] gnu: python2-renpy: Update to 7.4.11 Liliana Marie Prikler
4 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2021-12-17 18:59 UTC (permalink / raw)
To: 52595
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5820 bytes --]
* gnu/packages/aux-files/renpy/renpy.in: New file.
* gnu/packages/game-development.scm (renpy)[install]: Use renpy.in with
substitute*.
* Makefile.am (AUX_FILES): Add it here.
---
Makefile.am | 1 +
gnu/packages/aux-files/renpy/renpy.in | 48 +++++++++++++++++++
gnu/packages/game-development.scm | 68 ++++-----------------------
3 files changed, 57 insertions(+), 60 deletions(-)
create mode 100644 gnu/packages/aux-files/renpy/renpy.in
diff --git a/Makefile.am b/Makefile.am
index c4ccee65f1..627cf3ca64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -403,6 +403,7 @@ AUX_FILES = \
gnu/packages/aux-files/pack-audit.c \
gnu/packages/aux-files/python/sanity-check.py \
gnu/packages/aux-files/python/sitecustomize.py \
+ gnu/packages/aux-files/renpy/renpy.in \
gnu/packages/aux-files/run-in-namespace.c
# Templates, examples.
diff --git a/gnu/packages/aux-files/renpy/renpy.in b/gnu/packages/aux-files/renpy/renpy.in
new file mode 100644
index 0000000000..914a735fa4
--- /dev/null
+++ b/gnu/packages/aux-files/renpy/renpy.in
@@ -0,0 +1,48 @@
+#! @PYTHON@
+# -*- mode: python -*-
+
+from __future__ import print_function
+
+import os
+import sys
+import warnings
+
+def path_to_common(renpy_base):
+ return renpy_base + "/common"
+
+def path_to_saves(gamedir, save_directory=None):
+ import renpy
+
+ if save_directory is None:
+ save_directory = renpy.config.save_directory
+ save_directory = renpy.exports.fsencode(save_directory)
+
+ if not save_directory:
+ return gamedir + "/saves"
+
+ return os.path.join(os.path.expanduser("~/.renpy"), save_directory)
+
+def main():
+ try:
+ import renpy.bootstrap
+ import renpy.arguments
+ except ImportError:
+ print("""Could not import renpy.bootstrap.
+Please ensure you decompressed Ren'py correctly, preserving the directory
+structure.""", file=sys.stderr)
+ raise
+
+ args = renpy.arguments.bootstrap()
+ if not args.basedir:
+ print("""This Ren'py requires a basedir to launch.
+The basedir is the directory, in which .rpy source files or compiled .rpyc files
+live -- usually the 'game' subdirectory of a game packaged by Ren'py.
+
+If you want the Ren'py launcher, use \"renpy-launcher\" instead.""",
+ file=sys.stderr)
+ sys.exit()
+
+ renpy.bootstrap.bootstrap("@RENPY_BASE@")
+
+if __name__ == "__main__":
+ main()
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index fb8744382c..955d630704 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1444,70 +1444,17 @@ (define-public renpy
;; `-- Super Awesome Game.sh
(let* ((out (assoc-ref outputs "out"))
(bin/renpy (string-append out "/bin/renpy")))
- (mkdir-p (string-append out "/bin"))
(copy-recursively "renpy/common"
(string-append out "/share/renpy/common"))
(copy-recursively "gui"
(string-append out "/share/renpy/gui"))
- (call-with-output-file bin/renpy
- (lambda (port)
- (format port "#!~a/bin/python2~%"
- (assoc-ref inputs "python2"))
- (format port "
-from __future__ import print_function
-
-import os
-import sys
-import warnings
-
-def path_to_common(renpy_base):
- return renpy_base + \"/common\"
-
-def path_to_saves(gamedir, save_directory=None):
- import renpy # @UnresolvedImport
-
- if save_directory is None:
- save_directory = renpy.config.save_directory
- save_directory = renpy.exports.fsencode(save_directory)
-
- if not save_directory:
- return gamedir + \"/saves\"
-
- return os.path.expanduser(\"~~/.renpy/\" + save_directory)
-
-def path_to_renpy_base():
- return \"~a\"
-
-def main():
- renpy_base = path_to_renpy_base()
- try:
- import renpy.bootstrap
- import renpy.arguments
- except ImportError:
- print(\"\"\"Could not import renpy.bootstrap.
-Please ensure you decompressed Ren'Py correctly, preserving the directory
-structure.\"\"\", file=sys.stderr)
- raise
-
- args = renpy.arguments.bootstrap()
- if not args.basedir:
- print(\"\"\"This Ren'py requires a basedir to launch.
-The basedir is the directory, in which .rpy files live -- usually the 'game'
-subdirectory of a game packaged by Ren'py.
-
-If you want the Ren'py launcher, use renpy-launcher instead.\"\"\",
- file=sys.stderr)
- sys.exit()
-
- renpy.bootstrap.bootstrap(renpy_base)
-
-if __name__ == \"__main__\":
- main()
-"
- (string-append out "/share/renpy"))))
- (chmod bin/renpy #o755)
- #t)))
+ (mkdir-p (string-append out "/bin"))
+ (copy-file (assoc-ref inputs "renpy.in") bin/renpy)
+ (substitute* bin/renpy
+ (("@PYTHON@") (search-input-file inputs "bin/python2"))
+ (("@RENPY_BASE@") (string-append out "/share/renpy")))
+ (chmod bin/renpy #o755))))
(add-after 'install 'install-games
(lambda* (#:key outputs #:allow-other-keys)
@@ -1561,7 +1508,8 @@ (define* (install-renpy-game #:key output game name (renpy renpy)
inputs))))))))
#t))))))
(inputs
- `(("python2-renpy" ,python2-renpy)
+ `(("renpy.in" ,(search-auxiliary-file "renpy/renpy.in"))
+ ("python2-renpy" ,python2-renpy)
("python2-tkinter" ,python-2 "tk")
("python2" ,python-2) ; for ‘fix-commands’ and ‘wrap’
("xdg-utils" ,xdg-utils)))
--
2.34.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#52595] [PATCH 4/5] gnu: python2-pygame-sdl2: Update to renpy version 7.4.11.
2021-12-17 19:52 [bug#52595] [PATCH 0/5] Update Ren'py to 7.4.11 Liliana Marie Prikler
` (2 preceding siblings ...)
2021-12-17 18:59 ` [bug#52595] [PATCH 3/5] gnu: renpy: Move renpy command to aux-files Liliana Marie Prikler
@ 2021-12-17 19:31 ` Liliana Marie Prikler
2021-12-17 19:32 ` [bug#52595] [PATCH 5/5] gnu: python2-renpy: Update to 7.4.11 Liliana Marie Prikler
4 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2021-12-17 19:31 UTC (permalink / raw)
To: 52595
* gnu/packages/game-development.scm (python2-pygame-sdl2): Update to renpy
version 7.4.11.
---
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 955d630704..a8a4f13311 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1214,7 +1214,7 @@ (define-public python2-pygame
(define-public python-pygame-sdl2
(let ((real-version "2.1.0")
- (renpy-version "7.4.10"))
+ (renpy-version "7.4.11"))
(package
(inherit python-pygame)
(name "python-pygame-sdl2")
@@ -1224,7 +1224,7 @@ (define-public python-pygame-sdl2
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" renpy-version
"/pygame_sdl2-" version ".tar.gz"))
- (sha256 (base32 "0m0asrr722a4v24fm8199b0c53igagylay8bn9bz9rmc0r4v8si4"))
+ (sha256 (base32 "0nxvca16299jx6sp0ys29rqixcs21ymhqwjfkbchhss0yar7qjgz"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.34.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#52595] [PATCH 5/5] gnu: python2-renpy: Update to 7.4.11.
2021-12-17 19:52 [bug#52595] [PATCH 0/5] Update Ren'py to 7.4.11 Liliana Marie Prikler
` (3 preceding siblings ...)
2021-12-17 19:31 ` [bug#52595] [PATCH 4/5] gnu: python2-pygame-sdl2: Update to renpy version 7.4.11 Liliana Marie Prikler
@ 2021-12-17 19:32 ` Liliana Marie Prikler
2022-01-15 9:02 ` bug#52595: " Liliana Marie Prikler
4 siblings, 1 reply; 7+ messages in thread
From: Liliana Marie Prikler @ 2021-12-17 19:32 UTC (permalink / raw)
To: 52595
* gnu/packages/game-development.scm (python2-renpy): Update to 7.4.11.
---
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 a8a4f13311..9752bb93f2 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1269,13 +1269,13 @@ (define-public python2-pygame-sdl2
(define-public python2-renpy
(package
(name "python2-renpy")
- (version "7.4.10")
+ (version "7.4.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" version
"/renpy-" version "-source.tar.bz2"))
- (sha256 (base32 "1yngs2kh1l8micg28mcp9580qsvgq3aa8bkhv2xqfkg9qqrbr8y4"))
+ (sha256 (base32 "0zkhg2sd2hglm9dkansf4h8sq7lm7iqslzl763ambp4kyfdvd07q"))
(modules '((guix build utils)))
(patches
(search-patches
--
2.34.0
^ permalink raw reply related [flat|nested] 7+ messages in thread