LilyPond 2.24.0

org.denemo.Denemo.yaml

@@ -25,29 +25,25 @@ finish-args:
   - --env=PATH=/app/texlive/bin/x86_64-linux:/app/texlive/bin/aarch64-linux:/app/bin:/usr/bin
 modules:
   - name: guile
+    modules:
+      - name: gc
+        config-opts:
+          - --disable-docs
+        sources:
+          - type: archive
+            url: https://www.hboehm.info/gc/gc_source/gc-8.0.6.tar.gz
+            sha256: 3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11
     buildsystem: autotools
-    build-options:
-      cflags: "-Wno-unused-but-set-variable -Wno-misleading-indentation
-              -Wno-stringop-truncation -Wno-deprecated-declarations"
     config-opts:
+      - --without-threads
+      - --disable-networking
       - --disable-error-on-warning
-      - --disable-static
-    # Patches copied from https://src.fedoraproject.org/rpms/compat-guile18/tree/master
     sources:
       - type: archive
-        url: https://ftp.gnu.org/gnu/guile/guile-1.8.8.tar.gz
-        sha256: c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050
-      - type: patch
-        path: patches/guile-1.8.8-deplibs.patch
-      - type: patch
-        path: patches/guile-1.8.8-cve-2016-8605.patch
+        url: https://ftp.gnu.org/gnu/guile/guile-2.2.7.tar.xz
+        sha256: cdf776ea5f29430b1258209630555beea6d2be5481f9da4d64986b077ff37504
       - type: patch
-        path: patches/guile-1.8.8-configure.patch
-      # Files in the tarball are too old for aarch64 so we take them from the Sdk.
-      - type: shell
-        commands:
-          - cp -fp /usr/share/automake-*/config.{sub,guess} build-aux/
-          - cp -fp /usr/share/automake-*/config.{sub,guess} guile-readline/
+        path: patches/guile2-never-recompile.patch
     cleanup:
       - /include
       - /share/aclocal
@@ -124,16 +120,17 @@ modules:
       - /bin/gxps
 
   - name: lilypond
-    buildsystem: autotools
-    config-opts:
-      - --disable-documentation
+    buildsystem: simple
+    build-commands:
+      - ./configure --prefix=/app --disable-documentation --enable-cairo-backend
+      - make
+      - make bytecode
+      - make install
+      - make install-bytecode
     sources:
       - type: archive
-        url: https://lilypond.org/download/sources/v2.22/lilypond-2.22.2.tar.gz
-        sha256: dde90854fa7de1012f4e1304a68617aea9ab322932ec0ce76984f60d26aa23be
-      - type: shell
-        commands:
-          - cp -p /usr/share/automake-*/config.{sub,guess} config/
+        url: https://lilypond.org/download/sources/v2.24/lilypond-2.24.0.tar.gz
+        sha256: 3cedbe3b92b02569e3a6f2f0674858967b3da278d70aa3e98aef5bdcd7f78b69
     build-options:
       arch:
         aarch64:

patches/guile2-never-recompile.patch

@@ -0,0 +1,22 @@
+diff --git a/libguile/load.c b/libguile/load.c
+index c209812dc..05f47c09e 100644
+--- a/libguile/load.c
++++ b/libguile/load.c
+@@ -550,6 +550,7 @@ static int
+ compiled_is_fresh (SCM full_filename, SCM compiled_filename,
+                    struct stat *stat_source, struct stat *stat_compiled)
+ {
++  return 1;
+   int compiled_is_newer;
+   struct timespec source_mtime, compiled_mtime;
+
+@@ -569,8 +570,6 @@ compiled_is_fresh (SCM full_filename, SCM compiled_filename,
+       scm_display (compiled_filename, scm_current_warning_port ());
+       scm_puts ("\n", scm_current_warning_port ());
+     }
+-
+-  return compiled_is_newer;
+ }
+
+ static SCM
+