Re: [PR PATCH] [Updated] lilypond: update to 2.23.9

[newbluemoon <newbluemoon@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]

There is an updated pull request by newbluemoon against master on the void-packages repository

https://github.com/newbluemoon/void-packages lilypond
https://github.com/void-linux/void-packages/pull/36394

lilypond: update to 2.23.9
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Finally getting rid of guile1.8! :)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64, x86_64-musl, i686)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv7l-musl



A patch file from https://github.com/void-linux/void-packages/pull/36394.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lilypond-36394.patch --]
[-- Type: text/x-diff, Size: 11046 bytes --]

From d2e8ad2c13091bd982807904abfeae3301de0a7b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 28 Mar 2022 19:36:37 +0200
Subject: [PATCH 1/3] lilypond: update to 2.23.9

---
 srcpkgs/lilypond/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..150268070412 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,28 +1,28 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+# should be kept in sync with 'lilypond-doc'
+version=2.23.9
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
 configure_script="../configure"
 configure_args="--disable-documentation ac_cv_func_isinf=yes
  --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre"
-hostmakedepends="autogen automake bison flex fontforge gettext guile1.8 perl
+hostmakedepends="autogen automake bison flex fontforge gettext perl
  pkg-config python3 t1utils tar texinfo texlive"
-makedepends="gc-devel guile1.8-devel libltdl-devel pango-devel"
-depends="ghostscript python3"
+makedepends="gc-devel guile-devel libltdl-devel pango-devel"
+depends="ghostscript guile python3"
 checkdepends="ImageMagick rsync texi2html"
 short_desc="Music engraving program"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
 distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz"
-checksum=a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce
+checksum=11204fab661a5324f55c607dc8f9363a47afc741563f8dc867cdd60c173b27db
 python_version=3
+make_check=ci-skip # ci fails, but all checks pass locally
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From 602ff9744184f775b3527f7caa1ceb94a1f925a3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 28 Mar 2022 19:36:55 +0200
Subject: [PATCH 2/3] lilypond-doc: update to 2.23.9

---
 srcpkgs/lilypond-doc/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..5d57ab78035f 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,14 +1,15 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+# should be kept in sync with 'lilypond'
+version=2.23.9
 revision=1
 create_wrksrc=yes
 short_desc="Documentation for the lilypond music engraving program"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
