Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Lilypond
@ 2022-08-14 20:10 newbluemoon
  2022-08-15  3:58 ` lilypond: update to 2.23.11 newbluemoon
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: newbluemoon @ 2022-08-14 20:10 UTC (permalink / raw)
  To: ml

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

Lilypond
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

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

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

New font package urw-core35-fonts, because lilypond doesn’t bundle the required OTF fonts anymore and the URW++ ones are used in favour of the TeX Gyre fonts, see

https://git.savannah.gnu.org/cgit/lilypond.git/commit/?id=5689c2721530c6ded22b6291ebb06d10adb5bc28

There is no release, unfortunately, but I hope it is ok to make an exception in this case. :)



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

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

From 7dbd90327149845a5fb5e3b6faabbe7c999bc6c9 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 14 Aug 2022 21:47:26 +0200
Subject: [PATCH 1/3] New package: urw-core35-fonts

---
 srcpkgs/urw-core35-fonts/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/urw-core35-fonts/template

diff --git a/srcpkgs/urw-core35-fonts/template b/srcpkgs/urw-core35-fonts/template
new file mode 100644
index 000000000000..76943af4acf7
--- /dev/null
+++ b/srcpkgs/urw-core35-fonts/template
@@ -0,0 +1,28 @@
+# Template file for 'urw-core35-fonts'
+pkgname=urw-core35-fonts
+version=0.0.0.20170804
+revision=1
+_hash=91edd6ece36e84a1c6d63a1cf63a1a6d84bd443a
+wrksrc="${pkgname}-${_hash:0:7}"
+depends="font-util"
+short_desc="URW+ core35 fonts"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="AGPL-3.0-or-later"
+homepage="https://git.ghostscript.com/?p=urw-core35-fonts.git;a=summary"
+distfiles="https://git.ghostscript.com/?p=urw-core35-fonts.git;a=snapshot;h=${_hash};sf=tgz>urw-core35-fonts-${version}.tar.gz"
+checksum=1e8d2bf93c7aed3301e2a12c672cdcf44ef50f250a57db6534ff2fb298307fa0
+font_dirs="/usr/share/fonts/OTF/
+ /usr/share/fonts/TTF"
+
+do_install() {
+	for f in ${wrksrc}/*.otf; do
+		vinstall $f 644 usr/share/fonts/OTF/
+	done
+
+	for f in ${wrksrc}/*.ttf; do
+		vinstall $f 644 usr/share/fonts/TTF/
+	done
+
+	vlicense COPYING
+	vlicense LICENSE
+}

From c93069bd86b0c1e4c8d74082e5a7cdb6e0f68448 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 14 Aug 2022 21:54:33 +0200
Subject: [PATCH 2/3] lilypond: update to 2.23.11

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

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

From 9a26eb6b21ceb6c1475a00918818eaa71aebd1c0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 14 Aug 2022 21:54:49 +0200
Subject: [PATCH 3/3] lilypond-doc: update to 2.23.11

---
 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 ae03279b9230..641c5ae2868f 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,7 +1,7 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
 # should be kept in sync with 'lilypond'
-version=2.23.10
+version=2.23.11
 revision=1
 create_wrksrc=yes
 short_desc="Documentation for the lilypond music engraving program"
@@ -9,7 +9,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
 distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz"
-checksum=8927270ec2c2dff2e0984727543a467b49ff7cb3adfd98b81a15b51277bfba75
+checksum=eb3c72ddb83d40d946a366aaffdfac02f854a6d8cd3ae1e6b597c44058e80b00
 
 do_install() {
 	vmkdir usr

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

* Re: lilypond: update to 2.23.11
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
@ 2022-08-15  3:58 ` newbluemoon
  2022-08-15  9:39 ` icp1994
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: newbluemoon @ 2022-08-15  3:58 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/38674#issuecomment-1214587665

Comment:
What fails is fetching the sources of urw-core35-fonts, but it worked with x86_64-musl so maybe this is a CI glitch? Had no problem downloading it locally.

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

* Re: lilypond: update to 2.23.11
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
  2022-08-15  3:58 ` lilypond: update to 2.23.11 newbluemoon
@ 2022-08-15  9:39 ` icp1994
  2022-08-21 12:56 ` [PR PATCH] [Updated] " newbluemoon
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: icp1994 @ 2022-08-15  9:39 UTC (permalink / raw)
  To: ml

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/38674#issuecomment-1214824947

Comment:
I think the fonts could go under the already existing `gsfonts` [package](https://github.com/void-linux/void-packages/tree/master/srcpkgs/gsfonts). The linked sourceforge in that template's `distfiles` hasn't been updated since 2004. I assume that's why the `gsfonts` [arch package](https://archlinux.org/packages/extra/any/gsfonts/) uses https://github.com/ArtifexSoftware/urw-base35-fonts as upstream.

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.11
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
  2022-08-15  3:58 ` lilypond: update to 2.23.11 newbluemoon
  2022-08-15  9:39 ` icp1994
@ 2022-08-21 12:56 ` newbluemoon
  2022-08-21 13:02 ` newbluemoon
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: newbluemoon @ 2022-08-21 12:56 UTC (permalink / raw)
  To: ml

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

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

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

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

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

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

New font package urw-core35-fonts, because lilypond doesn’t bundle the required OTF fonts anymore and the URW++ ones are used in favour of the TeX Gyre fonts, see

https://git.savannah.gnu.org/cgit/lilypond.git/commit/?id=5689c2721530c6ded22b6291ebb06d10adb5bc28

There is no release, unfortunately, but I hope it is ok to make an exception in this case. :)



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

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

From af0b66786216c435af8b3a138fca9e7e747ef2ba Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 14 Aug 2022 21:47:26 +0200
Subject: [PATCH 1/3] New package: urw-core35-fonts

---
 srcpkgs/urw-core35-fonts/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/urw-core35-fonts/template

diff --git a/srcpkgs/urw-core35-fonts/template b/srcpkgs/urw-core35-fonts/template
new file mode 100644
index 000000000000..76943af4acf7
--- /dev/null
+++ b/srcpkgs/urw-core35-fonts/template
@@ -0,0 +1,28 @@
+# Template file for 'urw-core35-fonts'
+pkgname=urw-core35-fonts
+version=0.0.0.20170804
+revision=1
+_hash=91edd6ece36e84a1c6d63a1cf63a1a6d84bd443a
+wrksrc="${pkgname}-${_hash:0:7}"
+depends="font-util"
+short_desc="URW+ core35 fonts"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="AGPL-3.0-or-later"
+homepage="https://git.ghostscript.com/?p=urw-core35-fonts.git;a=summary"
+distfiles="https://git.ghostscript.com/?p=urw-core35-fonts.git;a=snapshot;h=${_hash};sf=tgz>urw-core35-fonts-${version}.tar.gz"
+checksum=1e8d2bf93c7aed3301e2a12c672cdcf44ef50f250a57db6534ff2fb298307fa0
+font_dirs="/usr/share/fonts/OTF/
+ /usr/share/fonts/TTF"
+
+do_install() {
+	for f in ${wrksrc}/*.otf; do
+		vinstall $f 644 usr/share/fonts/OTF/
+	done
+
+	for f in ${wrksrc}/*.ttf; do
+		vinstall $f 644 usr/share/fonts/TTF/
+	done
+
+	vlicense COPYING
+	vlicense LICENSE
+}

From b34921b6df12bd535aa8a7928faafe834bde3b6d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 14 Aug 2022 21:54:33 +0200
Subject: [PATCH 2/3] lilypond: update to 2.23.11

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

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

From f08240f1353d47185fb3a2ee91184008419e3b0e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 14 Aug 2022 21:54:49 +0200
Subject: [PATCH 3/3] lilypond-doc: update to 2.23.11

---
 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 ae03279b9230..641c5ae2868f 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,7 +1,7 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
 # should be kept in sync with 'lilypond'
-version=2.23.10
+version=2.23.11
 revision=1
 create_wrksrc=yes
 short_desc="Documentation for the lilypond music engraving program"
@@ -9,7 +9,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
 distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz"
-checksum=8927270ec2c2dff2e0984727543a467b49ff7cb3adfd98b81a15b51277bfba75
+checksum=eb3c72ddb83d40d946a366aaffdfac02f854a6d8cd3ae1e6b597c44058e80b00
 
 do_install() {
 	vmkdir usr

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

* Re: lilypond: update to 2.23.11
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
                   ` (2 preceding siblings ...)
  2022-08-21 12:56 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-08-21 13:02 ` newbluemoon
  2022-08-28 19:51 ` [PR PATCH] [Updated] " newbluemoon
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: newbluemoon @ 2022-08-21 13:02 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/38674#issuecomment-1221541752

Comment:
@icp1994 Thanks for the hint, I will have a look. :)

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.11
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
                   ` (3 preceding siblings ...)
  2022-08-21 13:02 ` newbluemoon
@ 2022-08-28 19:51 ` newbluemoon
  2022-08-28 20:15 ` lilypond: update to 2.23.12 newbluemoon
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: newbluemoon @ 2022-08-28 19:51 UTC (permalink / raw)
  To: ml

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

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

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

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

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

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

New font package urw-core35-fonts, because lilypond doesn’t bundle the required OTF fonts anymore and the URW++ ones are used in favour of the TeX Gyre fonts, see

https://git.savannah.gnu.org/cgit/lilypond.git/commit/?id=5689c2721530c6ded22b6291ebb06d10adb5bc28

There is no release, unfortunately, but I hope it is ok to make an exception in this case. :)



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

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

From f3606f7be1b9d40415d9489e5b63813c546a594d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 28 Aug 2022 21:47:48 +0200
Subject: [PATCH 1/3] gsfonts: update to 20200910

---
 srcpkgs/gsfonts/template | 45 +++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/gsfonts/template b/srcpkgs/gsfonts/template
index b7e31cfd441f..5547b16c428c 100644
--- a/srcpkgs/gsfonts/template
+++ b/srcpkgs/gsfonts/template
@@ -1,20 +1,37 @@
 # Template file for 'gsfonts'
 pkgname=gsfonts
-version=8.11
-revision=7
-wrksrc=fonts
-makedepends="font-util font-misc-misc"
-depends="${makedepends}"
-short_desc="Ghostscript standard Type1 fonts"
+version=20200910
+revision=1
+wrksrc="urw-base35-fonts-${version}"
+depends="font-util"
+short_desc="URW+ base35 fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://sourceforge.net/projects/gs-fonts/"
-distfiles="${SOURCEFORGE_SITE}/ghostscript/ghostscript-fonts-std-${version}.tar.gz"
-distfiles="${SOURCEFORGE_SITE}/gs-fonts/ghostscript-fonts-std-${version}.tar.gz"
-checksum=0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401
-font_dirs="/usr/share/fonts/Type1"
+license="AGPL-3.0-or-later"
+homepage="https://github.com/ArtifexSoftware/urw-base35-fonts"
+distfiles="https://github.com/ArtifexSoftware/urw-base35-fonts/archive/refs/tags/${version}.tar.gz"
+checksum=e0d9b7f11885fdfdc4987f06b2aa0565ad2a4af52b22e5ebf79e1a98abd0ae2f
+font_dirs="/usr/share/fonts/OTF/
+ /usr/share/fonts/TTF"
 
 do_install() {
-	vmkdir usr/share/fonts/Type1
-	install -m644 ${wrksrc}/*.[ap]f[bm] ${DESTDIR}/usr/share/fonts/Type1
+	for f in ${wrksrc}/fonts/*.otf; do
+		vinstall $f 644 usr/share/fonts/OTF/
+	done
+
+	for f in ${wrksrc}/fonts/*.ttf; do
+		vinstall $f 644 usr/share/fonts/TTF/
+	done
+
+	for f in ${wrksrc}/appstream/*.xml; do
+		vinstall $f 644 usr/share/metainfo/
+	done
+
+	for f in ${wrksrc}/fontconfig/*.conf; do
+		vmkdir etc/fonts/conf.d
+		install -Dm 644 $f ${DESTDIR}/usr/share/fontconfig/conf.avail/61-${f##*/}
+		ln -sf ../../../usr/share/fontconfig/conf.avail/61-${f##*/} ${DESTDIR}/etc/fonts/conf.d/
+	done
+
+	vlicense COPYING
+	vlicense LICENSE
 }

From 04ae66f1b2967c344ecae3ecdb336d5a9df87c44 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 14 Aug 2022 21:54:33 +0200
Subject: [PATCH 2/3] lilypond: update to 2.23.12

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

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 9a2acfcb0c88..f02c6152cbd2 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,15 +1,14 @@
 # Template file for 'lilypond'
 pkgname=lilypond
 # should be kept in sync with 'lilypond-doc'
-version=2.23.10
+version=2.23.12
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
 configure_script="../configure"
-configure_args="--disable-documentation ac_cv_func_isinf=yes
- --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre"
+configure_args="--disable-documentation ac_cv_func_isinf=yes"
 hostmakedepends="autogen automake bison flex fontforge gettext perl
- pkg-config python3 t1utils tar texinfo texlive"
+ pkg-config python3 t1utils tar texinfo texlive gsfonts"
 makedepends="gc-devel guile-devel libltdl-devel pango-devel"
 depends="ghostscript guile python3"
 checkdepends="ImageMagick rsync texi2html"
@@ -18,9 +17,9 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
 distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz"
-checksum=06ac963df1699598c62f4390b8fc95344a723a88af440c00f5201c4aa8958f68
+checksum=48b67dfc9c9b96d77cfb51c0364f294c61d16fb32e6522490c363f4b82b0cff9
 python_version=3
-make_check=ci-skip # ci fails, but all checks pass locally
+make_check=ci-skip # ci sometimes fails, but all checks pass locally
 
 if [ -n "${CROSS_BUILD}" ]; then
 	makedepends+=" libfl-devel"

From b5b9aa4140b41b4a7e86cda732aa63f249278a2e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 28 Aug 2022 21:47:13 +0200
Subject: [PATCH 3/3] lilypond-doc: update to 2.23.12

---
 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 ae03279b9230..3df4ad6b7de7 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,7 +1,7 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
 # should be kept in sync with 'lilypond'
-version=2.23.10
+version=2.23.12
 revision=1
 create_wrksrc=yes
 short_desc="Documentation for the lilypond music engraving program"
@@ -9,7 +9,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
 distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz"
-checksum=8927270ec2c2dff2e0984727543a467b49ff7cb3adfd98b81a15b51277bfba75
+checksum=64104e60cbba8582069e94a186f12dc0d67423b1678cd8fe28d9a7ea088e0da3
 
 do_install() {
 	vmkdir usr

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

* Re: lilypond: update to 2.23.12
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
                   ` (4 preceding siblings ...)
  2022-08-28 19:51 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-08-28 20:15 ` newbluemoon
  2022-09-22  7:10 ` [PR REVIEW] " classabbyamp
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: newbluemoon @ 2022-08-28 20:15 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/38674#issuecomment-1229545247

Comment:
As @icp1994 suggested I updated the gsfonts package now instead of adding a new font package with redundant fonts.

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

* Re: [PR REVIEW] lilypond: update to 2.23.12
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
                   ` (5 preceding siblings ...)
  2022-08-28 20:15 ` lilypond: update to 2.23.12 newbluemoon
@ 2022-09-22  7:10 ` classabbyamp
  2022-09-26  4:50 ` [PR PATCH] [Updated] " newbluemoon
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2022-09-22  7:10 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38674#discussion_r977280012

Comment:
we should still install the Type1 fonts

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

* Re: [PR PATCH] [Updated] lilypond: update to 2.23.12
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
                   ` (6 preceding siblings ...)
  2022-09-22  7:10 ` [PR REVIEW] " classabbyamp
@ 2022-09-26  4:50 ` newbluemoon
  2022-09-26  4:53 ` [PR REVIEW] lilypond: update to 2.23.13 newbluemoon
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: newbluemoon @ 2022-09-26  4:50 UTC (permalink / raw)
  To: ml

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

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

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

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

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

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

New font package urw-core35-fonts, because lilypond doesn’t bundle the required OTF fonts anymore and the URW++ ones are used in favour of the TeX Gyre fonts, see

https://git.savannah.gnu.org/cgit/lilypond.git/commit/?id=5689c2721530c6ded22b6291ebb06d10adb5bc28

There is no release, unfortunately, but I hope it is ok to make an exception in this case. :)



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

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

From 1ef22a0e0004a85433fb4c41132c7f2ab9f39d54 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 28 Aug 2022 21:47:48 +0200
Subject: [PATCH 1/3] gsfonts: update to 20200910

---
 srcpkgs/gsfonts/template | 50 +++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/gsfonts/template b/srcpkgs/gsfonts/template
index b7e31cfd441f..0553d0b03b76 100644
--- a/srcpkgs/gsfonts/template
+++ b/srcpkgs/gsfonts/template
@@ -1,20 +1,42 @@
 # Template file for 'gsfonts'
 pkgname=gsfonts
-version=8.11
-revision=7
-wrksrc=fonts
-makedepends="font-util font-misc-misc"
-depends="${makedepends}"
-short_desc="Ghostscript standard Type1 fonts"
+version=20200910
+revision=1
+wrksrc="urw-base35-fonts-${version}"
+depends="font-util"
+short_desc="URW+ base35 fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://sourceforge.net/projects/gs-fonts/"
-distfiles="${SOURCEFORGE_SITE}/ghostscript/ghostscript-fonts-std-${version}.tar.gz"
-distfiles="${SOURCEFORGE_SITE}/gs-fonts/ghostscript-fonts-std-${version}.tar.gz"
-checksum=0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401
-font_dirs="/usr/share/fonts/Type1"
+license="AGPL-3.0-or-later"
+homepage="https://github.com/ArtifexSoftware/urw-base35-fonts"
+distfiles="https://github.com/ArtifexSoftware/urw-base35-fonts/archive/refs/tags/${version}.tar.gz"
+checksum=e0d9b7f11885fdfdc4987f06b2aa0565ad2a4af52b22e5ebf79e1a98abd0ae2f
+font_dirs="/usr/share/fonts/OTF/
+ /usr/share/fonts/TTF
+ /usr/share/fonts/Type1"
 
 do_install() {
-	vmkdir usr/share/fonts/Type1
-	install -m644 ${wrksrc}/*.[ap]f[bm] ${DESTDIR}/usr/share/fonts/Type1
+	for f in ${wrksrc}/fonts/*.otf; do
+		vinstall $f 644 usr/share/fonts/OTF/
+	done
+
+	for f in ${wrksrc}/fonts/*.ttf; do
+		vinstall $f 644 usr/share/fonts/TTF/
+	done
+
+	for f in ${wrksrc}/fonts/*.{afm,t1}; do
+		vinstall $f 644 usr/share/fonts/Type1/
+	done
+
+	for f in ${wrksrc}/appstream/*.xml; do
+		vinstall $f 644 usr/share/metainfo/
+	done
+
+	for f in ${wrksrc}/fontconfig/*.conf; do
+		vmkdir etc/fonts/conf.d
+		install -Dm 644 $f ${DESTDIR}/usr/share/fontconfig/conf.avail/61-${f##*/}
+		ln -sf ../../../usr/share/fontconfig/conf.avail/61-${f##*/} ${DESTDIR}/etc/fonts/conf.d/
+	done
+
+	vlicense COPYING
+	vlicense LICENSE
 }

From ed00c45a71b1d16f0da0b128a1db030d39efdddc Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 14 Aug 2022 21:54:33 +0200
Subject: [PATCH 2/3] lilypond: update to 2.23.13

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

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 9a2acfcb0c88..6d63fbf07223 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,15 +1,14 @@
 # Template file for 'lilypond'
 pkgname=lilypond
 # should be kept in sync with 'lilypond-doc'
-version=2.23.10
+version=2.23.13
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
 configure_script="../configure"
-configure_args="--disable-documentation ac_cv_func_isinf=yes
- --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre"
+configure_args="--disable-documentation ac_cv_func_isinf=yes"
 hostmakedepends="autogen automake bison flex fontforge gettext perl
- pkg-config python3 t1utils tar texinfo texlive"
+ pkg-config python3 t1utils tar texinfo texlive gsfonts"
 makedepends="gc-devel guile-devel libltdl-devel pango-devel"
 depends="ghostscript guile python3"
 checkdepends="ImageMagick rsync texi2html"
@@ -18,9 +17,9 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
 distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz"
-checksum=06ac963df1699598c62f4390b8fc95344a723a88af440c00f5201c4aa8958f68
+checksum=17a9d1ad0ec7d1b7501b742d6b65ef371c88007537a7b8cbc9d54573270ddf0a
 python_version=3
-make_check=ci-skip # ci fails, but all checks pass locally
+make_check=ci-skip # ci sometimes fails, but all checks pass locally
 
 if [ -n "${CROSS_BUILD}" ]; then
 	makedepends+=" libfl-devel"

From 29281facfadfdc24bc53407362ac72a2566da2e0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 28 Aug 2022 21:47:13 +0200
Subject: [PATCH 3/3] lilypond-doc: update to 2.23.13

---
 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 ae03279b9230..ed5d0132043a 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,7 +1,7 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
 # should be kept in sync with 'lilypond'
-version=2.23.10
+version=2.23.13
 revision=1
 create_wrksrc=yes
 short_desc="Documentation for the lilypond music engraving program"
@@ -9,7 +9,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
 distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz"
-checksum=8927270ec2c2dff2e0984727543a467b49ff7cb3adfd98b81a15b51277bfba75
+checksum=1cb56011bd02a9c6907d9b11fb773cb7c4303b66403429b03240d838e38af928
 
 do_install() {
 	vmkdir usr

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

* Re: [PR REVIEW] lilypond: update to 2.23.13
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
                   ` (7 preceding siblings ...)
  2022-09-26  4:50 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-09-26  4:53 ` newbluemoon
  2022-09-26  5:02 ` classabbyamp
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: newbluemoon @ 2022-09-26  4:53 UTC (permalink / raw)
  To: ml

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

New review comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/38674#discussion_r979559019

Comment:
Yes, you’re right! Type1 fonts are installed now, too. :)

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

