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

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

[-- Attachment #1: Type: text/plain, Size: 422 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/23531

lilypond: update to 2.21.4
(obsolete: Tested 2.21.2 on x86_64, x86_64-musl, i686 and armv7l.)
Tested 2.21.3 on x86_64-musl.

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

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

From ff5880f74dd454f5592b4bc6162cea1da1b17c56 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jul 2020 09:41:01 +0200
Subject: [PATCH 1/3] lilypond: update to 2.21.5

---
 srcpkgs/lilypond/INSTALL.msg |  1 -
 srcpkgs/lilypond/template    | 24 ++++++------------------
 2 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/lilypond/INSTALL.msg

diff --git a/srcpkgs/lilypond/INSTALL.msg b/srcpkgs/lilypond/INSTALL.msg
deleted file mode 100644
index fa7f45ba1ce..00000000000
--- a/srcpkgs/lilypond/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To use lilypond a working texlive installation is also needed.
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 82012a2a8a6..7d60cc20df6 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,22 +1,22 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.1
+version=2.21.5
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
 configure_script="../configure"
 configure_args="--disable-documentation ac_cv_func_isinf=yes
- --with-texgyre-dir=/opt/texlive/2020/texmf-dist/fonts/opentype/public/tex-gyre"
+ --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre"
 hostmakedepends="autogen automake flex fontforge gettext gnupg guile1.8 pkg-config
- tar texinfo texlive-bin"
+ t1utils tar texinfo texlive"
 makedepends="gc-devel guile1.8-devel libltdl-devel pango-devel python-devel"
 depends="python ghostscript"
 short_desc="Music engraving program"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
-homepage="http://lilypond.org/"
-distfiles="http://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz"
-checksum=b7ccd72488b0838bc1ae5f490d6acefb292a902d977f6ed05f1eb26d30137e5e
+homepage="https://lilypond.org/"
+distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz"
+checksum=09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb
 python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then
@@ -27,11 +27,6 @@ if [ -n "${CROSS_BUILD}" ]; then
 	 --with-python-include=${XBPS_CROSS_BASE}/usr/include/python2.7"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl) ;;
-	*-musl) broken="TeX Live not available, yet." ;;
-esac
-
 post_extract() {
 	if [ ! -d $wrksrc/$build_wrksrc ]; then
 		mkdir $wrksrc/$build_wrksrc
@@ -39,16 +34,9 @@ post_extract() {
 }
 
 pre_configure() {
-	source /etc/profile.d/texlive.sh
-	tlmgr install t1utils lh epsf tex-gyre
 	cd .. && ./autogen.sh --noconfigure
 }
 
-do_build() {
-	source /etc/profile.d/texlive.sh
-	make ${makejobs} ${make_build_args} ${make_build_target}
-}
-
 post_install() {
 	vmkdir usr/share/vim
 	mv $DESTDIR/usr/share/lilypond/${version}/vim $DESTDIR/usr/share/vim/vim82

From 68c6ff237431ee8da9757711fefe18dbc234839e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 26 Jul 2020 17:44:34 +0200
Subject: [PATCH 2/3] lilypond-doc: update to 2.21.5.1

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

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index 1480cfe1d52..9b06433bf92 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.21.1.1
+version=2.21.5.1
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="http://lilypond.org/"
 distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version%.*}-${version##*.}.documentation.tar.bz2"
-checksum=405d9fa66e02c0578d2d183d3b2d4d30b9629beadefa5b6dcd031e3a432c375b
+checksum=f2b7b6bfca87b871c5d12dfc3e8488ed370e27a3e10e31f4d55a1f40c0245232
 
 do_install() {
 	vmkdir usr

From bab80ce4436e90fe205efd47a68eeb7e56e235cc Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 26 Jul 2020 17:45:48 +0200
Subject: [PATCH 3/3] New package: t1utils-1.41

---
 .../t1utils/patches/memmem-declaration.patch  | 22 +++++++++++++++++++
 srcpkgs/t1utils/template                      | 20 +++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 srcpkgs/t1utils/patches/memmem-declaration.patch
 create mode 100644 srcpkgs/t1utils/template

diff --git a/srcpkgs/t1utils/patches/memmem-declaration.patch b/srcpkgs/t1utils/patches/memmem-declaration.patch
new file mode 100644
index 00000000000..ae182c1fe8b
--- /dev/null
+++ b/srcpkgs/t1utils/patches/memmem-declaration.patch
@@ -0,0 +1,22 @@
+https://github.com/kohler/t1utils/issues/8
+https://github.com/kohler/t1utils/commit/3f1ddda424353f0f926dd28efa47b0ac61556ce8
+
+--- configure.ac.orig	2017-08-16 18:27:16.000000000 +0200
++++ configure.ac	2017-09-14 09:09:17.077248094 +0200
+@@ -19,6 +19,7 @@
+ dnl
+ 
+ AC_REPLACE_FUNCS([strerror memmem])
++AC_CHECK_DECLS([memmem])
+ 
+ 
+ dnl
+@@ -88,7 +89,7 @@
+ #endif
+ 
+ /* Prototype memmem if we don't have it. */
+-#if !HAVE_MEMMEM
++#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
+ void* memmem(const void* haystack, size_t haystack_len,
+              const void* needle, size_t needle_len);
+ #endif
diff --git a/srcpkgs/t1utils/template b/srcpkgs/t1utils/template
new file mode 100644
index 00000000000..78709fe513e
--- /dev/null
+++ b/srcpkgs/t1utils/template
@@ -0,0 +1,20 @@
+# Template file for 't1utils'
+pkgname=t1utils
+version=1.41
+revision=1
+build_style="gnu-configure"
+hostmakedepends="automake autoconf"
+short_desc="Type 1 font utilities"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="custom:Click"
+homepage="https://www.lcdf.org/type/#t1utils"
+distfiles="https://www.lcdf.org/type/${pkgname}-${version}.tar.gz"
+checksum=fc5edd7e829902b3b685886382fed690d533681c0ab218a387c9e47606623427
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	vlicense LICENSE
+}