Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] lilypond: update to 2.23.7
@ 2022-03-28 17:57 newbluemoon
  2022-03-28 18:40 ` newbluemoon
                   ` (23 more replies)
  0 siblings, 24 replies; 25+ messages in thread
From: newbluemoon @ 2022-03-28 17:57 UTC (permalink / raw)
  To: ml

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

There is a new 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.7
<!-- 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-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: 10921 bytes --]

From 40375d4737fc3334bcd1166618e46f4864fb152a 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.7

---
 srcpkgs/lilypond/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..3b2d73fa05c9 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+version=2.23.7
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -9,20 +9,18 @@ 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
  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=b5674df4c2371cb6d59a06ea54eaba6c87f2e7c503c9f17ec3db3facd61807c0
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From c14641c4eda825c161d41406cd3bb66ae2deffb6 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.7

---
 srcpkgs/lilypond-doc/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..03e97dd21c40 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,17 +1,16 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+version=2.23.7
 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=a257ba62e2f2588754482a2a171ffae06385b28633b628b55bed71524c1ee597
 
 do_install() {
-	vmkdir usr
-	rm share/info/lilypond
-	mv share ${DESTDIR}/usr/
+	vmkdir usr/share/doc/lilypond/html
+	mv * ${DESTDIR}/usr/share/doc/lilypond/html
 }

From e9e2763c56569f685a016ecb210a4296bfd32a12 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 ccc55a1b3772..ca6c8ad31283 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3104,12 +3104,6 @@ libprotoc.so.30 libprotoc-3.19.4_1
 libprotobuf.so.30 libprotobuf-3.19.4_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 df264c9d7501..2dcf832e66c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -406,6 +406,8 @@ replaces="
  zuluplay-devel<=1.1_1
  zuluplay<=1.1_1
  bgc<=1.0.1_1
+ guile1.8-devel<=1.8.8_3
+ guile1.8<=1.8.8_3
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: lilypond: update to 2.23.7
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
@ 2022-03-28 18:40 ` newbluemoon
  2022-04-10 13:59 ` [PR PATCH] [Updated] " newbluemoon
                   ` (22 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-03-28 18:40 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#issuecomment-1081007998

Comment:
All checks succeed locally. No clue why they sometimes fail with CI.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.7
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
  2022-03-28 18:40 ` newbluemoon
