* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
@ 2015-11-06 12:18 Ian Delaney
0 siblings, 0 replies; 6+ messages in thread
From: Ian Delaney @ 2015-11-06 12:18 UTC (permalink / raw
To: gentoo-commits
commit: b01a4bd24dff326307247ae5fa9d245b12904b46
Author: Karl Linden <karl.j.linden <AT> gmail <DOT> com>
AuthorDate: Sat Oct 31 13:04:47 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 4 16:16:35 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01a4bd2
media-sound/lilypond: fix compilation with fontforge wrt #557160
Package-Manager: portage-2.2.23
.../lilypond/files/lilypond-2.18.2-fontforge.patch | 29 ++++++++++++++++++++++
media-sound/lilypond/lilypond-2.18.2.ebuild | 3 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
new file mode 100644
index 0000000..cfd3295
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
@@ -0,0 +1,29 @@
+From a832764e7300d48468a6812077b899a4beed271b Mon Sep 17 00:00:00 2001
+From: Masamichi Hosoda <trueroad@trueroad.jp>
+Date: Sat, 22 Aug 2015 21:20:17 +0900
+Subject: [PATCH] Fix fontforge version detection
+
+Newer fontforge shows git hash in `fontforge --version`.
+In that case, configure script
+might recognize it as date (version).
+---
+ aclocal.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 48d0b77..0037c58 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
+
+ if test -z "$_ver"; then
+ ## If empty, try date [fontforge]
+- eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
++ eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
++ | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
+ | head -n 1 \
+ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+ fi
+--
+2.6.2
+
diff --git a/media-sound/lilypond/lilypond-2.18.2.ebuild b/media-sound/lilypond/lilypond-2.18.2.ebuild
index 2604de1..02301ed 100644
--- a/media-sound/lilypond/lilypond-2.18.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -58,6 +58,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+ epatch "${FILESDIR}"/${P}-fontforge.patch
if ! use vim-syntax ; then
sed -i 's/vim//' GNUmakefile.in || die
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
@ 2018-01-10 22:44 Amy Liffey
0 siblings, 0 replies; 6+ messages in thread
From: Amy Liffey @ 2018-01-10 22:44 UTC (permalink / raw
To: gentoo-commits
commit: 554ac2c79d1ba54ed79eb87cbb511e5c48f86230
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Wed Jan 10 18:48:12 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 22:43:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554ac2c7
media-sound/lilypond: Add patch to remove ly protects
The function was causing errors errors with Guile v2.2. The patch
is based on the discussion from the developers here:
http://lists.gnu.org/archive/html/guile-user/2017-03/msg00042.html
Remove linguas logic.
Closes: #6822
Closes: https://bugs.gentoo.org/642962
Closes: https://bugs.gentoo.org/640554
.../files/lilypond-2.19.80-remove-ly-protect.patch | 39 ++++++
media-sound/lilypond/lilypond-2.19.80-r1.ebuild | 144 +++++++++++++++++++++
2 files changed, 183 insertions(+)
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
new file mode 100644
index 00000000000..d21b0a413a1
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
@@ -0,0 +1,39 @@
+diff -purN a/lily/general-scheme.cc b/lily/general-scheme.cc
+--- a/lily/general-scheme.cc 2017-10-15 17:42:11.000000000 +0100
++++ b/lily/general-scheme.cc 2018-01-10 16:20:08.129066507 +0000
+@@ -267,6 +267,8 @@ LY_DEFINE (ly_dimension_p, "ly:dimension
+ /*
+ Debugging mem leaks:
+ */
++
++/*
+ LY_DEFINE (ly_protects, "ly:protects",
+ 0, 0, 0, (),
+ "Return hash of protected objects.")
+@@ -278,6 +280,7 @@ LY_DEFINE (ly_protects, "ly:protects",
+ return programming_error ("ly:protects is not supported in Guile 2.1");
+ #endif
+ }
++*/
+
+ LY_DEFINE (ly_gettext, "ly:gettext",
+ 1, 0, 0, (SCM original),
+diff -purN a/scm/lily.scm b/scm/lily.scm
+--- a/scm/lily.scm 2017-10-15 17:42:11.000000000 +0100
++++ b/scm/lily.scm 2018-01-10 16:22:54.914457450 +0000
+@@ -836,10 +836,11 @@ messages into errors.")
+
+ (define-public (dump-gc-protects)
+ (set! gc-protect-stat-count (1+ gc-protect-stat-count))
+- (let* ((protects (sort (hash-table->alist (ly:protects))
+- (lambda (a b)
+- (< (object-address (car a))
+- (object-address (car b))))))
++ (let* (;(protects (sort (hash-table->alist (ly:protects))
++ ; (lambda (a b)
++ ; (< (object-address (car a))
++ ; (object-address (car b))))))
++ (protects '())
+ (out-file-name (string-append
+ "gcstat-" (number->string gc-protect-stat-count)
+ ".scm"))
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
new file mode 100644
index 00000000000..7bada7ba83e
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+ EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+ SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+IUSE="debug emacs guile2 profile vim-syntax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+ >=dev-scheme/guile-1.8.2:12[deprecated,regex]
+ media-fonts/tex-gyre
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=x11-libs/pango-1.12.3
+ emacs? ( virtual/emacs )
+ guile2? ( >=dev-scheme/guile-2:12 )
+ !guile2? (
+ >=dev-scheme/guile-1.8.2:12[deprecated,regex]
+ <dev-scheme/guile-2.0:12
+ )
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ app-text/t1utils
+ dev-lang/perl
+ dev-libs/kpathsea
+ >=dev-texlive/texlive-metapost-2013
+ || (
+ >=app-text/texlive-core-2013
+ >=dev-tex/metapost-1.803
+ )
+ virtual/pkgconfig
+ media-gfx/fontforge[png]
+ >=sys-apps/texinfo-4.11
+ >=sys-devel/bison-2.0
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-remove-ly-protect.patch )
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+ # make sure >=metapost-1.803 is selected if it's installed, bug 498704
+ if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+ if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+ einfo "Updating metapost symlink"
+ eselect mpost update || die
+ fi
+ fi
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if ! use vim-syntax ; then
+ sed -i 's/vim//' GNUmakefile.in || die
+ fi
+
+ # respect CFLAGS
+ sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+ # respect AR
+ sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
+
+ # remove bundled texinfo file (fixes bug #448560)
+ rm tex/texinfo.tex || die
+
+ eautoreconf
+
+ xdg_environment_reset #586592
+}
+
+src_configure() {
+ # documentation generation currently not supported since it requires a newer
+ # version of texi2html than is currently in the tree
+
+ local myeconfargs=(
+ --with-texgyre-dir=/usr/share/fonts/tex-gyre
+ --disable-documentation
+ --disable-optimising
+ --disable-pipe
+ $(use_enable debug debugging)
+ $(use_enable guile2)
+ $(use_enable profile profiling)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+ || die "elisp-compile failed"
+ fi
+}
+
+src_install () {
+ emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+ # remove elisp files since they are in the wrong directory
+ rm -r "${ED}"/usr/share/emacs || die
+
+ if use emacs ; then
+ elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+ || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+ fi
+
+ python_fix_shebang "${ED}"
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
@ 2020-06-10 6:45 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2020-06-10 6:45 UTC (permalink / raw
To: gentoo-commits
commit: e5b5476878671c51ef4f47fe2dfac926224e47b7
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 06:44:44 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 06:45:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b54768
media-sound/lilypond: removed obsolete 2.19.83
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/lilypond/Manifest | 1 -
.../files/lilypond-2.19.80-fontforge-version.patch | 16 ---
.../files/lilypond-2.19.80-remove-ly-protect.patch | 39 ------
media-sound/lilypond/lilypond-2.19.83.ebuild | 148 ---------------------
4 files changed, 204 deletions(-)
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index c08f1a07927..40fc65bffd7 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,2 +1 @@
-DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
deleted file mode 100644
index 4e2c2ce77c1..00000000000
--- a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The version test fails for two reasons:
-* fontforge --version does not print anything that resembles what the configure
- script expects a version to look like
-* fontforge fails to print a version if it cannot connect to an X display
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -236,7 +236,7 @@
-
- STEPMAKE_PYTHON_DEVEL(REQUIRED, 2.4, 3.0)
-
--STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222)
-+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED,)
-
- STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
-
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
deleted file mode 100644
index d21b0a413a1..00000000000
--- a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -purN a/lily/general-scheme.cc b/lily/general-scheme.cc
---- a/lily/general-scheme.cc 2017-10-15 17:42:11.000000000 +0100
-+++ b/lily/general-scheme.cc 2018-01-10 16:20:08.129066507 +0000
-@@ -267,6 +267,8 @@ LY_DEFINE (ly_dimension_p, "ly:dimension
- /*
- Debugging mem leaks:
- */
-+
-+/*
- LY_DEFINE (ly_protects, "ly:protects",
- 0, 0, 0, (),
- "Return hash of protected objects.")
-@@ -278,6 +280,7 @@ LY_DEFINE (ly_protects, "ly:protects",
- return programming_error ("ly:protects is not supported in Guile 2.1");
- #endif
- }
-+*/
-
- LY_DEFINE (ly_gettext, "ly:gettext",
- 1, 0, 0, (SCM original),
-diff -purN a/scm/lily.scm b/scm/lily.scm
---- a/scm/lily.scm 2017-10-15 17:42:11.000000000 +0100
-+++ b/scm/lily.scm 2018-01-10 16:22:54.914457450 +0000
-@@ -836,10 +836,11 @@ messages into errors.")
-
- (define-public (dump-gc-protects)
- (set! gc-protect-stat-count (1+ gc-protect-stat-count))
-- (let* ((protects (sort (hash-table->alist (ly:protects))
-- (lambda (a b)
-- (< (object-address (car a))
-- (object-address (car b))))))
-+ (let* (;(protects (sort (hash-table->alist (ly:protects))
-+ ; (lambda (a b)
-+ ; (< (object-address (car a))
-+ ; (object-address (car b))))))
-+ (protects '())
- (out-file-name (string-append
- "gcstat-" (number->string gc-protect-stat-count)
- ".scm"))
diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild
deleted file mode 100644
index 8b1f709e600..00000000000
--- a/media-sound/lilypond/lilypond-2.19.83.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-[[ "${PV}" = "9999" ]] && inherit git-r3
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
- EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
-else
- MAIN_VER=$(ver_cut 1-2)
- SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~hppa x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-IUSE="debug emacs guile2 profile vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.15
- >=dev-scheme/guile-1.8.2:12=[deprecated,regex]
- media-fonts/tex-gyre
- media-libs/fontconfig
- media-libs/freetype:2
- >=x11-libs/pango-1.12.3
- emacs? ( >=app-editors/emacs-23.1:* )
- guile2? ( >=dev-scheme/guile-2:12 )
- !guile2? (
- >=dev-scheme/guile-1.8.2:12=[deprecated,regex]
- <dev-scheme/guile-2.0:12
- )
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-text/t1utils
- dev-lang/perl
- dev-libs/kpathsea
- >=dev-texlive/texlive-metapost-2013
- || (
- >=app-text/texlive-core-2013
- >=dev-tex/metapost-1.803
- )
- virtual/pkgconfig
- media-gfx/fontforge[png]
- >=sys-apps/texinfo-4.11
- >=sys-devel/bison-2.0
- sys-devel/flex
- sys-devel/gettext
- sys-devel/make"
-
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.19.80-remove-ly-protect.patch
- "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
-)
-
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
-
-pkg_setup() {
- # make sure >=metapost-1.803 is selected if it's installed, bug 498704
- if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
- if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
- einfo "Updating metapost symlink"
- eselect mpost update || die
- fi
- fi
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- if ! use vim-syntax ; then
- sed -i 's/vim//' GNUmakefile.in || die
- fi
-
- # respect CFLAGS
- sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
- # respect AR
- sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
-
- # remove bundled texinfo file (fixes bug #448560)
- rm tex/texinfo.tex || die
-
- eautoreconf
-
- xdg_environment_reset #586592
-}
-
-src_configure() {
- # documentation generation currently not supported since it requires a newer
- # version of texi2html than is currently in the tree
-
- local myeconfargs=(
- --with-texgyre-dir=/usr/share/fonts/tex-gyre
- --disable-documentation
- --disable-optimising
- --disable-pipe
- $(use_enable debug debugging)
- $(use_enable guile2)
- $(use_enable profile profiling)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use emacs ; then
- elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
- || die "elisp-compile failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
- # remove elisp files since they are in the wrong directory
- rm -r "${ED}"/usr/share/emacs || die
-
- if use emacs ; then
- elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
- || die "elisp-install failed"
- elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
- fi
-
- python_fix_shebang "${ED}"
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
@ 2021-02-12 11:03 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2021-02-12 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 9c086e4b01610c65f79929cb03c817653d92617e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 11:02:56 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 11:02:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c086e4b
media-sound/lilypond: +2.23.0, dropped guile2 use flag, updated live
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/lilypond/Manifest | 1 +
...9-fix-font-size.patch => lilypond-2.23.0-fix-font-size.patch} | 0
.../lilypond/{lilypond-9999.ebuild => lilypond-2.23.0.ebuild} | 7 +------
media-sound/lilypond/lilypond-9999.ebuild | 9 ++-------
4 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 86c44eb63be..d258c9aa11c 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,2 +1,3 @@
DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7
DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65
+DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d
diff --git a/media-sound/lilypond/files/lilypond-9999-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch
similarity index 100%
rename from media-sound/lilypond/files/lilypond-9999-fix-font-size.patch
rename to media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-2.23.0.ebuild
similarity index 94%
copy from media-sound/lilypond/lilypond-9999.ebuild
copy to media-sound/lilypond/lilypond-2.23.0.ebuild
index 4b7150162b1..de2a548eb65 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://lilypond.org/"
LICENSE="GPL-3 FDL-1.3"
SLOT="0"
LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
-IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}"
+IUSE="debug doc emacs profile vim-syntax ${LANG_USE}"
unset LANG_USE
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -40,11 +40,6 @@ RDEPEND="app-text/ghostscript-gpl
media-libs/freetype:2
x11-libs/pango
emacs? ( >=app-editors/emacs-23.1:* )
- guile2? ( >=dev-scheme/guile-2.2:12 )
- !guile2? (
- dev-scheme/guile:12=[deprecated,regex]
- <dev-scheme/guile-2.0:12
- )
${PYTHON_DEPS}"
DEPEND="${RDEPEND}
app-text/t1utils
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 4b7150162b1..24d67598c44 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://lilypond.org/"
LICENSE="GPL-3 FDL-1.3"
SLOT="0"
LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
-IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}"
+IUSE="debug doc emacs profile vim-syntax ${LANG_USE}"
unset LANG_USE
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -40,11 +40,6 @@ RDEPEND="app-text/ghostscript-gpl
media-libs/freetype:2
x11-libs/pango
emacs? ( >=app-editors/emacs-23.1:* )
- guile2? ( >=dev-scheme/guile-2.2:12 )
- !guile2? (
- dev-scheme/guile:12=[deprecated,regex]
- <dev-scheme/guile-2.0:12
- )
${PYTHON_DEPS}"
DEPEND="${RDEPEND}
app-text/t1utils
@@ -63,7 +58,7 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${P}-fix-font-size.patch
+ "${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
)
DOCS=( DEDICATION HACKING README.md ROADMAP )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
@ 2021-05-26 10:24 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2021-05-26 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 532fd8eb6e25bb2cffb263a2a5fb47d176373c5d
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 10:24:17 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed May 26 10:24:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532fd8eb
media-sound/lilypond: bump to 2.22.1 & 2.23.2 + py3_10
Closes: https://bugs.gentoo.org/792036
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/lilypond/Manifest | 2 ++
.../lilypond/files/lilypond-2.22.1-fix-font-size.patch | 13 +++++++++++++
media-sound/lilypond/lilypond-2.22.0.ebuild | 2 +-
.../{lilypond-2.22.0.ebuild => lilypond-2.22.1.ebuild} | 6 +++---
media-sound/lilypond/lilypond-2.23.0.ebuild | 2 +-
.../{lilypond-9999.ebuild => lilypond-2.23.2.ebuild} | 2 +-
media-sound/lilypond/lilypond-9999.ebuild | 2 +-
7 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 2e1f1538edc..2a71a9ca0ff 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,2 +1,4 @@
DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65
+DIST lilypond-2.22.1.tar.gz 18033161 BLAKE2B 41bd0159e8e851a3582c35285d301113e6a50c95c7b5adbe8ab1de3cc4e84a0580fe54e2166372b6640ab3d486b48d40edbcf4eacbf211d4fcb4e5d6defae2ff SHA512 dfe159928afd8592769fe9bf940b35e285465c2103707d855e82dba860e817a195c906fa9bda6fdfabce6f5adeaf49111891e14a822bf9cfb70a98312c6a9d1d
DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d
+DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b3e73fd197ba014805f657210942b3d1ef03d2d75594f63e7cc1838fbcbd40e2b42d14707b6b6eeec02cdd3f346754 SHA512 f5713394d7e79dad585e21690d8ac3c057eebe77113f1f307e8e1e117bccc26bdc5370a144505ebd887e653cee114cb9efcf75ec56b9d0320bbdf79e32498269
diff --git a/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch
new file mode 100644
index 00000000000..ab2bd8e59ae
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch
@@ -0,0 +1,13 @@
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index 053ce17..48bddd3 100644
+--- a/lily/pango-font.cc
++++ b/lily/pango-font.cc
+@@ -382,7 +382,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
+ tail = SCM_CDRLOC (*tail);
+ }
+
+- PangoFontDescription *descr = pango_font_describe (pa->font);
++ PangoFontDescription *descr = pango_context_get_font_description (context_);
+ Real size = pango_font_description_get_size (descr)
+ / (static_cast<Real> (PANGO_SCALE));
+ pango_font_description_free (descr);
diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild
index 4b0263ccad9..60368b53079 100644
--- a/media-sound/lilypond/lilypond-2.22.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.1.ebuild
similarity index 96%
copy from media-sound/lilypond/lilypond-2.22.0.ebuild
copy to media-sound/lilypond/lilypond-2.22.1.ebuild
index 4b0263ccad9..cf3311c16dd 100644
--- a/media-sound/lilypond/lilypond-2.22.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
else
MAIN_VER=$(ver_cut 1-2)
SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~hppa x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
fi
DESCRIPTION="GNU Music Typesetter"
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
+ "${FILESDIR}"/${P}-fix-font-size.patch
)
DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-2.23.0.ebuild b/media-sound/lilypond/lilypond-2.23.0.ebuild
index de2a548eb65..c82db90488d 100644
--- a/media-sound/lilypond/lilypond-2.23.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-2.23.2.ebuild
similarity index 98%
copy from media-sound/lilypond/lilypond-9999.ebuild
copy to media-sound/lilypond/lilypond-2.23.2.ebuild
index 24d67598c44..fea5dc370d4 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 24d67598c44..fea5dc370d4 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
@ 2022-02-24 1:24 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2022-02-24 1:24 UTC (permalink / raw
To: gentoo-commits
commit: fcaa927cebf1bc3db1404487e3fa7757a8e1eb99
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 01:18:06 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 01:23:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcaa927c
media-sound/lilypond: add free temporary font description patch
Closes: https://bugs.gentoo.org/833864
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
media-sound/lilypond/files/lilypond-2.22.1-free_font.patch | 14 ++++++++++++++
.../{lilypond-2.22.1.ebuild => lilypond-2.22.1-r1.ebuild} | 1 +
.../{lilypond-2.23.0.ebuild => lilypond-2.23.0-r1.ebuild} | 1 +
.../{lilypond-2.23.2.ebuild => lilypond-2.23.2-r1.ebuild} | 3 ++-
media-sound/lilypond/lilypond-9999.ebuild | 1 +
5 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
new file mode 100644
index 000000000000..2d27291551d4
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
@@ -0,0 +1,14 @@
+Revert "Pango_font: Free temporary font description"
+This reverts commit 102bed8b5a6332f2021a284bd5a937a2603fb327.
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index 053ce17143..1a63b18338 100644
+--- a/lily/pango-font.cc
++++ b/lily/pango-font.cc
+@@ -385,7 +385,6 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
+ PangoFontDescription *descr = pango_font_describe (pa->font);
+ Real size = pango_font_description_get_size (descr)
+ / (static_cast<Real> (PANGO_SCALE));
+- pango_font_description_free (descr);
+
+ if (ps_name_str0.empty ())
+ warning (_f ("no PostScript font name for font `%s'", file_name));
diff --git a/media-sound/lilypond/lilypond-2.22.1.ebuild b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
similarity index 98%
rename from media-sound/lilypond/lilypond-2.22.1.ebuild
rename to media-sound/lilypond/lilypond-2.22.1-r1.ebuild
index 8757a650991f..48e98a5be8f0 100644
--- a/media-sound/lilypond/lilypond-2.22.1.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
@@ -64,6 +64,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${P}-fix-font-size.patch
+ "${FILESDIR}"/${P}-free_font.patch
)
DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-2.23.0.ebuild b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
similarity index 98%
rename from media-sound/lilypond/lilypond-2.23.0.ebuild
rename to media-sound/lilypond/lilypond-2.23.0-r1.ebuild
index 71ce2205451a..e20ef84346b3 100644
--- a/media-sound/lilypond/lilypond-2.23.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
@@ -59,6 +59,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${P}-fix-font-size.patch
+ "${FILESDIR}"/${PN}-2.22.1-free_font.patch
)
DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-2.23.2.ebuild b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild
similarity index 97%
rename from media-sound/lilypond/lilypond-2.23.2.ebuild
rename to media-sound/lilypond/lilypond-2.23.2-r1.ebuild
index adb492fe79e4..267d1a8af4de 100644
--- a/media-sound/lilypond/lilypond-2.23.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -59,6 +59,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
+ "${FILESDIR}"/${PN}-2.22.1-free_font.patch
)
DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index ebce02eda789..23bd30635ead 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -59,6 +59,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
+ "${FILESDIR}"/${PN}-2.22.1-free_font.patch
)
DOCS=( DEDICATION HACKING README.md ROADMAP )
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-02-24 1:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-12 11:03 [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2022-02-24 1:24 Maciej Barć
2021-05-26 10:24 Miroslav Šulc
2020-06-10 6:45 Miroslav Šulc
2018-01-10 22:44 Amy Liffey
2015-11-06 12:18 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox