[PR PATCH] lilypond: update to 2.21.2

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] lilypond: update to 2.21.2
@ 2020-07-12  7:45 newbluemoon
  2020-07-14 18:58 ` [PR PATCH] [Updated] " newbluemoon
                   ` (21 more replies)
  0 siblings, 22 replies; 23+ messages in thread
From: newbluemoon @ 2020-07-12  7:45 UTC (permalink / raw)
  To: ml

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

lilypond: update to 2.21.2
Tested on x86_64, x86_64-musl, i686 and armv7l.

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: 2148 bytes --]

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

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

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 82012a2a8a6..c3ec8e831f7 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.1
+version=2.21.2
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -16,7 +16,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/sources/v2.21/lilypond-${version}.tar.gz"
-checksum=b7ccd72488b0838bc1ae5f490d6acefb292a902d977f6ed05f1eb26d30137e5e
+checksum=af5dd5fce4f7d2850fb07104c1c837f398f336a27032e356306e6a987f86a3a3
 python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then

From 0673199830e78dee43b00f0fcbf8e1a85f1b7e77 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jul 2020 09:41:23 +0200
Subject: [PATCH 2/2] lilypond-doc: update to 2.21.2.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..ec10640f152 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.2.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=aec95f88512ab1b13d1e47981cce0d39d61a57e3961814763c9f2bbfceaf1f00
 
 do_install() {
 	vmkdir usr

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.21.2
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
@ 2020-07-14 18:58 ` newbluemoon
  2020-07-14 19:12 ` lilypond: update to 2.21.3 newbluemoon
                   ` (20 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-07-14 18:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 372 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.2
Tested on x86_64, x86_64-musl, i686 and armv7l.

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: 2148 bytes --]

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

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

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 82012a2a8a6..68f7cbc30b3 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.1
+version=2.21.3
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -16,7 +16,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/sources/v2.21/lilypond-${version}.tar.gz"
-checksum=b7ccd72488b0838bc1ae5f490d6acefb292a902d977f6ed05f1eb26d30137e5e
+checksum=927975f3357c53369900425dcd88925022d32b597756226cee5fafb7ba798397
 python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then

From 1611c676ee2bbee7635aa3f8fe63050bc1b9fbd3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jul 2020 09:41:23 +0200
Subject: [PATCH 2/2] lilypond-doc: update to 2.21.3.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..055ecd1eac9 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.3.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=fbbce3fa74d794e4c3dcf9465a1f5f612738e36ead717fb73761333d299ff204
 
 do_install() {
 	vmkdir usr

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

* Re: lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
  2020-07-14 18:58 ` [PR PATCH] [Updated] " newbluemoon
@ 2020-07-14 19:12 ` newbluemoon
  2020-07-26 15:47 ` [PR PATCH] [Updated] " newbluemoon
                   ` (19 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-07-14 19:12 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-658361564

Comment:
I’ll work on using the new system-texlive instead of texlive-bin for the next update which should simplify the template a bit and should prevent those 'tlmgr not found' errors. In the meantime this should be good as is.

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
  2020-07-14 18:58 ` [PR PATCH] [Updated] " newbluemoon
  2020-07-14 19:12 ` lilypond: update to 2.21.3 newbluemoon
@ 2020-07-26 15:47 ` newbluemoon
  2020-07-26 15:56 ` newbluemoon
                   ` (18 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-07-26 15:47 UTC (permalink / raw)
  To: ml

[-- 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.3
(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: 5497 bytes --]

From ed4896d855116fa386b36fa53b7884861dcb7e03 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.3

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

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 82012a2a8a6..ac14829479f 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,14 +1,14 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.1
+version=2.21.3
 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"
@@ -16,7 +16,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/sources/v2.21/lilypond-${version}.tar.gz"
-checksum=b7ccd72488b0838bc1ae5f490d6acefb292a902d977f6ed05f1eb26d30137e5e
+checksum=927975f3357c53369900425dcd88925022d32b597756226cee5fafb7ba798397
 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 704dea8166874ab6543dde6c00a73fe3513ba710 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.3.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..055ecd1eac9 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.3.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=fbbce3fa74d794e4c3dcf9465a1f5f612738e36ead717fb73761333d299ff204
 
 do_install() {
 	vmkdir usr

From 8199fed5a46719101120563a086035e109de0287 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
+}

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

* Re: lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (2 preceding siblings ...)
  2020-07-26 15:47 ` [PR PATCH] [Updated] " newbluemoon
@ 2020-07-26 15:56 ` newbluemoon
  2020-07-26 22:59 ` fosslinux
                   ` (17 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-07-26 15:56 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-664005394

Comment:
Modified the template to use system texlive now. Tested on x86_64-musl, armv7l-musl, built for i686 (not tested, yet). No problems encountered so far.

However, to build it needs `t1utils` which is disabled in the `texlive` template. So I made it an extra package, but I’m not sure if it should be provided by `texlive` as `texlive-bin` does? @fosslinux is there a reason you omitted it?

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

* Re: lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (3 preceding siblings ...)
  2020-07-26 15:56 ` newbluemoon
@ 2020-07-26 22:59 ` fosslinux
  2020-07-26 23:42 ` q66
                   ` (16 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: fosslinux @ 2020-07-26 22:59 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-664051273

Comment:
Not off the top of my head. I will try to enable it. It should probably be distributed with TeXLive.

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

* Re: lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (4 preceding siblings ...)
  2020-07-26 22:59 ` fosslinux
@ 2020-07-26 23:42 ` q66
  2020-07-27  3:15 ` newbluemoon
                   ` (15 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: q66 @ 2020-07-26 23:42 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-664055915

Comment:
why does lilypond need texlive at all?

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

* Re: lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (5 preceding siblings ...)
  2020-07-26 23:42 ` q66
@ 2020-07-27  3:15 ` newbluemoon
  2020-07-27  4:04 ` q66
                   ` (14 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-07-27  3:15 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-664096754

Comment:
@q66 For once it takes the tex-gyre fonts, translates them with `t1asm` and packages them.

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

* Re: lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (6 preceding siblings ...)
  2020-07-27  3:15 ` newbluemoon
@ 2020-07-27  4:04 ` q66
  2020-07-27  4:08 ` q66
                   ` (13 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: q66 @ 2020-07-27  4:04 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-664107334

Comment:
can't we somehow separate that so that it doesn't need to install texlive to build?

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

* Re: lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (7 preceding siblings ...)
  2020-07-27  4:04 ` q66
@ 2020-07-27  4:08 ` q66
  2020-07-27  6:55 ` newbluemoon
                   ` (12 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: q66 @ 2020-07-27  4:08 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-664108098

Comment:
as far as i can tell, we can, it doesn't seem to need the texlive distribution, just the font and the util

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

* Re: lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (8 preceding siblings ...)
  2020-07-27  4:08 ` q66
@ 2020-07-27  6:55 ` newbluemoon
  2020-07-27  8:49 ` [PR PATCH] [Updated] " newbluemoon
                   ` (11 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-07-27  6:55 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-664156807

Comment:
It also needs texlive for creating the docs, but since we ship the pre-built ones anyway it doesn’t matter.
And it isn’t really a runtime-dependency, only optional. So I’m going to drop the `INSTALL.msg`.

Regarding the fonts I think listing them as `distfiles` and pointing `configure` to them might be easiest. I’ll try to see how it works out.

We have to keep `t1utils` as a separate package then, but other distributions (debian, ubuntu, arch) have it separately, too.

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (9 preceding siblings ...)
  2020-07-27  6:55 ` newbluemoon
@ 2020-07-27  8:49 ` newbluemoon
  2020-07-27  8:53 ` newbluemoon
                   ` (10 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-07-27  8:49 UTC (permalink / raw)
  To: ml

[-- 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.3
(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 84a710385c3598b9c11d5e9547ea78df1d982644 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.3

---
 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..0165879d276 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.3
 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=927975f3357c53369900425dcd88925022d32b597756226cee5fafb7ba798397
 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 227b0b05c098721a753e6c7fdd97abe64e8f10ef 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.3.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..055ecd1eac9 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.3.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=fbbce3fa74d794e4c3dcf9465a1f5f612738e36ead717fb73761333d299ff204
 
 do_install() {
 	vmkdir usr

From cb2bea5f835c019cd8ce06678e326d806b87a6c7 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
+}

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

* Re: lilypond: update to 2.21.3
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (10 preceding siblings ...)
  2020-07-27  8:49 ` [PR PATCH] [Updated] " newbluemoon
@ 2020-07-27  8:53 ` newbluemoon
  2020-08-18  5:43 ` [PR PATCH] [Updated] lilypond: update to 2.21.4 newbluemoon
                   ` (9 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-07-27  8:53 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-664212037

Comment:
It needs MetaFont and MetaPost. So texlive is still required.

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.21.4
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (11 preceding siblings ...)
  2020-07-27  8:53 ` newbluemoon
@ 2020-08-18  5:43 ` newbluemoon
  2020-08-22 19:13 ` newbluemoon
                   ` (8 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-08-18  5:43 UTC (permalink / raw)
  To: ml

[-- 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 d1e85598376408fdbefd4072146a8b92e8391c1e 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.4

---
 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..cffd6a891da 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.4
 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=db57981fc27d75025efa769a20465ca20b0889b7ae562bbb199886bf986a05f2
 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 22c3f368a0a16d2e65804bc0c3e5d975868a37be 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.4.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..4d4dfde4618 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.4.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=8b94fa0f3401c7e118c7afff804ad32a29ce8ae4710e24273e95b14712da08ad
 
 do_install() {
 	vmkdir usr

From 533736af40a5206e0e938fa961aaba29c1f1a2e6 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
+}

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.21.4
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (12 preceding siblings ...)
  2020-08-18  5:43 ` [PR PATCH] [Updated] lilypond: update to 2.21.4 newbluemoon
@ 2020-08-22 19:13 ` newbluemoon
  2020-08-22 19:20 ` lilypond: update to 2.21.5 newbluemoon
                   ` (7 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-08-22 19:13 UTC (permalink / raw)
  To: ml

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

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

* Re: lilypond: update to 2.21.5
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (13 preceding siblings ...)
  2020-08-22 19:13 ` newbluemoon
@ 2020-08-22 19:20 ` newbluemoon
  2020-08-30 13:12 ` [PR PATCH] [Updated] " newbluemoon
                   ` (6 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-08-22 19:20 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23531#issuecomment-678681337

Comment:
2.21.5 tested on x86_64-musl.

Any suggestion on how to proceed further? Keep t1utils as a separate package (as e.g. Debian has it) or provide it by texlive?

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.21.5
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (14 preceding siblings ...)
  2020-08-22 19:20 ` lilypond: update to 2.21.5 newbluemoon
@ 2020-08-30 13:12 ` newbluemoon
  2020-08-31  5:11 ` [PR PATCH] [Updated] lilypond: use system texlive for build newbluemoon
                   ` (5 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-08-30 13:12 UTC (permalink / raw)
  To: ml

[-- 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.5
(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: 5807 bytes --]

From fe1650b2734478869e2725d48c98c2a079a5f6f1 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: use system texlive for build

---
 srcpkgs/lilypond/INSTALL.msg |  1 -
 srcpkgs/lilypond/template    | 21 ++++-----------------
 2 files changed, 4 insertions(+), 18 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 1d2ded8aabb..7d60cc20df6 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -6,18 +6,17 @@ 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"
+homepage="https://lilypond.org/"
+distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz"
 checksum=09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb
-patch_args="-Np1"
 python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then
@@ -28,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
@@ -40,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 78c23ffa1d9a6c9a5e3e705c433f13d978b48d90 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 71ae63988530eeb33c0b544273f6ba50d57dcf7a 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
+}

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

* Re: [PR PATCH] [Updated] lilypond: use system texlive for build
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (15 preceding siblings ...)
  2020-08-30 13:12 ` [PR PATCH] [Updated] " newbluemoon
@ 2020-08-31  5:11 ` newbluemoon
  2020-09-20 16:15 ` newbluemoon
                   ` (4 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-08-31  5:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 434 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: use system texlive for build
(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: 4714 bytes --]

From 916fc2f7d2c5df13506277960c02565781c46f77 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jul 2020 09:41:01 +0200
Subject: [PATCH 1/2] lilypond: use system texlive for build

---
 srcpkgs/lilypond/INSTALL.msg |  1 -
 srcpkgs/lilypond/template    | 21 ++++-----------------
 2 files changed, 4 insertions(+), 18 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 1d2ded8aabb..7d60cc20df6 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -6,18 +6,17 @@ 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"
+homepage="https://lilypond.org/"
+distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz"
 checksum=09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb
-patch_args="-Np1"
 python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then
@@ -28,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
@@ -40,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 818a90cb88dcadd969d5c82bb19bb94c258121ce Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 26 Jul 2020 17:45:48 +0200
Subject: [PATCH 2/2] 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
+}

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

* Re: [PR PATCH] [Updated] lilypond: use system texlive for build
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (16 preceding siblings ...)
  2020-08-31  5:11 ` [PR PATCH] [Updated] lilypond: use system texlive for build newbluemoon
@ 2020-09-20 16:15 ` newbluemoon
  2020-09-26 13:33 ` [PR PATCH] [Updated] lilypond: update to 2.21.6 newbluemoon
                   ` (3 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-09-20 16:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 434 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: use system texlive for build
(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: 6053 bytes --]

From 248cf99c78d7a145efe7944ed98d27774f8c4737 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 26 Jul 2020 17:45:48 +0200
Subject: [PATCH 1/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
+}

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

and use system texlive for build
---
 srcpkgs/lilypond/INSTALL.msg |  1 -
 srcpkgs/lilypond/template    | 25 ++++++-------------------
 2 files changed, 6 insertions(+), 20 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 1d2ded8aabb..125e03ef9ed 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,23 +1,22 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.5
+version=2.21.6
 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=09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb
-patch_args="-Np1"
+homepage="https://lilypond.org/"
+distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz"
+checksum=24aa358d7da5ea32294a4fc98acd72e78606afdc3bd411a331b2490c15b9acb7
 python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then
@@ -28,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
@@ -40,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 b969e91831c0c5248903fa6d315cdf45bef25591 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 20 Sep 2020 15:19:50 +0200
Subject: [PATCH 3/3] lilypond-doc: update to 2.21.6

and drop noarch
---
 srcpkgs/lilypond-doc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index ce4dcfcd48e..f73a2576063 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,15 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.21.5
+version=2.21.6
 revision=1
-archs=noarch
 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="http://lilypond.org/"
 distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=f2b7b6bfca87b871c5d12dfc3e8488ed370e27a3e10e31f4d55a1f40c0245232
+checksum=d4afbfe4a363a94a09612dece2e1428f56b18c313c213534ec38eaa914e4d97e
 
 do_install() {
 	vmkdir usr

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.21.6
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (17 preceding siblings ...)
  2020-09-20 16:15 ` newbluemoon
@ 2020-09-26 13:33 ` newbluemoon
  2020-10-03  8:05 ` newbluemoon
                   ` (2 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-09-26 13:33 UTC (permalink / raw)
  To: ml

[-- 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.6
(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: 6053 bytes --]

From cef407ba2d0f0bb67a548a1bc7675dff7a59dc41 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 26 Jul 2020 17:45:48 +0200
Subject: [PATCH 1/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
+}

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

and use system texlive for build
---
 srcpkgs/lilypond/INSTALL.msg |  1 -
 srcpkgs/lilypond/template    | 25 ++++++-------------------
 2 files changed, 6 insertions(+), 20 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 1d2ded8aabb..125e03ef9ed 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,23 +1,22 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.5
+version=2.21.6
 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=09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb
-patch_args="-Np1"
+homepage="https://lilypond.org/"
+distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz"
+checksum=24aa358d7da5ea32294a4fc98acd72e78606afdc3bd411a331b2490c15b9acb7
 python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then
@@ -28,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
@@ -40,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 c2345cd834722fa0108d253f055b786335f4bb70 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 20 Sep 2020 15:19:50 +0200
Subject: [PATCH 3/3] lilypond-doc: update to 2.21.6

and drop noarch
---
 srcpkgs/lilypond-doc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index ce4dcfcd48e..f73a2576063 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,15 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.21.5
+version=2.21.6
 revision=1
-archs=noarch
 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="http://lilypond.org/"
 distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=f2b7b6bfca87b871c5d12dfc3e8488ed370e27a3e10e31f4d55a1f40c0245232
+checksum=d4afbfe4a363a94a09612dece2e1428f56b18c313c213534ec38eaa914e4d97e
 
 do_install() {
 	vmkdir usr

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.21.6
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (18 preceding siblings ...)
  2020-09-26 13:33 ` [PR PATCH] [Updated] lilypond: update to 2.21.6 newbluemoon
@ 2020-10-03  8:05 ` newbluemoon
  2020-10-12 17:52 ` newbluemoon
  2020-10-24 15:09 ` [PR PATCH] [Merged]: lilypond: update to 2.21.7 leahneukirchen
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-10-03  8:05 UTC (permalink / raw)
  To: ml

[-- 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.6
(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: 6053 bytes --]

From 1f0e1da20c4d603158e1d22e7933fec1305a60e5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 26 Jul 2020 17:45:48 +0200
Subject: [PATCH 1/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
+}

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

and use system texlive for build
---
 srcpkgs/lilypond/INSTALL.msg |  1 -
 srcpkgs/lilypond/template    | 25 ++++++-------------------
 2 files changed, 6 insertions(+), 20 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 1d2ded8aabb..125e03ef9ed 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,23 +1,22 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.5
+version=2.21.6
 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=09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb
-patch_args="-Np1"
+homepage="https://lilypond.org/"
+distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz"
+checksum=24aa358d7da5ea32294a4fc98acd72e78606afdc3bd411a331b2490c15b9acb7
 python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then
@@ -28,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
@@ -40,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 2ea768a3eb9909716bc3f983fcdeedeafc53200d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 20 Sep 2020 15:19:50 +0200
Subject: [PATCH 3/3] lilypond-doc: update to 2.21.6

and drop noarch
---
 srcpkgs/lilypond-doc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index ce4dcfcd48e..f73a2576063 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,15 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.21.5
+version=2.21.6
 revision=1
-archs=noarch
 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="http://lilypond.org/"
 distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=f2b7b6bfca87b871c5d12dfc3e8488ed370e27a3e10e31f4d55a1f40c0245232
+checksum=d4afbfe4a363a94a09612dece2e1428f56b18c313c213534ec38eaa914e4d97e
 
 do_install() {
 	vmkdir usr

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.21.6
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (19 preceding siblings ...)
  2020-10-03  8:05 ` newbluemoon
@ 2020-10-12 17:52 ` newbluemoon
  2020-10-24 15:09 ` [PR PATCH] [Merged]: lilypond: update to 2.21.7 leahneukirchen
  21 siblings, 0 replies; 23+ messages in thread
From: newbluemoon @ 2020-10-12 17:52 UTC (permalink / raw)
  To: ml

[-- 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.6
(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: 6053 bytes --]

From f3bf62ae7bf7abb2dede0a9b4d6a2595104866f2 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 26 Jul 2020 17:45:48 +0200
Subject: [PATCH 1/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
+}

From 0e8b661694065c78dfc08f5400d7ae83a6843b14 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 20 Sep 2020 15:19:50 +0200
Subject: [PATCH 2/3] lilypond-doc: update to 2.21.7

and drop noarch
---
 srcpkgs/lilypond-doc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index ce4dcfcd48e..03f6cf43237 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,15 +1,14 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.21.5
+version=2.21.7
 revision=1
-archs=noarch
 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="http://lilypond.org/"
 distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=f2b7b6bfca87b871c5d12dfc3e8488ed370e27a3e10e31f4d55a1f40c0245232
+checksum=d6ed668e48752803acaa430b7529a13d7eba5e05ec4864170d3aa5729eb66de7
 
 do_install() {
 	vmkdir usr

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

and use system texlive for build
---
 srcpkgs/lilypond/INSTALL.msg |  1 -
 srcpkgs/lilypond/template    | 25 ++++++-------------------
 2 files changed, 6 insertions(+), 20 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 1d2ded8aabb..ba073098e02 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,23 +1,22 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.5
+version=2.21.7
 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=09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb
-patch_args="-Np1"
+homepage="https://lilypond.org/"
+distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz"
+checksum=058a18558944305aa7b8bca1a1098dce33a177cf108ed7eafeecdc0e7dd754ff
 python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then
@@ -28,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
@@ -40,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

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

* Re: [PR PATCH] [Merged]: lilypond: update to 2.21.7
  2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
                   ` (20 preceding siblings ...)
  2020-10-12 17:52 ` newbluemoon
@ 2020-10-24 15:09 ` leahneukirchen
  21 siblings, 0 replies; 23+ messages in thread
From: leahneukirchen @ 2020-10-24 15:09 UTC (permalink / raw)
  To: ml

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

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

lilypond: update to 2.21.7
https://github.com/void-linux/void-packages/pull/23531

Description:
(obsolete: Tested 2.21.2 on x86_64, x86_64-musl, i686 and armv7l.)
Tested 2.21.3 on x86_64-musl.

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

end of thread, other threads:[~2020-10-24 15:09 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-12  7:45 [PR PATCH] lilypond: update to 2.21.2 newbluemoon
2020-07-14 18:58 ` [PR PATCH] [Updated] " newbluemoon
2020-07-14 19:12 ` lilypond: update to 2.21.3 newbluemoon
2020-07-26 15:47 ` [PR PATCH] [Updated] " newbluemoon
2020-07-26 15:56 ` newbluemoon
2020-07-26 22:59 ` fosslinux
2020-07-26 23:42 ` q66
2020-07-27  3:15 ` newbluemoon
2020-07-27  4:04 ` q66
2020-07-27  4:08 ` q66
2020-07-27  6:55 ` newbluemoon
2020-07-27  8:49 ` [PR PATCH] [Updated] " newbluemoon
2020-07-27  8:53 ` newbluemoon
2020-08-18  5:43 ` [PR PATCH] [Updated] lilypond: update to 2.21.4 newbluemoon
2020-08-22 19:13 ` newbluemoon
2020-08-22 19:20 ` lilypond: update to 2.21.5 newbluemoon
2020-08-30 13:12 ` [PR PATCH] [Updated] " newbluemoon
2020-08-31  5:11 ` [PR PATCH] [Updated] lilypond: use system texlive for build newbluemoon
2020-09-20 16:15 ` newbluemoon
2020-09-26 13:33 ` [PR PATCH] [Updated] lilypond: update to 2.21.6 newbluemoon
2020-10-03  8:05 ` newbluemoon
2020-10-12 17:52 ` newbluemoon
2020-10-24 15:09 ` [PR PATCH] [Merged]: lilypond: update to 2.21.7 leahneukirchen

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).