@ 2022-04-10 13:59 ` newbluemoon
  2022-04-25 19:55 ` newbluemoon
                   ` (21 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-04-10 13:59 UTC (permalink / raw)
  To: ml

[-- 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.7
<!-- 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: 10921 bytes --]

From 35a79664a415ebd05a3d45d10bf5bbef4ef4f5f5 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.7

---
 srcpkgs/lilypond/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..3b2d73fa05c9 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+version=2.23.7
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -9,20 +9,18 @@ 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
  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=b5674df4c2371cb6d59a06ea54eaba6c87f2e7c503c9f17ec3db3facd61807c0
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From 396193f99769923e4079e030196c24767e98963b 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.7

---
 srcpkgs/lilypond-doc/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..03e97dd21c40 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,17 +1,16 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+version=2.23.7
 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=a257ba62e2f2588754482a2a171ffae06385b28633b628b55bed71524c1ee597
 
 do_install() {
-	vmkdir usr
-	rm share/info/lilypond
-	mv share ${DESTDIR}/usr/
+	vmkdir usr/share/doc/lilypond/html
+	mv * ${DESTDIR}/usr/share/doc/lilypond/html
 }

From 4048ec58867e54345312dece065007ce9c394460 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 673c62085f5b..dc2ad4283067 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3104,12 +3104,6 @@ libprotoc.so.30 libprotoc-3.19.4_1
 libprotobuf.so.30 libprotobuf-3.19.4_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 6859fe29da93..6da5e775c432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -416,6 +416,8 @@ replaces="
  zuluplay-devel<=1.1_1
  zuluplay<=1.1_1
  bgc<=1.0.1_1
+ guile1.8-devel<=1.8.8_3
+ guile1.8<=1.8.8_3
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.7
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
  2022-03-28 18:40 ` newbluemoon
  2022-04-10 13:59 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-04-25 19:55 ` newbluemoon
  2022-04-26 17:18 ` [PR PATCH] [Updated] lilypond: update to 2.23.8 newbluemoon
                   ` (20 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-04-25 19:55 UTC (permalink / raw)
  To: ml

[-- 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.7
<!-- 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: 10777 bytes --]

From 791e8f08cb5425cc36c40fd1c23fff09f0dbcc20 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.8

---
 srcpkgs/lilypond/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..81d337b75a4d 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+version=2.23.8
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -9,20 +9,18 @@ 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
  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=b1ab55c88d133f6576ef03e010686294f259792b7b20fb230bd88b373ce169ca
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From c4d10aede8353d12ac6e89882ea3d150b432c3af 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.8

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

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..f3e9f9d94a55 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,14 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+version=2.23.8
 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=9d2b76129c17d315fee2563ad756d9965f4afe4af893bc2f8967ea6a834cb7ec
 
 do_install() {
 	vmkdir usr

From 02ee4bb88de969af74e58b55153d603f2f17ed87 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 073830fc1442..f1de4cb49292 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3105,12 +3105,6 @@ libprotoc.so.30 libprotoc-3.19.4_1
 libprotobuf.so.30 libprotobuf-3.19.4_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 0923c53cfc05..2ba12c64b15e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -417,6 +417,8 @@ replaces="
  zuluplay-devel<=1.1_1
  zuluplay<=1.1_1
  bgc<=1.0.1_1
+ guile1.8-devel<=1.8.8_3
+ guile1.8<=1.8.8_3
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (2 preceding siblings ...)
  2022-04-25 19:55 ` newbluemoon
@ 2022-04-26 17:18 ` newbluemoon
  2022-05-07 13:17 ` newbluemoon
                   ` (19 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-04-26 17:18 UTC (permalink / raw)
  To: ml

[-- 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.8
<!-- 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: 10777 bytes --]

From 60e6a3886f4b41e104e5b3d42ed4e1dd9f257794 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.8

---
 srcpkgs/lilypond/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..81d337b75a4d 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+version=2.23.8
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -9,20 +9,18 @@ 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
  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=b1ab55c88d133f6576ef03e010686294f259792b7b20fb230bd88b373ce169ca
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From d85a2548e305a3477d913ee9fa9202dca6633961 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.8

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

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..f3e9f9d94a55 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,14 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+version=2.23.8
 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=9d2b76129c17d315fee2563ad756d9965f4afe4af893bc2f8967ea6a834cb7ec
 
 do_install() {
 	vmkdir usr

From 473f118f00b192609abd4e07d8f4e88a4c946223 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 58db2bb112f5..d6b2746a7f7e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3105,12 +3105,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 0923c53cfc05..2ba12c64b15e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -417,6 +417,8 @@ replaces="
  zuluplay-devel<=1.1_1
  zuluplay<=1.1_1
  bgc<=1.0.1_1
+ guile1.8-devel<=1.8.8_3
+ guile1.8<=1.8.8_3
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (3 preceding siblings ...)
  2022-04-26 17:18 ` [PR PATCH] [Updated] lilypond: update to 2.23.8 newbluemoon
