Github messages for voidlinux
 help / color / mirror / Atom feed
From: newbluemoon <newbluemoon@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] lilypond: update to 2.23.11
Date: Sun, 21 Aug 2022 14:56:49 +0200	[thread overview]
Message-ID: <20220821125649.cNz6wYe0apI8MvdTHH_zTO06-uf8ly7TosMamY4BF0w@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38674@inbox.vuxu.org>

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

  parent reply	other threads:[~2022-08-21 12:56 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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
2022-10-04  6:30 ` [PR PATCH] [Updated] " newbluemoon
2022-10-12  5:03 ` newbluemoon
2022-10-12  5:10 ` lilypond: update to 2.23.14 newbluemoon
2022-10-12  5:21 ` classabbyamp
2022-10-12  5:25 ` newbluemoon
2022-10-12  5:46 ` classabbyamp
2022-11-04  4:50 ` [PR PATCH] [Updated] " newbluemoon
2022-11-09 19:39 ` lilypond: update to 2.23.80 classabbyamp
2022-11-09 19:49 ` [PR PATCH] [Updated] " newbluemoon
2022-11-09 19:51 ` newbluemoon
2022-11-10  6:12 ` classabbyamp
2022-11-10 20:03 ` [PR PATCH] [Updated] " newbluemoon
2022-11-10 20:19 ` newbluemoon
2022-11-10 20:21 ` [PR PATCH] [Merged]: " classabbyamp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220821125649.cNz6wYe0apI8MvdTHH_zTO06-uf8ly7TosMamY4BF0w@z \
    --to=newbluemoon@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).