all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 63582@debbugs.gnu.org
Cc: iyzsong@envs.net
Subject: [bug#63582] [PATCH 3/4] gnu: python-renpy: Update to 8.1.0.
Date: Fri, 19 May 2023 11:55:40 +0200	[thread overview]
Message-ID: <93dd15946900b1bddf1aabd02939459a452e4920.1684493082.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <cover.1684493082.git.liliana.prikler@gmail.com>

* gnu/packages/game-development.scm (python-renpy): Update to 8.1.0.
[source]: No longer unbundle fribidi.
Drop sync service and report as official version.
[arguments]<#:phases>: Drop ‘fix-include-paths’.
[propagated-inputs]: Add python-ecdsa.
---
 gnu/packages/game-development.scm | 40 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 5b3faceb89..96a7a52b62 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -99,6 +99,7 @@ (define-module (gnu packages game-development)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages readline)
@@ -1329,25 +1330,33 @@ (define-public python-pygame-sdl2
 (define-public python-renpy
   (package
     (name "python-renpy")
-    (version "8.0.3")
+    (version "8.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.renpy.org/dl/" version
                            "/renpy-" version "-source.tar.bz2"))
-       (sha256 (base32 "1b49y60pi6304fg06lw5gajzrgg9w80swpfkn6pw0lxbr6djgjgn"))
+       (sha256
+        (base32
+         "08l7z2vwqxkskj3rs2a0w9ahah28ixq8hy48h30k2dm9g19h450h"))
        (modules '((guix build utils)))
-       (patches
-        (search-patches
-         "renpy-use-system-fribidi.patch"))
        (snippet
-        '(with-directory-excursion "module"
-           ;; drop fribidi sources
-           (delete-file-recursively "fribidi-src")
-           ;; drop _renpytfd, as there are missing sources
-           (substitute* "setup.py"
-             (("cython\\(\"_renpytfd\"" all)
-              (string-append "pass # " all)))))))
+        #~(begin
+            ;; Build without sync service.
+            ;; Encryption is only used for enabling this service and requires
+            ;; libhydrogen, which doesn't have a public release, so drop it
+            ;; as well
+            (for-each delete-file
+                      '("renpy/encryption.pyx"
+                        "renpy/common/00sync.rpy"))
+            (substitute* "module/setup.py"
+              (("cython\\(\"renpy\\.encryption\"\\)") ""))
+            (substitute* "renpy/__init__.py"
+              (("import renpy\\.encryption") ""))
+            ;; Trust vc_version.py when it comes to detecting whether a
+            ;; version is official.
+            (substitute* "renpy/__init__.py"
+              (("official = official and .*") ""))))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f                      ; Ren'py doesn't seem to package tests
@@ -1359,11 +1368,6 @@ (define-public python-renpy
                (("xdg-open")
                 (string-append (assoc-ref inputs "xdg-utils")
                                "/bin/xdg-open")))))
-         (add-after 'unpack 'fix-include-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "module/setup.py"
-               (("/usr/include/fribidi")
-                (search-input-directory inputs "include/fribidi")))))
          (add-after 'set-paths 'set-build-vars
            (lambda* (#:key inputs native-inputs #:allow-other-keys)
              (setenv "RENPY_CYTHON"
@@ -1405,7 +1409,7 @@ (define-public python-renpy
            libpng
            (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))
            xdg-utils))
-    (propagated-inputs (list python-future python-pygame-sdl2))
+    (propagated-inputs (list python-ecdsa python-future python-pygame-sdl2))
     (home-page "https://www.renpy.org/")
     (synopsis "Ren'py python module")
     (description "This package contains the shared libraries and Python modules
-- 
2.40.1





  parent reply	other threads:[~2023-05-19 11:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-19 10:44 [bug#63582] [PATCH 0/4] Update Ren'py to 8.1.0 Liliana Marie Prikler
2023-05-19  9:01 ` [bug#63582] [PATCH 1/4] gnu: python-pygame-sdl2: Update to 2.1.0-for-renpy-8.1.0 Liliana Marie Prikler
2023-05-19  9:55 ` Liliana Marie Prikler [this message]
2023-05-19 10:13 ` [bug#63582] [PATCH 2/4] gnu: python-pygame-sdl2: Use G-Expressions Liliana Marie Prikler
2023-05-19 10:14 ` [bug#63582] [PATCH 4/4] gnu: python-renpy: " Liliana Marie Prikler
2023-05-28 21:16   ` bug#63582: " Liliana Marie Prikler
2023-05-19 13:19 ` [bug#63582] [PATCH 0/4] Update Ren'py to 8.1.0 宋文武 via Guix-patches via
2023-05-23  6:59 ` [bug#63582] jgart via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=93dd15946900b1bddf1aabd02939459a452e4920.1684493082.git.liliana.prikler@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=63582@debbugs.gnu.org \
    --cc=iyzsong@envs.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.