* Re: [PR REVIEW] lilypond: update to 2.23.13
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
                   ` (8 preceding siblings ...)
  2022-09-26  4:53 ` [PR REVIEW] lilypond: update to 2.23.13 newbluemoon
@ 2022-09-26  5:02 ` classabbyamp
  2022-09-26  5:11 ` newbluemoon
  2022-09-26  5:15 ` classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2022-09-26  5:02 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38674#discussion_r979562340

Comment:
```suggestion
	for f in ${wrksrc}/fonts/*.{[ap]f[bm],t1}; do
```

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

* Re: [PR REVIEW] lilypond: update to 2.23.13
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
                   ` (9 preceding siblings ...)
  2022-09-26  5:02 ` classabbyamp
@ 2022-09-26  5:11 ` newbluemoon
  2022-09-26  5:15 ` classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: newbluemoon @ 2022-09-26  5:11 UTC (permalink / raw)
  To: ml

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

New review comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/38674#discussion_r979565932

Comment:
The archive only contains .afm and .t1 files. No .pfm or .pbm.

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

* Re: [PR REVIEW] lilypond: update to 2.23.13
  2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
                   ` (10 preceding siblings ...)
  2022-09-26  5:11 ` newbluemoon
@ 2022-09-26  5:15 ` classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2022-09-26  5:15 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38674#discussion_r979567383

Comment:
ah ok, it seems to have had those previously

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

end of thread, other threads:[~2022-09-26  5:15 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-14 20:10 [PR PATCH] Lilypond newbluemoon
2022-08-15  3:58 ` lilypond: update to 2.23.11 newbluemoon
2022-08-15  9:39 ` icp1994
2022-08-21 12:56 ` [PR PATCH] [Updated] " newbluemoon
2022-08-21 13:02 ` newbluemoon
2022-08-28 19:51 ` [PR PATCH] [Updated] " newbluemoon
2022-08-28 20:15 ` lilypond: update to 2.23.12 newbluemoon
2022-09-22  7:10 ` [PR REVIEW] " classabbyamp
2022-09-26  4:50 ` [PR PATCH] [Updated] " newbluemoon
2022-09-26  4:53 ` [PR REVIEW] lilypond: update to 2.23.13 newbluemoon
2022-09-26  5:02 ` classabbyamp
2022-09-26  5:11 ` newbluemoon
2022-09-26  5:15 ` classabbyamp

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