-distfiles="https://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=1fada73c22dbcfa6224744a8ad87e10cced784f98fd9243768c96ee5bc0ee45d
+distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz"
+checksum=519bdd88e0f347049db3b1d6ed71458c3b4781dc20bdd3c5be00c0fabb6160ba
 
 do_install() {
 	vmkdir usr

From 28252926485fe295d63a1a4505e477d7d20bad10 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 28 Mar 2022 19:43:08 +0200
Subject: [PATCH 3/3] guile1.8: remove

---
 common/shlibs                                 |  6 ---
 srcpkgs/guile1.8-devel                        |  1 -
 srcpkgs/guile1.8/patches/cross.patch          | 25 ----------
 srcpkgs/guile1.8/patches/musl-longlong.patch  | 13 -----
 .../guile1.8/patches/musl-sigcontext.patch    | 49 -------------------
 srcpkgs/guile1.8/template                     | 34 -------------
 srcpkgs/removed-packages/template             |  2 +
 7 files changed, 2 insertions(+), 128 deletions(-)
 delete mode 120000 srcpkgs/guile1.8-devel
 delete mode 100644 srcpkgs/guile1.8/patches/cross.patch
 delete mode 100644 srcpkgs/guile1.8/patches/musl-longlong.patch
 delete mode 100644 srcpkgs/guile1.8/patches/musl-sigcontext.patch
 delete mode 100644 srcpkgs/guile1.8/template

diff --git a/common/shlibs b/common/shlibs
index 0541c2dea7e8..a5e810cd3c6c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3107,12 +3107,6 @@ libprotoc.so.31 libprotoc-3.20.1_1
 libprotobuf.so.31 libprotobuf-3.20.1_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
-libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
-libguile-srfi-srfi-4-v-3.so.3 guile1.8-1.8.8_1
-libguile-srfi-srfi-60-v-2.so.2 guile1.8-1.8.8_1
-libguile.so.17 guile1.8-1.8.8_1
-libguilereadline-v-17.so.17 guile1.8-1.8.8_1
-libguile-srfi-srfi-13-14-v-3.so.3 guile1.8-1.8.8_1
 libykclient.so.3 ykclient-2.15_1
 libbooster.so.0 cppcms-1.0.5_1
 libcppcms.so.1 cppcms-1.0.5_1
diff --git a/srcpkgs/guile1.8-devel b/srcpkgs/guile1.8-devel
deleted file mode 120000
index 8cfa70ed3ec5..000000000000
--- a/srcpkgs/guile1.8-devel
+++ /dev/null
@@ -1 +0,0 @@
-guile1.8
\ No newline at end of file
diff --git a/srcpkgs/guile1.8/patches/cross.patch b/srcpkgs/guile1.8/patches/cross.patch
deleted file mode 100644
index 9e0540741bff..000000000000
--- a/srcpkgs/guile1.8/patches/cross.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Configure cannot execute built binary when cross compiling.
-The patch skips the test and assumes "no".
-This is how it is done in version 2.0.14's configure script.
-
---- a/configure	2017-09-15 11:14:54.427295947 +0200
-+++ b/configure	2017-09-15 14:11:07.253528181 +0200
-@@ -19802,6 +19802,7 @@
- $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; }
- old_CFLAGS="$CFLAGS"
- CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
-+if test "$cross_compiling" = no; then
- if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-@@ -19849,6 +19850,10 @@
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
-+else
-+  works="assuming it doesn't"
-+fi
-+
- CFLAGS="$old_CFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $works" >&5
- $as_echo "$works" >&6; }
diff --git a/srcpkgs/guile1.8/patches/musl-longlong.patch b/srcpkgs/guile1.8/patches/musl-longlong.patch
deleted file mode 100644
index 3a19617d50c6..000000000000
--- a/srcpkgs/guile1.8/patches/musl-longlong.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/libguile/fports.c	2010-12-13 18:24:40.000000000 +0100
-+++ b/libguile/fports.c	2017-10-25 21:51:07.234942515 +0200
-@@ -78,8 +78,8 @@
- #define OFF_T_MAX  LONG_MAX
- #define OFF_T_MIN  LONG_MIN
- #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
--#define OFF_T_MAX  LONG_LONG_MAX
--#define OFF_T_MIN  LONG_LONG_MIN
-+#define OFF_T_MAX  LLONG_MAX
-+#define OFF_T_MIN  LLONG_MIN
- #else
- #error Oops, unknown OFF_T size
- #endif
diff --git a/srcpkgs/guile1.8/patches/musl-sigcontext.patch b/srcpkgs/guile1.8/patches/musl-sigcontext.patch
deleted file mode 100644
index 9fa3279fc34b..000000000000
--- a/srcpkgs/guile1.8/patches/musl-sigcontext.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-When checking for the location of the sigcontext struct it is not taken into
-account that a different libc than glibc could be used. It falls back to libc5
-which leads to a sigcontext redefinition error when using the musl libc. The
-patch simply removes the misleading checks since we're way beyond those
-versions anyway.
-
---- a/libguile/gc_os_dep.c	2010-12-13 18:25:01.000000000 +0100
-+++ b/libguile/gc_os_dep.c	2017-09-17 23:01:55.494204333 +0200
-@@ -1445,40 +1445,6 @@
- 				/* include assembly code to do it well.	*/
- # endif
- 
--# if defined(LINUX) && !defined(POWERPC)
--
--# if 0
--#   include <linux/version.h>
--#   if (LINUX_VERSION_CODE <= 0x10400)
--      /* Ugly hack to get struct sigcontext_struct definition.  Required  */
--      /* for some early 1.3.X releases.  Will hopefully go away soon. */
--      /* in some later Linux releases, asm/sigcontext.h may have to   */
--      /* be included instead.                                         */
--#     define __KERNEL__
--#     include <asm/signal.h>
--#     undef __KERNEL__
--#  endif
--
--#  else
--
--      /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
--      /* struct sigcontext.  libc6 (glibc2) uses "struct sigcontext" in     */
--      /* prototypes, so we have to include the top-level sigcontext.h to    */
--      /* make sure the former gets defined to be the latter if appropriate. */
--#     include <features.h>
--#     if 2 <= __GLIBC__
--#       if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__
--	  /* glibc 2.1 no longer has sigcontext.h.  But signal.h	*/
--	  /* has the right declaration for glibc 2.1.			*/
--#         include <sigcontext.h>
--#       endif /* 0 == __GLIBC_MINOR__ */
--#     else /* not 2 <= __GLIBC__ */
--        /* libc5 doesn't have <sigcontext.h>: go directly with the kernel   */
--        /* one.  Check LINUX_VERSION_CODE to see which we should reference. */
--#       include <asm/sigcontext.h>
--#     endif /* 2 <= __GLIBC__ */
--#   endif
--# endif
- # if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS)
- #   include <sys/types.h>
- #   if !defined(MSWIN32) && !defined(SUNOS4)
diff --git a/srcpkgs/guile1.8/template b/srcpkgs/guile1.8/template
deleted file mode 100644
index 2f575000cbfe..000000000000
--- a/srcpkgs/guile1.8/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'guile1.8'
-pkgname=guile1.8
-version=1.8.8
-revision=3
-wrksrc=${pkgname/1.8/}-${version}
-build_style="gnu-configure"
-configure_args="--disable-static --disable-error-on-warning --program-suffix='-1.8'"
-make_build_args="GUILE_FOR_BUILD=guile"
-hostmakedepends="pkg-config guile"
-makedepends="gmp-devel libltdl-devel ncurses-devel readline-devel"
-short_desc="Portable, embeddable Scheme implementation written in C"
-maintainer="newbluemoon <blaumolch@mailbox.org>"
-license="LGPL-2.1-or-later"
-homepage="https://www.gnu.org/software/guile/guile.html"
-distfiles="${GNU_SITE}/${pkgname/1.8/}/${pkgname/1.8/}-${version}.tar.gz"
-checksum=c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050
-
-post_install() {
-	# conflicts with guile-2.0
-	rm -rf ${DESTDIR}/usr/share/info
-}
-
-guile1.8-devel_package() {
-	short_desc+=" - development files"
-	depends="gmp-devel ${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/guile-config-1.8
-		sed -i '1s|/usr/bin/guile|/usr/bin/guile-1.8|' ${PKGDESTDIR}/usr/bin/guile-config-1.8
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/aclocal
-		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-1.8.m4}
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 65516dfa921c..a6d94cc051d6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -106,6 +106,8 @@ replaces="
  gst1-python<=1.18.3_1
  gtkhtml-devel<=4.10.0_1
  gtkhtml<=4.10.0_1
+ guile1.8-devel<=1.8.8_3
+ guile1.8<=1.8.8_3
  gx-go<=1.9.0_1
  httperf<=0.9.0_9
  icecat-i18n-ach<=78.6.1_1