@ 2022-05-07 13:17 ` newbluemoon
  2022-05-07 15:48 ` newbluemoon
                   ` (18 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-07 13:17 UTC (permalink / raw)
  To: ml

[-- 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.8
<!-- 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: 10777 bytes --]

From 04e5f4b85da93cbd4ecdd0e7ffb2521a5859dc7f 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.8

---
 srcpkgs/lilypond/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..81d337b75a4d 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+version=2.23.8
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -9,20 +9,18 @@ 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
  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=b1ab55c88d133f6576ef03e010686294f259792b7b20fb230bd88b373ce169ca
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From 759236b252dacc4dc199cccaa1419b5247d63206 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.8

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

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..f3e9f9d94a55 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,14 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+version=2.23.8
 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=9d2b76129c17d315fee2563ad756d9965f4afe4af893bc2f8967ea6a834cb7ec
 
 do_install() {
 	vmkdir usr

From 6ea19ea7053913f394546356c49ed88b47144fc2 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 353e291f59d6..bb8b9f330226 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3109,12 +3109,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 0923c53cfc05..2ba12c64b15e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -417,6 +417,8 @@ replaces="
  zuluplay-devel<=1.1_1
  zuluplay<=1.1_1
  bgc<=1.0.1_1
+ guile1.8-devel<=1.8.8_3
+ guile1.8<=1.8.8_3
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (4 preceding siblings ...)
  2022-05-07 13:17 ` newbluemoon
@ 2022-05-07 15:48 ` newbluemoon
  2022-05-07 15:49 ` newbluemoon
                   ` (17 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-07 15:48 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#issuecomment-1120230984

Comment:
All checks succeed locally.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (5 preceding siblings ...)
  2022-05-07 15:48 ` newbluemoon
@ 2022-05-07 15:49 ` newbluemoon
  2022-05-07 21:07 ` [PR REVIEW] " paper42
                   ` (16 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-07 15:49 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#issuecomment-1120230984

Comment:
Re-ran all checks, they succeed locally.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (6 preceding siblings ...)
  2022-05-07 15:49 ` newbluemoon
@ 2022-05-07 21:07 ` paper42
  2022-05-07 21:08 ` paper42
                   ` (15 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: paper42 @ 2022-05-07 21:07 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#discussion_r867395104

Comment:
```
hostmakedepends="autogen automake bison flex fontforge gettext guile1.8 perl
```
guile1.8 is removed with this PR, so it can't be in hostmakedepends

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (7 preceding siblings ...)
  2022-05-07 21:07 ` [PR REVIEW] " paper42
@ 2022-05-07 21:08 ` paper42
  2022-05-08  5:03 ` [PR PATCH] [Updated] " newbluemoon
                   ` (14 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: paper42 @ 2022-05-07 21:08 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#discussion_r867395214

Comment:
could you move this up to keep this list at least a bit alphabetically sorted?

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (8 preceding siblings ...)
  2022-05-07 21:08 ` paper42
@ 2022-05-08  5:03 ` newbluemoon
  2022-05-08  5:12 ` [PR REVIEW] " newbluemoon
                   ` (13 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-08  5:03 UTC (permalink / raw)
  To: ml

[-- 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.8
<!-- 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: 10895 bytes --]

From 0687a9f2e2574a7fa692ffa806cf7fd7ff97a542 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.8

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

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..ef1be1b4177b 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,28 +1,26 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+version=2.23.8
 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=b1ab55c88d133f6576ef03e010686294f259792b7b20fb230bd88b373ce169ca
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From 1d16990f95b94dd565c4878cfbbec2344dd2a6f6 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.8

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

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..f3e9f9d94a55 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,14 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+version=2.23.8
 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=9d2b76129c17d315fee2563ad756d9965f4afe4af893bc2f8967ea6a834cb7ec
 
 do_install() {
 	vmkdir usr

From d9ba22a10c32e427b88b2fdbe8983220ef17475b 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 784375c7c9aa..304a3c2d6475 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3109,12 +3109,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 0923c53cfc05..6e5611a78dc5 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

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (9 preceding siblings ...)
  2022-05-08  5:03 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-05-08  5:12 ` newbluemoon
  2022-05-08  5:13 ` newbluemoon
                   ` (12 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-08  5:12 UTC (permalink / raw)
  To: ml

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

New review comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#discussion_r867436042

Comment:
Thanks for noticing. :) It’s removed now.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (10 preceding siblings ...)
  2022-05-08  5:12 ` [PR REVIEW] " newbluemoon
@ 2022-05-08  5:13 ` newbluemoon
  2022-05-08  5:16 ` newbluemoon
                   ` (11 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-08  5:13 UTC (permalink / raw)
  To: ml

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

New review comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#discussion_r867436089

Comment:
Sure and done. :)

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (11 preceding siblings ...)
  2022-05-08  5:13 ` newbluemoon
@ 2022-05-08  5:16 ` newbluemoon
  2022-05-22 19:01 ` [PR PATCH] [Updated] " newbluemoon
                   ` (10 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-08  5:16 UTC (permalink / raw)
  To: ml

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

New review comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#discussion_r867436042

Comment:
Thanks for noticing. :) It’s not needed there anymore anyway and removed now.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.8
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (12 preceding siblings ...)
  2022-05-08  5:16 ` newbluemoon
@ 2022-05-22 19:01 ` newbluemoon
  2022-05-30 17:32 ` [PR PATCH] [Updated] lilypond: update to 2.23.9 newbluemoon
                   ` (9 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-22 19:01 UTC (permalink / raw)
  To: ml

[-- 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.8
<!-- 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: 10895 bytes --]

From af21bee89aba95b2af87cb100c3a11eca45b377e 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 | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..817fe86d1db2 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,28 +1,26 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+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
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From a70c3dafad809fd78e3df8036e42af93f3609031 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..7e8434c16b8e 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,14 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+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 4d5ee2079f177cfeca7cdcd78a687f61b1f3df8f 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 058109664658..d9e37959a3bd 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

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (13 preceding siblings ...)
  2022-05-22 19:01 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-05-30 17:32 ` newbluemoon
  2022-05-30 18:07 ` newbluemoon
                   ` (8 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-30 17:32 UTC (permalink / raw)
  To: ml

[-- 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: 10895 bytes --]

From deada24853c142fb37782a5f04f6c8c1938cd5fd 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 | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..817fe86d1db2 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,28 +1,26 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+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
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From 9b579b092170116df29d1c88666b82bcce22c9a0 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..7e8434c16b8e 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,14 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+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 b042455c094db5da013c2e988f8c999672f550fb 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 8ed7c948eed0..39ac4d41f066 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

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (14 preceding siblings ...)
  2022-05-30 17:32 ` [PR PATCH] [Updated] lilypond: update to 2.23.9 newbluemoon
@ 2022-05-30 18:07 ` newbluemoon
  2022-06-01 19:45 ` paper42
                   ` (7 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-05-30 18:07 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#issuecomment-1141388531

Comment:
All checks pass locally.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (15 preceding siblings ...)
  2022-05-30 18:07 ` newbluemoon
@ 2022-06-01 19:45 ` paper42
  2022-06-01 19:53 ` [PR PATCH] [Updated] " newbluemoon
                   ` (6 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: paper42 @ 2022-06-01 19:45 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#issuecomment-1144062597

Comment:
> All checks pass locally.

Then please add `make_check=ci-skip # reason`

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (16 preceding siblings ...)
  2022-06-01 19:45 ` paper42
@ 2022-06-01 19:53 ` newbluemoon
  2022-06-01 19:54 ` newbluemoon
                   ` (5 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-06-01 19:53 UTC (permalink / raw)
  To: ml

[-- 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: 10938 bytes --]

From 107371bd64986bf7c62836a387ec9003551dc189 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 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..a31bceadc08b 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,28 +1,27 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+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 # checks pass locally
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
 	makedepends+=" libfl-devel"
 fi
 

From f15139d11ee58f0de3ae00988bbb97e2ec8cac88 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..7e8434c16b8e 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,14 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+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 9bdefd591f8a8608c59bbdb549e0c9b574a8f00d 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

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (17 preceding siblings ...)
  2022-06-01 19:53 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-06-01 19:54 ` newbluemoon
  2022-06-01 19:56 ` [PR PATCH] [Updated] " newbluemoon
                   ` (4 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-06-01 19:54 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#issuecomment-1144071018

Comment:
@paper42 Done :)

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (18 preceding siblings ...)
  2022-06-01 19:54 ` newbluemoon
@ 2022-06-01 19:56 ` newbluemoon
  2022-06-01 20:53 ` [PR REVIEW] " paper42
                   ` (3 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-06-01 19:56 UTC (permalink / raw)
  To: ml

[-- 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: 10956 bytes --]

From c88fc1e2ad3b0babf74e422cd1b07d2b39b9ca26 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 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 0cc74759a100..5b94fe8761b4 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,28 +1,27 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.6
+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 e443b85eb8f2c83cbf6f016fcebe7d43eeeffa8a 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index f0ee3b262e90..7e8434c16b8e 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,14 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.6
+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 fd5d920b8d4bd611ce95923c46adee6246b30014 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

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (19 preceding siblings ...)
  2022-06-01 19:56 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-06-01 20:53 ` paper42
  2022-06-01 21:18 ` [PR PATCH] [Updated] " newbluemoon
                   ` (2 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: paper42 @ 2022-06-01 20:53 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#discussion_r887288212

Comment:
we should add a notice near the top of lilypond and lilypond-doc that they should be kept in sync like it's done in vala and valadoc

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (20 preceding siblings ...)
  2022-06-01 20:53 ` [PR REVIEW] " paper42
@ 2022-06-01 21:18 ` newbluemoon
  2022-06-01 21:19 ` [PR REVIEW] " newbluemoon
  2022-06-01 21:39 ` [PR PATCH] [Merged]: " paper42
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-06-01 21:18 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (21 preceding siblings ...)
  2022-06-01 21:18 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-06-01 21:19 ` newbluemoon
  2022-06-01 21:39 ` [PR PATCH] [Merged]: " paper42
  23 siblings, 0 replies; 25+ messages in thread
From: newbluemoon @ 2022-06-01 21:19 UTC (permalink / raw)
  To: ml

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

New review comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/36394#discussion_r887312171

Comment:
Done.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Merged]: lilypond: update to 2.23.9
  2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
                   ` (22 preceding siblings ...)
  2022-06-01 21:19 ` [PR REVIEW] " newbluemoon
@ 2022-06-01 21:39 ` paper42
  23 siblings, 0 replies; 25+ messages in thread
From: paper42 @ 2022-06-01 21:39 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

lilypond: update to 2.23.9
https://github.com/void-linux/void-packages/pull/36394

Description:
<!-- 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



^ permalink raw reply	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2022-06-01 21:39 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-28 17:57 [PR PATCH] lilypond: update to 2.23.7 newbluemoon
2022-03-28 18:40 ` newbluemoon
2022-04-10 13:59 ` [PR PATCH] [Updated] " newbluemoon
2022-04-25 19:55 ` newbluemoon
2022-04-26 17:18 ` [PR PATCH] [Updated] lilypond: update to 2.23.8 newbluemoon
2022-05-07 13:17 ` newbluemoon
2022-05-07 15:48 ` newbluemoon
2022-05-07 15:49 ` newbluemoon
2022-05-07 21:07 ` [PR REVIEW] " paper42
2022-05-07 21:08 ` paper42
2022-05-08  5:03 ` [PR PATCH] [Updated] " newbluemoon
2022-05-08  5:12 ` [PR REVIEW] " newbluemoon
2022-05-08  5:13 ` newbluemoon
2022-05-08  5:16 ` newbluemoon
2022-05-22 19:01 ` [PR PATCH] [Updated] " newbluemoon
2022-05-30 17:32 ` [PR PATCH] [Updated] lilypond: update to 2.23.9 newbluemoon
2022-05-30 18:07 ` newbluemoon
2022-06-01 19:45 ` paper42
2022-06-01 19:53 ` [PR PATCH] [Updated] " newbluemoon
2022-06-01 19:54 ` newbluemoon
2022-06-01 19:56 ` [PR PATCH] [Updated] " newbluemoon
2022-06-01 20:53 ` [PR REVIEW] " paper42
2022-06-01 21:18 ` [PR PATCH] [Updated] " newbluemoon
2022-06-01 21:19 ` [PR REVIEW] " newbluemoon
2022-06-01 21:39 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).