* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
@ 2021-01-12 12:43 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2021-01-12 12:43 UTC (permalink / raw
To: gentoo-commits
commit: d563795787d06818ae1f686d3849f20b61a330ac
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 12:43:19 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 12:43:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5637957
media-sound/lilypond: updated patch for live
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../lilypond/files/lilypond-9999-fix-font-size.patch | 13 +++++++++++++
media-sound/lilypond/lilypond-9999.ebuild | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/media-sound/lilypond/files/lilypond-9999-fix-font-size.patch b/media-sound/lilypond/files/lilypond-9999-fix-font-size.patch
new file mode 100644
index 00000000000..45a3ad5e22c
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-9999-fix-font-size.patch
@@ -0,0 +1,13 @@
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index 053ce17143..0c171bc44e 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-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 89cf464d7f8..03ab64de7f8 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 )
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
@ 2020-10-07 8:19 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2020-10-07 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 9511e4df4940f2de5cf59540b096d20cbaa98369
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 7 08:18:39 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 7 08:18:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9511e4df
media-sound/lilypond: removed obsolete 2.21.4-r1
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/lilypond/Manifest | 1 -
.../files/lilypond-fix-cve-2020-17353.patch | 101 ----------------
media-sound/lilypond/lilypond-2.21.4-r1.ebuild | 133 ---------------------
3 files changed, 235 deletions(-)
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index b5615aa667c..98bef22425b 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,3 +1,2 @@
-DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860
DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958
DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7
diff --git a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch
deleted file mode 100644
index e91947eae05..00000000000
--- a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From b84ea4740f3279516905c5db05f4074e777c16ff Mon Sep 17 00:00:00 2001
-From: Han-Wen Nienhuys <hanwenn@gmail.com>
-Date: Tue, 21 Jul 2020 14:45:08 +0200
-Subject: [PATCH] scm: disable embedded-ps and embedded-svg in -dsafe mode
-
-This prevents executing privileged PostScript and exploiting
-Ghostscript vulnerablilities
-
-Tested:
- $ lilypond -dsafe input/regression/les-nereides.ly
- (works, kinda)
-
- $ cat f.ly
- { c4_ \markup \postscript #" (x) show " }
-
- $ lilypond -dsafe f
- Preprocessing graphical objects.../home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: In procedure ly_make_stencil in expression (ly:make-stencil (list # #) (quote #) ...):
- /home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: Wrong type argument in position 1 (expecting registered stencil expression): (embedded-ps "
----
- scm/define-stencil-commands.scm | 65 ++++++++++++++++++++++-------------------
- 1 file changed, 35 insertions(+), 30 deletions(-)
-
-diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm
-index 09a2299..e388788 100644
---- a/scm/define-stencil-commands.scm
-+++ b/scm/define-stencil-commands.scm
-@@ -21,36 +21,41 @@
- (define-public (ly:all-stencil-commands)
- "Return the list of stencil commands that can be
- defined in the output modules (@file{output-*.scm})."
-- '(blank
-- char
-- circle
-- dashed-line
-- draw-line
-- ellipse
-- embedded-ps
-- embedded-svg
-- end-group-node
-- glyph-string
-- grob-cause
-- named-glyph
-- no-origin
-- page-link
-- path
-- partial-ellipse
-- placebox
-- polygon
-- resetcolor
-- resetrotation
-- resetscale
-- round-filled-box
-- setcolor
-- setrotation
-- setscale
-- start-group-node
-- text
-- unknown
-- url-link
-- utf-8-string
-+ (let*
-+ ((commands '(blank
-+ char
-+ circle
-+ dashed-line
-+ draw-line
-+ ellipse
-+ end-group-node
-+ glyph-string
-+ grob-cause
-+ named-glyph
-+ no-origin
-+ page-link
-+ path
-+ partial-ellipse
-+ placebox
-+ polygon
-+ resetcolor
-+ resetrotation
-+ resetscale
-+ round-filled-box
-+ setcolor
-+ setrotation
-+ setscale
-+ start-group-node
-+ text
-+ unknown
-+ url-link
-+ utf-8-string
-+ )))
-+
-+ (if (ly:get-option 'safe)
-+ commands
-+ (append '(embedded-ps embedded-svg)
-+ commands))
- ))
-
- ;; TODO:
---
-1.9.1
-
diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
deleted file mode 100644
index 7d751530c32..00000000000
--- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/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}"
-
-BDEPEND="
- >=dev-texlive/texlive-metapost-2020
- >=sys-apps/texinfo-4.11
- >=sys-devel/bison-2.0
- sys-devel/flex
- virtual/pkgconfig
-"
-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.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
- media-gfx/fontforge[png,python]
- sys-devel/gettext"
-
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
- "${FILESDIR}"/${PN}-fix-cve-2020-17353.patch
-)
-
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
-
-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
-
- # remove bundled texinfo file (fixes bug #448560)
- rm tex/texinfo.tex || die
-
- eautoreconf
-
- xdg_environment_reset #586592
-}
-
-src_configure() {
- # fix hardcoded `ar`
- sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
-
- # 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 profile profiling)
- )
-
- export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010
-
- econf "${myeconfargs[@]}" AR="$(tc-getAR)"
-}
-
-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] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
@ 2020-08-05 17:57 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2020-08-05 17:57 UTC (permalink / raw
To: gentoo-commits
commit: b643169012fae9013d509ef7fc19602450113b77
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 5 17:57:09 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 17:57:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6431690
media-sound/lilypond: fixed cve-2020-17353
Bug: https://bugs.gentoo.org/736074
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/lilypond-fix-cve-2020-17353.patch | 101 +++++++++++++++++++++
...ond-2.21.4.ebuild => lilypond-2.21.1-r1.ebuild} | 5 +-
...ond-2.21.4.ebuild => lilypond-2.21.4-r1.ebuild} | 1 +
3 files changed, 105 insertions(+), 2 deletions(-)
diff --git a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch
new file mode 100644
index 00000000000..e91947eae05
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch
@@ -0,0 +1,101 @@
+From b84ea4740f3279516905c5db05f4074e777c16ff Mon Sep 17 00:00:00 2001
+From: Han-Wen Nienhuys <hanwenn@gmail.com>
+Date: Tue, 21 Jul 2020 14:45:08 +0200
+Subject: [PATCH] scm: disable embedded-ps and embedded-svg in -dsafe mode
+
+This prevents executing privileged PostScript and exploiting
+Ghostscript vulnerablilities
+
+Tested:
+ $ lilypond -dsafe input/regression/les-nereides.ly
+ (works, kinda)
+
+ $ cat f.ly
+ { c4_ \markup \postscript #" (x) show " }
+
+ $ lilypond -dsafe f
+ Preprocessing graphical objects.../home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: In procedure ly_make_stencil in expression (ly:make-stencil (list # #) (quote #) ...):
+ /home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: Wrong type argument in position 1 (expecting registered stencil expression): (embedded-ps "
+---
+ scm/define-stencil-commands.scm | 65 ++++++++++++++++++++++-------------------
+ 1 file changed, 35 insertions(+), 30 deletions(-)
+
+diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm
+index 09a2299..e388788 100644
+--- a/scm/define-stencil-commands.scm
++++ b/scm/define-stencil-commands.scm
+@@ -21,36 +21,41 @@
+ (define-public (ly:all-stencil-commands)
+ "Return the list of stencil commands that can be
+ defined in the output modules (@file{output-*.scm})."
+- '(blank
+- char
+- circle
+- dashed-line
+- draw-line
+- ellipse
+- embedded-ps
+- embedded-svg
+- end-group-node
+- glyph-string
+- grob-cause
+- named-glyph
+- no-origin
+- page-link
+- path
+- partial-ellipse
+- placebox
+- polygon
+- resetcolor
+- resetrotation
+- resetscale
+- round-filled-box
+- setcolor
+- setrotation
+- setscale
+- start-group-node
+- text
+- unknown
+- url-link
+- utf-8-string
++ (let*
++ ((commands '(blank
++ char
++ circle
++ dashed-line
++ draw-line
++ ellipse
++ end-group-node
++ glyph-string
++ grob-cause
++ named-glyph
++ no-origin
++ page-link
++ path
++ partial-ellipse
++ placebox
++ polygon
++ resetcolor
++ resetrotation
++ resetscale
++ round-filled-box
++ setcolor
++ setrotation
++ setscale
++ start-group-node
++ text
++ unknown
++ url-link
++ utf-8-string
++ )))
++
++ (if (ly:get-option 'safe)
++ commands
++ (append '(embedded-ps embedded-svg)
++ commands))
+ ))
+
+ ;; TODO:
+--
+1.9.1
+
diff --git a/media-sound/lilypond/lilypond-2.21.4.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild
similarity index 95%
copy from media-sound/lilypond/lilypond-2.21.4.ebuild
copy to media-sound/lilypond/lilypond-2.21.1-r1.ebuild
index 3aa63a51f18..1f1e8202a99 100644
--- a/media-sound/lilypond/lilypond-2.21.4.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
@@ -54,7 +54,8 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
+ "${FILESDIR}"/${P}-fix-font-size.patch
+ "${FILESDIR}"/${PN}-fix-cve-2020-17353.patch
)
DOCS=( DEDICATION HACKING README.txt ROADMAP )
diff --git a/media-sound/lilypond/lilypond-2.21.4.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
similarity index 98%
rename from media-sound/lilypond/lilypond-2.21.4.ebuild
rename to media-sound/lilypond/lilypond-2.21.4-r1.ebuild
index 3aa63a51f18..0196e4c7d4d 100644
--- a/media-sound/lilypond/lilypond-2.21.4.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
@@ -55,6 +55,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
+ "${FILESDIR}"/${PN}-fix-cve-2020-17353.patch
)
DOCS=( DEDICATION HACKING README.txt ROADMAP )
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
@ 2020-05-08 9:54 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2020-05-08 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 76107a464dde77a13302ff67f29be020fb5075f9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 09:54:17 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri May 8 09:54:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76107a46
media-sound/lilypond: removed obsolete 2.18.2-r3
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/lilypond/Manifest | 1 -
.../lilypond/files/lilypond-2.17.2-tex-docs.patch | 20 ---
.../lilypond/files/lilypond-2.18.2-fontforge.patch | 29 -----
media-sound/lilypond/lilypond-2.18.2-r3.ebuild | 140 ---------------------
4 files changed, 190 deletions(-)
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 6e142f16da3..c08f1a07927 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,3 +1,2 @@
-DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
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.17.2-tex-docs.patch b/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch
deleted file mode 100644
index 9e0d7082c0d..00000000000
--- a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lilypond-2.17.2/GNUmakefile.in
-+++ lilypond-2.17.2/GNUmakefile.in
-@@ -5,7 +5,7 @@
- SUBDIRS = python scripts \
- flower lily \
- mf ly \
-- tex ps scm \
-+ ps scm \
- po \
- elisp vim \
- input \
-@@ -14,7 +14,7 @@
-
- ## this convoluted construction is necessary, since we don't know the
- ## value of DOCUMENTATION here.
--documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
-+documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation tex)
-
- SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
- README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP HACKING \
diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
deleted file mode 100644
index cfd3295b394..00000000000
--- a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
deleted file mode 100644
index 610f8b27f2c..00000000000
--- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="GNU Music Typesetter"
-SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa x86"
-LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs profile vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.15
- >=dev-scheme/guile-1.8.2:12[deprecated,regex]
- <dev-scheme/guile-2.0:12
- media-fonts/urw-fonts
- media-libs/fontconfig
- media-libs/freetype:2
- >=x11-libs/pango-1.12.3
- emacs? ( >=app-editors/emacs-23.1:* )
- ${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.17.2-tex-docs.patch
- "${FILESDIR}"/${P}-fontforge.patch
-)
-
-DOCS=( AUTHORS.txt NEWS.txt README.txt )
-
-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() {
- eapply "${PATCHES[@]}"
-
- if ! use vim-syntax ; then
- sed -i 's/vim//' GNUmakefile.in || die
- fi
-
- # respect CFLAGS
- sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
- for lang in ${LANGS}; do
- has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die
- done
-
- # 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
-
- eapply_user
-
- 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
-
- econf \
- --with-ncsb-dir=/usr/share/fonts/urw-fonts \
- --disable-documentation \
- --disable-optimising \
- --disable-pipe \
- $(use_enable debug debugging) \
- $(use_enable profile profiling)
-}
-
-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] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
@ 2020-05-08 9:54 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2020-05-08 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 52ca23b570acf750ca99271d2308c739f809450e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 09:51:45 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri May 8 09:54:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ca23b5
media-sound/lilypond: bump to 2.21.1 + 9999 sync
Closes: https://bugs.gentoo.org/629686
Closes: https://bugs.gentoo.org/720422
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/lilypond/Manifest | 1 +
.../files/lilypond-2.21.1-fix-font-size.patch | 10 +++++
...lilypond-9999.ebuild => lilypond-2.21.1.ebuild} | 48 +++++++++++-----------
media-sound/lilypond/lilypond-9999.ebuild | 48 +++++++++++-----------
4 files changed, 61 insertions(+), 46 deletions(-)
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index dfbd5444746..6e142f16da3 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,2 +1,3 @@
DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
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.21.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch
new file mode 100644
index 00000000000..cdd49584900
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch
@@ -0,0 +1,10 @@
+--- lilypond-2.19.49.orig/lily/pango-font.cc 2016-10-16 07:16:18.000000000 -0400
++++ lilypond-2.19.49.new/lily/pango-font.cc 2016-10-29 22:39:02.921622080 -0400
+@@ -317,7 +317,7 @@
+ pango_fc_font_unlock_face (fcfont);
+ pango_glyph_string_free (pgs);
+ pgs = 0;
+- PangoFontDescription *descr = pango_font_describe (pa->font);
++ PangoFontDescription *descr = pango_context_get_font_description (context_);
+ Real size = pango_font_description_get_size (descr)
+ / (Real (PANGO_SCALE));
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild
similarity index 86%
copy from media-sound/lilypond/lilypond-9999.ebuild
copy to media-sound/lilypond/lilypond-2.21.1.ebuild
index 545b867b935..216a4d45876 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.1.ebuild
@@ -2,15 +2,16 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-
PYTHON_COMPAT=( python3_{6,7,8} )
+
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
if [[ "${PV}" = "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
else
- SRC_URI="http://lilypond.org/download/sources/v$(ver_cut 1-2)/${P}.tar.gz"
+ 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
@@ -19,41 +20,45 @@ HOMEPAGE="http://lilypond.org/"
LICENSE="GPL-3 FDL-1.3"
SLOT="0"
-IUSE="debug emacs profile vim-syntax"
+IUSE="debug emacs guile2 profile vim-syntax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}
- >=app-text/ghostscript-gpl-8.15
- >=dev-scheme/guile-2:12[deprecated,regex]
+BDEPEND="
+ >=dev-texlive/texlive-metapost-2013
+ || (
+ >=app-text/texlive-core-2013
+ >=dev-tex/metapost-1.803
+ )
+ >=sys-apps/texinfo-4.11
+ >=sys-devel/bison-2.0
+ sys-devel/flex
+ virtual/pkgconfig
+"
+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
-"
+ sys-devel/gettext"
# Correct output data for tests isn't bundled with releases
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
+ "${FILESDIR}"/${P}-fix-font-size.patch
)
DOCS=( DEDICATION HACKING README.txt ROADMAP )
@@ -80,9 +85,6 @@ src_prepare() {
# respect CFLAGS
sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
- # respect AR
- sed -i "s:^AR=ar:AR=$(tc-getAR):" flower/GNUmakefile || die
-
# remove bundled texinfo file (fixes bug #448560)
rm tex/texinfo.tex || die
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 545b867b935..6d4c51473a1 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -2,15 +2,16 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-
PYTHON_COMPAT=( python3_{6,7,8} )
+
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
if [[ "${PV}" = "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
else
- SRC_URI="http://lilypond.org/download/sources/v$(ver_cut 1-2)/${P}.tar.gz"
+ 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
@@ -19,41 +20,45 @@ HOMEPAGE="http://lilypond.org/"
LICENSE="GPL-3 FDL-1.3"
SLOT="0"
-IUSE="debug emacs profile vim-syntax"
+IUSE="debug emacs guile2 profile vim-syntax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}
- >=app-text/ghostscript-gpl-8.15
- >=dev-scheme/guile-2:12[deprecated,regex]
+BDEPEND="
+ >=dev-texlive/texlive-metapost-2013
+ || (
+ >=app-text/texlive-core-2013
+ >=dev-tex/metapost-1.803
+ )
+ >=sys-apps/texinfo-4.11
+ >=sys-devel/bison-2.0
+ sys-devel/flex
+ virtual/pkgconfig
+"
+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
-"
+ sys-devel/gettext"
# Correct output data for tests isn't bundled with releases
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
+ "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
)
DOCS=( DEDICATION HACKING README.txt ROADMAP )
@@ -80,9 +85,6 @@ src_prepare() {
# respect CFLAGS
sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
- # respect AR
- sed -i "s:^AR=ar:AR=$(tc-getAR):" flower/GNUmakefile || die
-
# remove bundled texinfo file (fixes bug #448560)
rm tex/texinfo.tex || die
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
@ 2020-02-05 0:28 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2020-02-05 0:28 UTC (permalink / raw
To: gentoo-commits
commit: e23aa306e4e32bd3b0d8d435bf0a9cb6ddba2b16
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 00:27:45 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Feb 5 00:27:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23aa306
media-sound/lilypond: updated 9999
1) eapi7
2) switched to python3
3) dropped patch not needed anymore
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../lilypond/files/lilypond-9999-programming_error.patch | 13 -------------
media-sound/lilypond/lilypond-9999.ebuild | 7 +++----
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/media-sound/lilypond/files/lilypond-9999-programming_error.patch b/media-sound/lilypond/files/lilypond-9999-programming_error.patch
deleted file mode 100644
index f2b85164a6e..00000000000
--- a/media-sound/lilypond/files/lilypond-9999-programming_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
-index d25e6c9ef8..2fd2e4a4fa 100644
---- a/lily/general-scheme.cc
-+++ b/lily/general-scheme.cc
-@@ -275,7 +275,7 @@ LY_DEFINE (ly_protects, "ly:protects",
- #if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1
- return scm_protects;
- #else
-- return programming_error ("ly:protects is not supported in Guile 2.1");
-+ programming_error ("ly:protects is not supported in Guile 2.1");
- #endif
- }
-
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 2ae50f18047..ccdde5e349a 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
[[ "${PV}" = "9999" ]] && inherit git-r3
inherit elisp-common autotools python-single-r1 xdg-utils
@@ -23,7 +23,6 @@ LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
IUSE="debug emacs guile2 profile vim-syntax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
PATCHES=(
- "${FILESDIR}"/$P-programming_error.patch
"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
)
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
@ 2019-10-28 10:35 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2019-10-28 10:35 UTC (permalink / raw
To: gentoo-commits
commit: b86de0942126d6005b21f34a2a93ed2ad07d400e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 10:35:11 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 10:35:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86de094
media-sound/lilypond-{2.19.80-r1,9999}: fix #681630
Closes: https://bugs.gentoo.org/681630
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/lilypond-2.19.80-fontforge-version.patch | 16 ++++++++++++++++
media-sound/lilypond/lilypond-2.19.80-r1.ebuild | 5 ++++-
media-sound/lilypond/lilypond-9999.ebuild | 7 +++++--
3 files changed, 25 insertions(+), 3 deletions(-)
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
new file mode 100644
index 00000000000..4e2c2ce77c1
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
@@ -0,0 +1,16 @@
+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/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
index 1a358dd52c2..3e23b2dfe64 100644
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -55,7 +55,10 @@ DEPEND="${RDEPEND}
# Correct output data for tests isn't bundled with releases
RESTRICT="test"
-PATCHES=( "${FILESDIR}"/${P}-remove-ly-protect.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-remove-ly-protect.patch
+ "${FILESDIR}"/${P}-fontforge-version.patch
+)
DOCS=( DEDICATION HACKING README.txt ROADMAP )
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 93bb8d785b9..4d591c81e09 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,7 +22,10 @@ SLOT="0"
LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
IUSE="debug emacs guile2 profile vim-syntax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-PATCHES=(${FILESDIR}/$P-programming_error.patch)
+PATCHES=(
+ "${FILESDIR}"/$P-programming_error.patch
+ "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
+)
RDEPEND=">=app-text/ghostscript-gpl-8.15
>=dev-scheme/guile-1.8.2:12[deprecated,regex]
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
@ 2018-02-17 12:00 Miroslav Šulc
0 siblings, 0 replies; 8+ messages in thread
From: Miroslav Šulc @ 2018-02-17 12:00 UTC (permalink / raw
To: gentoo-commits
commit: cb700cf3a8b38490fc2a9e9368b8720045a2ea81
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 11:59:53 2018 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 11:59:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb700cf3
media-sound/lilypond: fixed bug causing lilypond does not compile (programming_error does not return value)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../lilypond/files/lilypond-9999-programming_error.patch | 13 +++++++++++++
media-sound/lilypond/lilypond-9999.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/media-sound/lilypond/files/lilypond-9999-programming_error.patch b/media-sound/lilypond/files/lilypond-9999-programming_error.patch
new file mode 100644
index 00000000000..f2b85164a6e
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-9999-programming_error.patch
@@ -0,0 +1,13 @@
+diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
+index d25e6c9ef8..2fd2e4a4fa 100644
+--- a/lily/general-scheme.cc
++++ b/lily/general-scheme.cc
+@@ -275,7 +275,7 @@ LY_DEFINE (ly_protects, "ly:protects",
+ #if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1
+ return scm_protects;
+ #else
+- return programming_error ("ly:protects is not supported in Guile 2.1");
++ programming_error ("ly:protects is not supported in Guile 2.1");
+ #endif
+ }
+
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 27bfc06997d..e24a72ba576 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -22,6 +22,7 @@ SLOT="0"
LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
IUSE="debug emacs guile2 profile vim-syntax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+PATCHES=(${FILESDIR}/$P-programming_error.patch)
RDEPEND=">=app-text/ghostscript-gpl-8.15
>=dev-scheme/guile-1.8.2:12[deprecated,regex]
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-01-12 12:43 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-12 12:43 [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2020-10-07 8:19 Miroslav Šulc
2020-08-05 17:57 Miroslav Šulc
2020-05-08 9:54 Miroslav Šulc
2020-05-08 9:54 Miroslav Šulc
2020-02-05 0:28 Miroslav Šulc
2019-10-28 10:35 Miroslav Šulc
2018-02-17 12:00 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox