Unverified Commit d4eb3845 authored by Marcin Serwin's avatar Marcin Serwin Committed by GitHub
Browse files

renpy: 8.4.1.25072401 -> 8.5.2.26010301-unstable-2026-03-27; add ulysseszhan...

renpy: 8.4.1.25072401 -> 8.5.2.26010301-unstable-2026-03-27; add ulysseszhan as maintainer (#504002)
parents 631af501 920b1f60
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
  makeDesktopItem,
  copyDesktopItems,
  makeWrapper,
  renpy,
  renpyMinimal,
  nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    makeWrapper
    copyDesktopItems
    renpy
    renpyMinimal
  ];

  postPatch = ''
@@ -45,6 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    runHook preBuild

    renpy . compile
    rm -r game/saves

    runHook postBuild
  '';
@@ -56,7 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    mkdir -p $phome
    cp -r game $phome
    find $phome -type f -name "*.rpy" -delete
    makeWrapper ${lib.getExe renpy} $out/bin/katawa-shoujo-re-engineered \
    makeWrapper ${lib.getExe renpyMinimal} $out/bin/katawa-shoujo-re-engineered \
      --add-flags $phome --add-flags run
    install -D $src/web-icon.png $out/share/icons/hicolor/512x512/apps/katawa-shoujo-re-engineered.png

@@ -80,6 +81,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
      rapiteanu
      ulysseszhan
    ];
    platforms = renpy.meta.platforms;
    platforms = renpyMinimal.meta.platforms;
  };
})
+13 −0
Original line number Diff line number Diff line
diff --git a/launcher/game/distribute.rpy b/launcher/game/distribute.rpy
index bece65c63..831c405f8 100644
--- a/launcher/game/distribute.rpy
+++ b/launcher/game/distribute.rpy
@@ -863,7 +863,7 @@ fix_dlc("renios", "renios")
                             )
 
             for fn in os.listdir(directory):
-                walk(fn, os.path.join(directory, fn))
+                walk(fn, os.path.join(directory, "renpy-dist" if fn == "renpy" else fn))
 
         def merge_file_lists(self):
             """
+31 −0
Original line number Diff line number Diff line
diff --git a/renpy/script.py b/renpy/script.py
index 62e424415..7c3ae5922 100644
--- a/renpy/script.py
+++ b/renpy/script.py
@@ -969,6 +969,13 @@ class Script(object):
                 f.seek(-hashlib.md5().digest_size, 2)
                 digest = f.read(hashlib.md5().digest_size)
 
+        elif dir.startswith("@systemRenpy@"):
+            data, stmts = self.load_file(dir, fn + compiled)
+            lastfn = dir + "/" + fn + compiled
+            with open(lastfn, "rb") as f:
+                f.seek(-hashlib.md5().digest_size, 2)
+                digest = f.read(hashlib.md5().digest_size)
+
         else:
             # Otherwise, we're loading from disk. So we need to decide if
             # we want to load the rpy or the rpyc file.
diff --git a/launcher/game/distribute.rpy b/launcher/game/distribute.rpy
index bece65c63..c2590bcf7 100644
--- a/launcher/game/distribute.rpy
+++ b/launcher/game/distribute.rpy
@@ -606,7 +606,7 @@ fix_dlc("renios", "renios")
                 self.log.close()
                 return
 
-            if project.data['force_recompile']:
+            if project.data['force_recompile'] and False:
                 import compileall
 
                 compileall.compile_dir(
+30 −0
Original line number Diff line number Diff line
diff --git a/launcher/game/gui7/code.py b/launcher/game/gui7/code.py
index 5c1b89f23c..c8ad04b6dd 100644
--- a/launcher/game/gui7/code.py
+++ b/launcher/game/gui7/code.py
@@ -243,9 +243,7 @@ def quote(s):
 
         self.update_defines(replacements)
 
-    def write_target(self, filename):
-
-        target = os.path.join(self.p.prefix, filename)
+    def write_target(self, target):
 
         if os.path.exists(target):
 
@@ -421,7 +419,7 @@ def generate_gui(self, fn, defines=False):
             self.translate_comments()
             self.add_code(fn)
 
-        self.write_target(fn)
+        self.write_target(os.path.join(self.p.prefix, fn))
 
     def generate_code(self, fn):
 
@@ -439,4 +437,4 @@ def generate_code(self, fn):
 
         self.add_code(fn)
 
-        self.write_target(fn)
+        self.write_target(target)
+0 −16
Original line number Diff line number Diff line
diff --git a/renpy/common/00steam.rpy b/renpy/common/00steam.rpy
index 9a5f9c405..68c8c26e0 100644
--- a/renpy/common/00steam.rpy
+++ b/renpy/common/00steam.rpy
@@ -1029,11 +1029,6 @@ init -1499 python in achievement:
             steam = None
             steamapi = None
 
-    if renpy.windows or renpy.macintosh or renpy.linux:
-        steam_preinit()
-        steam_init()
-
-
 init 1500 python in achievement:
 
     # Steam position.
Loading