gnu: python2-renpy: Update to 7.4.0.
* 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
This commit is contained in:
parent
b4d71a62ad
commit
eaa998577b
2 changed files with 21 additions and 15 deletions
|
@ -1141,13 +1141,13 @@ developed mainly for Ren'py.")
|
||||||
(define-public python2-renpy
|
(define-public python2-renpy
|
||||||
(package
|
(package
|
||||||
(name "python2-renpy")
|
(name "python2-renpy")
|
||||||
(version "7.3.5")
|
(version "7.4.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://www.renpy.org/dl/" version
|
(uri (string-append "https://www.renpy.org/dl/" version
|
||||||
"/renpy-" version "-source.tar.bz2"))
|
"/renpy-" version "-source.tar.bz2"))
|
||||||
(sha256 (base32 "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4"))
|
(sha256 (base32 "0av3mbh54xh6i3rvf60x5hbsjcfpzgia2j958mhyc5826zjxzfpg"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(patches
|
(patches
|
||||||
(search-patches
|
(search-patches
|
||||||
|
@ -1204,8 +1204,8 @@ developed mainly for Ren'py.")
|
||||||
;; (both source and compiled) in the same directory.
|
;; (both source and compiled) in the same directory.
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
(site (string-append "/lib/python"
|
(site (string-append "/lib/python"
|
||||||
,(version-major+minor
|
(python-version
|
||||||
(package-version python-2))
|
(assoc-ref inputs "python"))
|
||||||
"/site-packages")))
|
"/site-packages")))
|
||||||
(with-directory-excursion "module"
|
(with-directory-excursion "module"
|
||||||
(apply (assoc-ref %standard-phases 'install) args))
|
(apply (assoc-ref %standard-phases 'install) args))
|
||||||
|
@ -1218,9 +1218,11 @@ developed mainly for Ren'py.")
|
||||||
("fribidi" ,fribidi)
|
("fribidi" ,fribidi)
|
||||||
("glew" ,glew)
|
("glew" ,glew)
|
||||||
("libpng" ,libpng)
|
("libpng" ,libpng)
|
||||||
("python2-pygame" ,python2-pygame-sdl2)
|
|
||||||
("sdl-union"
|
("sdl-union"
|
||||||
,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))))
|
,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))))
|
||||||
|
(propagated-inputs
|
||||||
|
`(("python2-future" ,python2-future)
|
||||||
|
("python2-pygame" ,python2-pygame-sdl2)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python2-cython" ,python2-cython)
|
`(("python2-cython" ,python2-cython)
|
||||||
("xdg-utils" ,xdg-utils)))
|
("xdg-utils" ,xdg-utils)))
|
||||||
|
@ -1234,7 +1236,6 @@ modules of Ren'py.")
|
||||||
(package
|
(package
|
||||||
(inherit python2-renpy)
|
(inherit python2-renpy)
|
||||||
(name "renpy")
|
(name "renpy")
|
||||||
(version "7.3.5")
|
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; see python2-renpy
|
`(#:tests? #f ; see python2-renpy
|
||||||
|
|
|
@ -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
|
[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
|
[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.4.0-source.orig/module/renpybidicore.c
|
||||||
+++ renpy-7.3.5-source/module/renpybidicore.c
|
+++ renpy-7.4.0-source/module/renpybidicore.c
|
||||||
@@ -1,5 +1,5 @@
|
@@ -1,9 +1,3 @@
|
||||||
#include <Python.h>
|
#include <Python.h>
|
||||||
|
-
|
||||||
|
-#ifdef RENPY_BUILD
|
||||||
|
#include <fribidi.h>
|
||||||
|
-#else
|
||||||
-#include <fribidi-src/lib/fribidi.h>
|
-#include <fribidi-src/lib/fribidi.h>
|
||||||
+#include <fribidi.h>
|
-#endif
|
||||||
|
-
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#ifndef alloca
|
#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.4.0-source.orig/module/setup.py
|
||||||
+++ renpy-7.3.5-source/module/setup.py
|
+++ renpy-7.4.0-source/module/setup.py
|
||||||
@@ -119,30 +119,13 @@ cython(
|
@@ -125,30 +125,13 @@ cython(
|
||||||
sdl + [ png, 'z', 'm' ])
|
sdl + [ png, 'z', 'm' ])
|
||||||
|
|
||||||
FRIBIDI_SOURCES = """
|
FRIBIDI_SOURCES = """
|
||||||
|
|
Reference in a new issue